comparison eventLogger.mm @ 32:ab7c86d0f3d8

V0.3 SZBeta sent out. bristol tests.

 
 //---------------------------------------------------------------------------
 #include "eventLogger.h"
 
 EventLogger eventLogger;
+extern PresetManager presetManager;
 
 //---------------------------------------------------------------------------
 EventLogger::EventLogger(){
 
     consentGiven = true; // unless told otherwise firstAppOpen

     questionnaireUploaded = true;
 }
 //-----------------------------
 void EventLogger::eventlogOK(){
     // IF UPLAODING FROM IPAD TO XCODE
-    //theEvents.clear();
+    theEvents.clear();
     cout << "EVENT LOG UPLOAD SUCCESS\n";
     nextUploadNumber++;
     logUploadInProgress = false;
 }
 //-----------------------------

     cout << "^^^^^^^^ server connection OK ^^^^^^^^ \n";
     serverConnectionOK = true;
 }
 //-----------------------------
 void EventLogger::questionnaireNotOK(){
+    cout << "XXXXX questionnaire  NOT OK XXXXXXX \n";
     questionnaireUploaded = false;
 }
 //-----------------------------
 void EventLogger::eventlogNotOK(){
     // try later
+    cout << "XXXXX event log  NOT OK XXXXXXX \n";
     nextUploadQty += UPLOAD_CHUNK_SIZE;
     logUploadInProgress = false;
 }
 //-----------------------------
 void EventLogger::testConnectionNotOK(){
-    cout << "^^^^^^^^ server connection NOT OK ^^^^^^^^ \n";
+    cout << "XXXXX server connection NOT OK XXXXXXX \n";
     serverConnectionOK = false;
     // alert?
     
 }
 

             nextUploadQty += UPLOAD_CHUNK_SIZE;
         }else{
             
             // if success - clear memory
             // IF UPLAODING FROM IPAD TO XCODE COMMENT OUT
-            //theEvents.clear();
+            theEvents.clear();
             cout << "UPLOAD SUCCESS\n";
             nextUploadNumber++;
         }
         logUploadInProgress = false;
         return success;

     }
 }
 //----------------------------------------------------------------------------
 
 //----------------------------------------------------------------------------
-//void EventLogger::deleteLogFile(){
-
 
 //---------------------------------------------------------------------------
 // only called when doing supervised tests
 void EventLogger::newUser(){
+    // store old stuff
+    
+    saveSessionToFile();
+    presetManager.saveSessionToFile(userName);
     cout<<"setup new user\n";
     deleteLogs();
     nextUploadNumber = 0;
     deviceID = ofGetSystemTimeMicros();
     savedInteractionTime = 0;

     cout << logsToJson() << "\n";
     cout << "---------------------QUESTIONNAIRE---------------- \n";
     cout << questionnaireToJson() << "\n";
 };
 //---------------------------------------------------------------------------
+
+void EventLogger::saveSessionToFile(){
+    string fname = ofxiPhoneGetDocumentsDirectory() + userName + '_' + EVENT_LOG_FILENAME;
+    
+    // write to file
+    // json without the logs that were uploaded!
+    Json::Value jlogs = logsToJson();
+    ofFile logFile(fname,ofFile::WriteOnly);
+    logFile << jlogs;
+    logFile.close();
+
+}