Merge pull request #283 from ajayyy/improvements

Changes For Worlds

Author: ajayyy

app/src/main/java/ca/lakeeffect/scoutingapp/FieldUIPage.java

@@ -264,6 +264,8 @@ public String[] getData() {
         int[] farRocket = new int[4];
         int[] closeRocket = new int[4];
         int[] fullRocket = new int[4];
+        //the robot scored into any position
+        int[] everything = new int[4];
 
         int[] cargoShipLocations = {12, 13, 14, 15, 16, 17, 18};
         int[] sideCargoShipLocations = {12, 13, 14, 16, 17, 18};
@@ -333,9 +335,16 @@ public String[] getData() {
             if (MainActivity.arrayContains(closeRocketLocations, location)) {
                 closeRocket[id]++;
             }
+
+            //totals for everything
+            everything[id]++;
         }
 
         for (int i = 0; i < labelActions.length; i++) {
+            //overall data
+            labels.append(fieldPeriod + "Total " + labelActions[i] + ",");
+            data.append(everything[i] + ",");
+
             //most important data
             labels.append(fieldPeriod + "Full Cargo Ship " + labelActions[i] + ",");
             data.append(cargoShip[i] + ",");

app/src/main/java/ca/lakeeffect/scoutingapp/ListeningActitivty.java

@@ -4,11 +4,16 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.support.v7.app.AppCompatActivity;
+import android.view.View;
+import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
+import android.widget.LinearLayout;
+import android.widget.ScrollView;
 import android.widget.Spinner;
 import android.widget.TextView;
 
 import java.util.ArrayList;
+import java.util.Calendar;
 
 //contains the base of what an activity using ConnectionThread
 // and ListenerThread should have
@@ -157,4 +162,132 @@ public int getLocationInSharedMessages(String message) {
         }
         return -1;
     }
+
+    public void openScheduleViewer() {
+        ScrollView scheduleViewer = new ScrollView(this);
+
+        final LinearLayout scheduleViewerLayout = (LinearLayout) getLayoutInflater().inflate(R.layout.schedule_viewer, null);
+
+        //figure out when the schedule was last updated
+        TextView lastUpdated = scheduleViewerLayout.findViewById(R.id.scheduleViewerLastUpdate);
+        String lastUpdatedMessage = "";
+        SharedPreferences lastUpdatedPrefs = getSharedPreferences("lastScheduleUpdate", MODE_PRIVATE);
+        int year = lastUpdatedPrefs.getInt("year", -1);
+        int month = lastUpdatedPrefs.getInt("month", -1);
+        int day = lastUpdatedPrefs.getInt("day", -1);
+        int hour = lastUpdatedPrefs.getInt("hour", -1);
+        int minute = lastUpdatedPrefs.getInt("minute", -1);
+
+        //get current dates to compare with
+        int currentYear = Calendar.getInstance().get(Calendar.YEAR);
+        int currentMonth = Calendar.getInstance().get(Calendar.MONTH);
+        int currentDay = Calendar.getInstance().get(Calendar.DAY_OF_MONTH);
+        int currentHour = Calendar.getInstance().get(Calendar.HOUR);
+        int currentMinute = Calendar.getInstance().get(Calendar.MINUTE);
+
+        if (year == currentYear) {
+            if (month == currentMonth) {
+                if (day == currentDay) {
+                    if (hour == currentHour) {
+                        lastUpdatedMessage = (currentMinute - minute) + " minutes ago";
+                    } else {
+                        lastUpdatedMessage = (currentHour - hour) + " hours ago";
+                    }
+                } else {
+                    lastUpdatedMessage = (currentDay - day) + " days ago";
+                }
+            } else {
+                lastUpdatedMessage = (currentMonth - month) + " months ago";
+            }
+        } else {
+            lastUpdatedMessage = (currentYear - year) + " years ago";
+        }
+        if (year == -1) {
+            lastUpdatedMessage = "Never";
+        }
+
+        //set the message onto the label
+        lastUpdated.setText("Last Updated " + lastUpdatedMessage);
+
+        userIDSpinner = scheduleViewerLayout.findViewById(R.id.scheduleViewerUserIDSpinner);
+        updateUserIDSpinner();
+
+        SharedPreferences prefs = getSharedPreferences("userID", MODE_PRIVATE);
+        int userID = prefs.getInt("userID", -1);
+
+        if (userID != -1) {
+            //set the spinner to this value
+            userIDSpinner.setSelection(userID + 1);
+
+            //update the schedule view
+            updateScheduleDialog(scheduleViewerLayout, userID);
+        }
+
+        //add listener to the spinner
+        userIDSpinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+            @Override
+            public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+                if (position > 0) {
+                    //if it is not on the "Choose one" selection
+                    updateScheduleDialog(scheduleViewerLayout, position - 1);
+                }
+            }
+            @Override
+            public void onNothingSelected(AdapterView<?> parent) {
+
+            }
+        });
+
+        //add the layout to the scroll view (the entire view)
+        scheduleViewer.addView(scheduleViewerLayout);
+
+        //create the dialog box
+        new android.app.AlertDialog.Builder(this)
+                .setTitle("View Schedule")
+                .setView(scheduleViewer)
+                .setPositiveButton("Dismiss", null)
+                .show();
+    }
+
+    public void updateScheduleDialog(View view, int userID) {
+        TextView scheduleTextView = view.findViewById(R.id.scheduleViewerTextView);
+
+        //show all the times the scout is switching on or off
+        StringBuilder scheduleMessage = new StringBuilder();
+
+        //the current match number being checked for
+        int matchNumber = 0;
+
+        while (matchNumber < schedules.get(userID).robots.size()) {
+            if (!schedules.get(userID).isOff(matchNumber)) {
+                //add the next match off
+                int nextMatchOff = getNextMatchOff(matchNumber, userID);
+
+                if (nextMatchOff == -1) {
+                    //no more switches on or off, this user is done for the day
+                    break;
+                }
+
+                scheduleMessage.append("Off at match " + nextMatchOff + "\n\n");
+
+                //set the match number to check to the match number reached
+                matchNumber = nextMatchOff;
+            } else {
+                //add the next match on
+                int nextMatchOn = getNextMatchOn(matchNumber, userID);
+
+                if (nextMatchOn == -1) {
+                    //no more switches on or off, this user is done for the day
+                    break;
+                }
+
+                scheduleMessage.append("On at match " + nextMatchOn + "\n\n");
+
+                //set the match number to check to the match number reached
+                matchNumber = nextMatchOn;
+            }
+        }
+
+        scheduleTextView.setText(scheduleMessage.toString());
+    }
 }