Match Uploading Overhaul

the-orange-alliance · Jan 4, 2019 · ebe824b · ebe824b
1 parent 6613edf
commit ebe824b
Show file tree

Hide file tree

Showing 6 changed files with 528 additions and 466 deletions.
diff --git a/src/org/theorangealliance/datasync/DataSyncController.java b/src/org/theorangealliance/datasync/DataSyncController.java
@@ -648,7 +648,7 @@ public void postMatchSchedule() {
 
     @FXML
     public void postSelectedMatch() {
-        this.matchesController.postSelectedMatch();
+        this.matchesController.postSelectedMatchAskUser();
     }
 
     @FXML

diff --git a/src/org/theorangealliance/datasync/json/toa/MatchGeneralJSON.java b/src/org/theorangealliance/datasync/json/toa/MatchGeneralJSON.java
@@ -11,6 +11,50 @@
  */
 public class MatchGeneralJSON {
 
+    public MatchGeneralJSON(String matchKey, String eventKey, int tournamentLevel, String scheduledTime, String matchName, int playNumber, int fieldNumber, String lastCommitTime, int redScore, int blueScore, int redPenalty, int bluePenalty, int redAutoScore, int blueAutoScore, int redTeleScore, int blueTeleScore, int redEndScore, int blueEndScore, String videoUrl) {
+        this.matchKey = matchKey;
+        this.eventKey = eventKey;
+        this.tournamentLevel = tournamentLevel;
+        this.scheduledTime = scheduledTime;
+        this.matchName = matchName;
+        this.playNumber = playNumber;
+        this.fieldNumber = fieldNumber;
+        this.lastCommitTime = lastCommitTime;
+        this.redScore = redScore;
+        this.blueScore = blueScore;
+        this.redPenalty = redPenalty;
+        this.bluePenalty = bluePenalty;
+        this.redAutoScore = redAutoScore;
+        this.blueAutoScore = blueAutoScore;
+        this.redTeleScore = redTeleScore;
+        this.blueTeleScore = blueTeleScore;
+        this.redEndScore = redEndScore;
+        this.blueEndScore = blueEndScore;
+        this.videoUrl = videoUrl;
+    }
+
+    public MatchGeneralJSON() {
+        this.matchKey = "";
+        this.eventKey = "";
+        this.tournamentLevel = 0;
+        this.scheduledTime = "";
+        this.matchName = "";
+        this.playNumber = 1;
+        this.fieldNumber = 0;
+        this.lastCommitTime = "";
+        this.redScore = 0;
+        this.blueScore = 0;
+        this.redPenalty = 0;
+        this.bluePenalty = 0;
+        this.redAutoScore = 0;
+        this.blueAutoScore = 0;
+        this.redTeleScore = 0;
+        this.blueTeleScore = 0;
+        this.redEndScore = 0;
+        this.blueEndScore = 0;
+        this.videoUrl = "";
+    }
+
     @SerializedName("match_key")
     private String matchKey;
 

diff --git a/src/org/theorangealliance/datasync/json/toa/MatchParticipantJSON.java b/src/org/theorangealliance/datasync/json/toa/MatchParticipantJSON.java
@@ -4,14 +4,56 @@
 
 public class MatchParticipantJSON {
 
+    public MatchParticipantJSON() {
+        this.matchParticipantKey = "";
+        this.matchKey = "";
+        this.teamKey = 0;
+        this.station = 0;
+        this.stationStatus = 0;
+        this.refStatus = 0;
+    }
+
+    public MatchParticipantJSON(String matchKey, int station, int teamKey) {
+        this.matchKey = matchKey;
+        this.station = station;
+        this.teamKey = teamKey;
+        this.matchParticipantKey = this.matchKey + "-" + getStationSuffix();
+        this.stationStatus = 1;
+    }
+
+    private String getStationSuffix() {
+        String suffix = "";
+        switch (station) {
+            case 11:
+                suffix = "R1";
+                break;
+            case 12:
+                suffix = "R2";
+                break;
+            case 13:
+                suffix = "R3";
+                break;
+            case 21:
+                suffix = "B1";
+                break;
+            case 22:
+                suffix = "B2";
+                break;
+            case 23:
+                suffix = "B3";
+                break;
+        }
+        return suffix;
+    }
+
     @SerializedName("match_participant_key")
     private String matchParticipantKey;
 
     @SerializedName("match_key")
     private String matchKey;
 
     @SerializedName("team_key")
-    private String teamKey;
+    private int teamKey;
 
     @SerializedName("station")
     private int station;
@@ -38,11 +80,11 @@ public void setMatchKey(String matchKey) {
         this.matchKey = matchKey;
     }
 
-    public String getTeamKey() {
+    public int getTeamKey() {
         return teamKey;
     }
 
-    public void setTeamKey(String teamKey) {
+    public void setTeamKey(int teamKey) {
         this.teamKey = teamKey;
     }
 

diff --git a/src/org/theorangealliance/datasync/models/MatchGeneralAndMatchParticipant.java b/src/org/theorangealliance/datasync/models/MatchGeneralAndMatchParticipant.java
@@ -1,5 +1,7 @@
 package org.theorangealliance.datasync.models;
 
+import org.theorangealliance.datasync.json.toa.MatchParticipantJSON;
+
 public class MatchGeneralAndMatchParticipant {
 
     public MatchGeneralAndMatchParticipant () {
@@ -9,7 +11,7 @@ public MatchGeneralAndMatchParticipant () {
 
     private MatchGeneral MatchGeneral;
 
-    private MatchParticipant[] MatchParticipants;
+    private MatchParticipantJSON[] MatchParticipants;
 
     public org.theorangealliance.datasync.models.MatchGeneral getMatchGeneral() {
         return MatchGeneral;
@@ -19,11 +21,11 @@ public void setMatchGeneral(org.theorangealliance.datasync.models.MatchGeneral m
         MatchGeneral = matchGeneral;
     }
 
-    public MatchParticipant[] getMatchParticipants() {
+    public MatchParticipantJSON[] getMatchParticipants() {
         return MatchParticipants;
     }
 
-    public void setMatchParticipants(MatchParticipant[] matchParticipants) {
+    public void setMatchParticipants(MatchParticipantJSON[] matchParticipants) {
         MatchParticipants = matchParticipants;
     }
 }
diff --git a/src/org/theorangealliance/datasync/models/MatchParticipant.java b/src/org/theorangealliance/datasync/models/MatchParticipant.java
@@ -2,6 +2,8 @@
 
 /**
  * Created by Kyle Flynn on 11/29/2017.
+ * @deprecated by Soren Zaiser
+ * Reason: Just Use the JSON model
  */
 public class MatchParticipant {
-Original file line number
+Diff line change
@@ Expand Up / @@ -648,7 +648,7 @@ public void postMatchSchedule() { @@
         @FXML
         public void postSelectedMatch() {
-            this.matchesController.postSelectedMatch();
+            this.matchesController.postSelectedMatchAskUser();
         }
         @FXML
@@ Expand Down @@