Add server upload of the users game play data and metadata. #53

PeterWithers · PeterWithers · commit 7ef623ae705c · 2015-03-12T14:47:48.000+01:00
Added high scores retrieval from the server and added display of those high scores into the scores page. #54 Updated the Analytics ID to one in the LIL group. In the guess screen, prevented the choose arrows from showing when the answer is displayed.
diff --git a/gwt-cordova/pom.xml b/gwt-cordova/pom.xml
@@ -9,7 +9,7 @@
     <groupId>nl.ru.languageininteraction</groupId>
     <artifactId>languagememorygame</artifactId>
     <packaging>war</packaging>
-    <version>0.1.308-testing</version>
+    <version>0.1.317-testing</version>
     <name>Language Memory Game</name>
     <organization>
         <name>Language In Interaction</name>
diff --git a/gwt-cordova/setup-cordova.sh b/gwt-cordova/setup-cordova.sh
@@ -1,6 +1,6 @@
 #mvn install
 cd target
-appname=languagememorygame-0.1.308-testing
+appname=languagememorygame-0.1.317-testing
 rm -rf $appname-cordova
 unzip $appname-cordova.zip -d $appname-cordova
 cd $appname-cordova
diff --git a/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/model/UserResults.java b/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/model/UserResults.java
@@ -25,8 +25,6 @@ public class UserResults {
 
     private UserData userData = null;
     private GameData gameData = new GameData();
-    private StimuliGroup pendingStimuliGroup = null;
-    private String scoreLog = "";
 
     public UserResults(UserData userId) {
         this.userData = userId;
@@ -48,20 +46,4 @@ public void clearResults() {
     public GameData getGameData() {
         return gameData;
     }
-
-    public StimuliGroup getPendingStimuliGroup() {
-        return pendingStimuliGroup;
-    }
-
-    public void setPendingStimuliGroup(StimuliGroup pendingStimuliGroup) {
-        this.pendingStimuliGroup = pendingStimuliGroup;
-    }
-
-    public String getScoreLog() {
-        return scoreLog;
-    }
-
-    public void setScoreLog(String scoreLog) {
-        this.scoreLog = scoreLog;
-    }
 }
diff --git a/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/presenter/ScorePagePresenter.java b/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/presenter/ScorePagePresenter.java
@@ -19,8 +19,11 @@
 
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.core.client.JsArray;
+import com.google.gwt.http.client.URL;
+import com.google.gwt.i18n.shared.DateTimeFormat;
 import com.google.gwt.user.client.ui.Button;
 import com.google.gwt.user.client.ui.RootLayoutPanel;
+import java.util.Date;
 import nl.ru.languageininteraction.language.client.Messages;
 import nl.ru.languageininteraction.language.client.exception.AudioException;
 import nl.ru.languageininteraction.language.client.exception.MetadataFieldException;
@@ -35,6 +38,7 @@
 import nl.ru.languageininteraction.language.client.service.AudioPlayer;
 import nl.ru.languageininteraction.language.client.service.LocalStorage;
 import nl.ru.languageininteraction.language.client.service.MetadataFieldProvider;
+import nl.ru.languageininteraction.language.client.service.ResultsSerialiser;
 import nl.ru.languageininteraction.language.client.view.ScorePageView;
 
 /**
@@ -133,6 +137,16 @@ public void eventFired(Button button) {
                 try {
                     userResults.getUserData().validateNameField();
                     new LocalStorage().storeData(userResults);
+                    String restultsData = URL.encodeQueryString(new ResultsSerialiser() {
+                        final DateTimeFormat format = DateTimeFormat.getFormat(messages.reportDateFormat());
+
+                        @Override
+                        protected String formatDate(Date date) {
+                            return format.format(date);
+                        }
+                    }.serialise(userResults));
+                    new LocalStorage().addStoredGameData(userResults.getUserData().getUserId(), restultsData);
+                    userResults.clearResults();
                     appEventListner.requestApplicationState(nextState);
                 } catch (MetadataFieldException exception) {
                     // if the user has not entered their name etc then all actions force them to go to the edit details screen (which can only happen if they are playing for the first time or the clicked new player)
@@ -163,7 +177,8 @@ public void audioEnded() {
         scorePageView.setRoundsData(userResults.getGameData().getRoundsCorrect(), userResults.getGameData().getRoundsPlayed());
 
         final HighScoreService registrationService = new HighScoreService();
-        registrationService.submitScores(userResults, new HighScoreListener() {
+        final boolean isShareData = metadataFieldProvider.shareMetadataField.getControlledVocabulary()[0].equals(userResults.getUserData().getMetadataValue(metadataFieldProvider.shareMetadataField));
+        registrationService.submitScores(isShareData, userResults, new HighScoreListener() {
 
             @Override
             public void scoreSubmissionFailed(HighScoreException exception) {
@@ -183,11 +198,14 @@ public void scoreSubmissionFailed(HighScoreException exception) {
 
             @Override
             public void scoreSubmissionComplete(JsArray<HighScoreData> highScoreData) {
-                userResults.clearResults();
                 final HighScoreData highScoreJson = highScoreData.get(0);
                 for (int index = 0; index < highScoreJson.getCount(); index++) {
                     scorePageView.setHighScore(index, highScoreJson.getPlayerName(index), highScoreJson.getPlayerHighScore(index));
                 }
+                if (isShareData) {
+                    userResults.clearResults();
+                    new LocalStorage().clearStoredGameData(userResults.getUserData().getUserId());
+                }
                 appEventListner.requestApplicationState(AppEventListner.ApplicationState.highscoresubmitted);
             }
         }, messages.reportDateFormat());
diff --git a/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/registration/HighScoreService.java b/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/registration/HighScoreService.java
@@ -35,6 +35,7 @@
 import nl.ru.languageininteraction.language.client.model.HighScoreData;
 import nl.ru.languageininteraction.language.client.model.MetadataField;
 import nl.ru.languageininteraction.language.client.model.UserResults;
+import nl.ru.languageininteraction.language.client.service.LocalStorage;
 import nl.ru.languageininteraction.language.client.service.MetadataFieldProvider;
 import nl.ru.languageininteraction.language.client.service.ResultsSerialiser;
 
@@ -49,12 +50,11 @@ public class HighScoreService {
     final MetadataFieldProvider metadataFieldProvider = new MetadataFieldProvider();
     private final Version version = GWT.create(Version.class);
 
-    public void submitScores(UserResults userResults, HighScoreListener highScoreListener, final String reportDateFormat) {
+    public void submitScores(final boolean isShareData,UserResults userResults, HighScoreListener highScoreListener, final String reportDateFormat) {
         final String highScoresUrl = serviceLocations.highScoresUrl();
         final RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, highScoresUrl);
         builder.setHeader("Content-type", "application/x-www-form-urlencoded");
-        StringBuilder stringBuilder = new StringBuilder();
-        final boolean isShareData = metadataFieldProvider.shareMetadataField.getControlledVocabulary()[0].equals(userResults.getUserData().getMetadataValue(metadataFieldProvider.shareMetadataField));
+        StringBuilder stringBuilder = new StringBuilder();        
         if (isShareData) {
             for (MetadataField key : userResults.getUserData().getMetadataFields()) {
                 String value = URL.encodeQueryString(userResults.getUserData().getMetadataValue(key));
@@ -74,8 +74,8 @@ public void submitScores(UserResults userResults, HighScoreListener highScoreLis
         }
 
         if (isShareData) {
-            String scoreLog = URL.encodeQueryString(userResults.getScoreLog());
-            stringBuilder.append("scorelog").append("=").append(scoreLog).append("&");
+//            String scoreLog = URL.encodeQueryString(userResults.getScoreLog());
+//            stringBuilder.append("scorelog").append("=").append(scoreLog).append("&");
             String restultsData = URL.encodeQueryString(new ResultsSerialiser() {
                 final DateTimeFormat format = DateTimeFormat.getFormat(reportDateFormat);
 
@@ -84,17 +84,17 @@ protected String formatDate(Date date) {
                     return format.format(date);
                 }
             }.serialise(userResults));
-            stringBuilder.append("quest_results=").append(restultsData);
+            stringBuilder.append("quest_results=").append(new LocalStorage().getStoredGameData(userResults.getUserData().getUserId())).append(restultsData);
         }
         try {
-            builder.sendRequest(stringBuilder.toString(), geRequestBuilder(builder, highScoreListener, highScoresUrl));
+            builder.sendRequest(stringBuilder.toString(), geRequestBuilder(builder, highScoreListener, highScoresUrl, userResults));
         } catch (RequestException exception) {
             highScoreListener.scoreSubmissionFailed(new HighScoreException(HighScoreException.ErrorType.buildererror, exception));
             logger.log(Level.SEVERE, "SubmitHighScore", exception);
         }
     }
 
-    private RequestCallback geRequestBuilder(final RequestBuilder builder, final HighScoreListener highScoreListener, final String targetUri) {
+    private RequestCallback geRequestBuilder(final RequestBuilder builder, final HighScoreListener highScoreListener, final String targetUri, final UserResults userResults) {
         return new RequestCallback() {
             @Override
             public void onError(Request request, Throwable exception) {
diff --git a/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/service/LocalStorage.java b/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/service/LocalStorage.java
@@ -35,6 +35,7 @@ public class LocalStorage {
     private Storage dataStore = null;
     private static final String USER_RESULTS = "UserResults.";
     private static final String LAST_USER_ID = "LastUserId.";
+    private static final String GAME_DATA = "GameData.";
     protected static final String MAX_SCORE = "maxScore";
     final MetadataFieldProvider metadataFieldProvider = new MetadataFieldProvider();
 
@@ -45,6 +46,21 @@ private Storage loadStorage() {
         return dataStore;
     }
 
+    public void clearStoredGameData(UserId userId) {
+        loadStorage();
+        dataStore.setItem(GAME_DATA + userId.toString(), "");
+    }
+
+    public String getStoredGameData(UserId userId) {
+        loadStorage();
+        return getCleanStoredData(GAME_DATA + userId.toString());
+    }
+
+    public void addStoredGameData(UserId userId, String serialisedGameData) {
+        loadStorage();
+        dataStore.setItem(GAME_DATA + userId.toString(), getCleanStoredData(GAME_DATA + userId.toString()) + serialisedGameData);
+    }
+
     public UserData getStoredData(UserId userId) {
         UserData userData = new UserData(userId);
         loadStorage();
diff --git a/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/view/GuessRoundView.java b/gwt-cordova/src/main/java/nl/ru/languageininteraction/language/client/view/GuessRoundView.java
diff --git a/gwt-cordova/src/main/resources/nl/ru/languageininteraction/language/client/ServiceLocations.properties b/gwt-cordova/src/main/resources/nl/ru/languageininteraction/language/client/ServiceLocations.properties
diff --git a/gwt-cordova/src/main/webapp/LanguageMemory.html b/gwt-cordova/src/main/webapp/LanguageMemory.html
