Axel Nordh 3 anos atrás
pai
commit
d65a4804bf

+ 13 - 0
.drone.yml

@@ -0,0 +1,13 @@
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: maven_test
+    image: maven:3.8.6-openjdk-18
+    commands:
+      - cd Odds
+      - mvn clean verify sonar:sonar -Dsonar.projectKey=Odds -Dsonar.host.url=http://nordh.xyz:9088 -Dsonar.login=5256c9b775dccbf7e264e2ef60af7cd181d52d4b
+      - cd ..
+      - cd OddsJavaFx
+      - mvn clean verify sonar:sonar -Dsonar.projectKey=OddsFx -Dsonar.host.url=http://nordh.xyz:9088 -Dsonar.login=98433ea0ae6483d8cba5303c9a925e4a4383de1f

+ 15 - 0
OddsJavaFx/pom.xml

@@ -32,5 +32,20 @@
 	    <artifactId>RCaller</artifactId>
 	    <version>3.0</version>
 	</dependency>
+		<dependency>
+	    <groupId>com.google.code.gson</groupId>
+	    <artifactId>gson</artifactId>
+	    <version>2.8.6</version>
+	</dependency>
+	<dependency>
+	    <groupId>org.openjfx</groupId>
+	    <artifactId>javafx-controls</artifactId>
+	    <version>19-ea+8</version>
+	  </dependency>
+	  <dependency>
+	      <groupId>org.openjfx</groupId>
+	      <artifactId>javafx-fxml</artifactId>
+	      <version>19-ea+8</version>
+	  </dependency>
    </dependencies>
 </project>

+ 5 - 5
OddsJavaFx/src/fxml/OddsFxBuilder.fxml

@@ -22,13 +22,13 @@
          <top>
             <FlowPane BorderPane.alignment="CENTER">
                <children>
-                  <ComboBox id="SportComboBox" fx:id="sportSelector" onAction="#SportSelected" prefHeight="25.0" prefWidth="200.0" promptText="Sport" />
-                  <ComboBox id="CountryComboBox" fx:id="countrySelector" disable="true" onAction="#CountrySelected" prefHeight="25.0" prefWidth="200.0" promptText="Country" />
-                  <ComboBox id="LeagueComboBox" fx:id="leagueSelector" disable="true" onAction="#LeagueSelected" prefHeight="25.0" prefWidth="200.0" promptText="League" />
-                  <Button fx:id="resetFilterButton" mnemonicParsing="false" onAction="#ResetFilter" text="Reset Filter" />
+                  <ComboBox id="SportComboBox" fx:id="sportSelector" onAction="#sportSelected" prefHeight="25.0" prefWidth="200.0" promptText="Sport" />
+                  <ComboBox id="CountryComboBox" fx:id="countrySelector" disable="true" onAction="#countrySelected" prefHeight="25.0" prefWidth="200.0" promptText="Country" />
+                  <ComboBox id="LeagueComboBox" fx:id="leagueSelector" disable="true" onAction="#leagueSelected" prefHeight="25.0" prefWidth="200.0" promptText="League" />
+                  <Button fx:id="resetFilterButton" mnemonicParsing="false" onAction="#resetFilter" text="Reset Filter" />
                   <Button fx:id="getLeagueInfoButton" disable="true" mnemonicParsing="false" onAction="#getLeagueInfo" text="Get League Info" />
                   <Button fx:id="getMoreLeagueInfo" disable="true" mnemonicParsing="false" onAction="#getMoreLeagueInfo" text="Get more league info" />
-                  <Button fx:id="updateStatsTableButton" disable="true" mnemonicParsing="false" onAction="#UpdateStatsTable" text="Update Statistics" />
+                  <Button fx:id="updateStatsTableButton" disable="true" mnemonicParsing="false" onAction="#updateStatsTable" text="Update Statistics" />
                   <Button fx:id="showMatchStatsButton" disable="true" mnemonicParsing="false" onAction="#setMatchStatInfo" text="Show match stats" />
                </children>
             </FlowPane>

+ 3 - 3
OddsJavaFx/src/fxml/PastResults.fxml

@@ -18,9 +18,9 @@
                      <children>
                         <DatePicker fx:id="date" prefHeight="30.0" prefWidth="209.0" />
                         <Button fx:id="getResults" mnemonicParsing="false" prefHeight="30.0" prefWidth="96.0" text="GetResults" onAction="#getResults" />
-                        <ComboBox id="SportComboBox" fx:id="sportSelector" onAction="#SportSelected" prefHeight="25.0" prefWidth="200.0" promptText="Sport" />
-            		    <ComboBox id="CountryComboBox" fx:id="countrySelector" disable="true" onAction="#CountrySelected" prefHeight="25.0" prefWidth="200.0" promptText="Country" />
-                        <ComboBox id="LeagueComboBox" fx:id="leagueSelector" disable="true" onAction="#LeagueSelected" prefHeight="25.0" prefWidth="200.0" promptText="League" />
+                        <ComboBox id="SportComboBox" fx:id="sportSelector" onAction="#sportSelected" prefHeight="25.0" prefWidth="200.0" promptText="Sport" />
+            		    <ComboBox id="CountryComboBox" fx:id="countrySelector" disable="true" onAction="#countrySelected" prefHeight="25.0" prefWidth="200.0" promptText="Country" />
+                        <ComboBox id="LeagueComboBox" fx:id="leagueSelector" disable="true" onAction="#leagueSelected" prefHeight="25.0" prefWidth="200.0" promptText="League" />
                      </children>
                   </FlowPane>
                </children>

+ 2 - 2
OddsJavaFx/src/fxml/Testing.fxml

@@ -20,8 +20,8 @@
                      <children>
                         <DatePicker fx:id="date" prefHeight="30.0" prefWidth="209.0" />
                         <Button fx:id="getResults" mnemonicParsing="false" onAction="#getResults" prefHeight="30.0" prefWidth="96.0" text="GetResults" />
-            		    <ComboBox id="CountryComboBox" fx:id="countrySelector" disable="true" onAction="#CountrySelected" prefHeight="25.0" prefWidth="200.0" promptText="Country" />
-                        <ComboBox id="LeagueComboBox" fx:id="leagueSelector" disable="true" onAction="#LeagueSelected" prefHeight="25.0" prefWidth="200.0" promptText="League" />
+            		    <ComboBox id="CountryComboBox" fx:id="countrySelector" disable="true" onAction="#countrySelected" prefHeight="25.0" prefWidth="200.0" promptText="Country" />
+                        <ComboBox id="LeagueComboBox" fx:id="leagueSelector" disable="true" onAction="#leagueSelected" prefHeight="25.0" prefWidth="200.0" promptText="League" />
                         
                         <Button fx:id="getLeagueInfoButton" mnemonicParsing="false" disable="true" onAction="#getLeagueInfo" prefHeight="30.0" prefWidth="96.0" text="Get league info" />
                         <Button fx:id="getMoreLeagueInfoButton" mnemonicParsing="false" disable="true" onAction="#getMoreLeagueInfo" prefHeight="30.0" prefWidth="96.0" text="Get more league info" />