Add message about successfull send data to server

Serginio06 · Jan 30, 2017 · f14df67 · f14df67
1 parent 5dd5a90
commit f14df67
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/frontEnd/src/pages/home/home.ts b/frontEnd/src/pages/home/home.ts
@@ -353,7 +353,8 @@ export class HomePage {
       () => {
         // this.serverService.sendDataToServer();
         this.localDataSaveService.saveCSVFile();
-        this.global.clOnScreen = "Сессия успешно записана в csv-файл "
+        // this.global.clOnScreen = "Сессия успешно записана в csv-файл ";
+        // this.global.clOnScreen = this.global.msg9;
       }, 1000
     );
 

diff --git a/frontEnd/src/providers/global.ts b/frontEnd/src/providers/global.ts
@@ -58,11 +58,15 @@ export class Global {
   public msg3 = "Err during data sending. See errorLog file";
   public msg4 = "Technical error. Please contact application administrator (log file included)";
   public msg5 = "Please turn on your Wi-Fi";
+  public msg6 = "Невозможно отправить данные на сервер. Убедитесь что вы подключены к Wi-Fi и нажмите кнопку, а затем stop для повторной попытки";
+  public msg7 = "Нет доступа к сети. Попробуйте позже";
+  public msg8 = "Данные успешно отправлены на сервер";
+  public msg9 = "Сессия успешно записана в csv-файл";
   public generalSpinnerMsg = "Please wait...";
   public spinnerSensorCheckMsg = "Checking sensors availability...";
 
   constructor(public platform: Platform, public alertController: AlertController, public loadingController: LoadingController) {
-    console.log('Hello Global Provider');
+    // console.log('Hello Global Provider');
     this.propertyObj.sessionId = this.sessionID;
     this.propertyObj.status = this.stateStatus;
   }

diff --git a/frontEnd/src/providers/local-data-save-service.ts b/frontEnd/src/providers/local-data-save-service.ts
@@ -134,7 +134,7 @@ export class LocalDataSaveService {
                 )
                   .then(
                     (result) => {
-
+                      this.global.clOnScreen = this.global.msg9;
                       return this.serverService.sendDataToServer(fileContent, "data");
 
                     }

diff --git a/frontEnd/src/providers/server-service.ts b/frontEnd/src/providers/server-service.ts
@@ -113,6 +113,8 @@ export class ServerService {
           HTTP.post(SERVER_URL, body, headers)
             .then(data => {
 
+              this.global.clOnScreen = this.global.msg8;
+
               if (dataType == "log") {
                 this.global.globalCleanLogFile();
               } else if (dataType == "data") {
@@ -126,7 +128,7 @@ export class ServerService {
             .catch(error => {
 
               // this.localDataSaveService.saveErrorLog(JSON.stringify(error));
-              // this.global.clOnScreen = this.global.msg3;
+              this.global.clOnScreen = this.global.msg3;
               this.global.saveErrorLog("sendDataToServer()", "Err during data sending: " + JSON.stringify(error));
               // console.log(error);
               // console.log(error.status);
@@ -142,14 +144,14 @@ export class ServerService {
         }
 
       } else {
-        // this.clOnScreen4 = "Phone is offline. Try send data later";
+        this.global.clOnScreen = this.global.msg7;
         // this.global.saveErrorLog("sendDataToServer()", "Phone is offline. Try send data later");
       }
 
     }
     catch (err) {
 
-      // this.global.clOnScreen9 = "err in send data/log to server";
+      this.global.clOnScreen = this.global.msg3;
       this.global.saveErrorLog("sendDataToServer()", "try-catch err: " + err);
     }
   }
-Original file line number
+Diff line change
@@ Expand Up / @@ -134,7 +134,7 @@ export class LocalDataSaveService { @@
                     )
                       .then(
                         (result) => {
+                          this.global.clOnScreen = this.global.msg9;
                           return this.serverService.sendDataToServer(fileContent, "data");
                         }
@@ Expand Down @@