Sync for new Locally created observation

src/components/CommonUtil.vue

@@ -6,6 +6,8 @@ export default {
 
     CONST_EVENT_LOGIN_USER_DETAIL       :   'eventloginuserdetail',
 
+    CONST_STATUS_PENDING                :   1,
+
     CONST_STORAGE_UUID                  :   'user-uuid',
     CONST_STORAGE_USER_DETAIL           :   'store-user-detail',
     CONST_STORE_TIMESTAMP               :   'store-time-stamp',

src/components/Observation.vue

@@ -194,7 +194,11 @@ export default {
                 jsonObservation                         = lstObservations.find(({observationId})=> observationId === id);                           // Selection Observation
                 this.observation                        = jsonObservation;
                 this.observation.observationData        = JSON.parse(jsonObservation.observationData);
-                
+                if(jsonObservation.statusTypeId) {}
+                else
+                {
+                  this.observation.statusTypeId = CommonUtil.CONST_STATUS_PENDING;
+                }
 
                 /* For related Crop and Crop list */
                 this.getObservationCrops(jsonObservation);
@@ -438,7 +442,12 @@ export default {
           return false
         }
         let This = this;
+        
+
         let lstObservations = JSON.parse(localStorage.getItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST));
+        /** Whether record to be updated */
+        let isRecordAvailable = lstObservations.find(({observationId})=> observationId === this.observationId);
+        
 
           this.observationForStore.cropOrganismId             = this.crop.cropId;
           this.observationForStore.organismId                 = this.pest.pestId;
@@ -457,7 +466,7 @@ export default {
           this.observationForStore.observationIllustrationSet = this.observation.observationIllustrationSet;
           
 
-         if(this.observationId)
+         if(this.observationId && isRecordAvailable)
          {
               this.observationForStore.observationId  = this.observationId;
               let localObservationForStore            = this.observationForStore;
@@ -499,6 +508,7 @@ export default {
                 lstObservations = [];
                 
               }
+              this.observationForStore.statusTypeId=CommonUtil.CONST_STATUS_PENDING;
               lstObservations.push(this.observationForStore);
          }
               localStorage.setItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST, JSON.stringify(lstObservations) );

src/components/ObservationList.vue

@@ -8,8 +8,8 @@
   </div>
   
   <div v-if="observations">
-  <ul class="list-group">
-       <router-link :to="{name: 'Observation', params: {observationId:obs.observationId}}" class="list-group-item list-group-item-action " v-for="obs in observations" v-bind:key="obs.observationId">
+  <ul class="list-group" v-if="isInitialized">
+       <router-link :to="{name: 'Observation', params: {observationId:obs.observationId}}" class="list-group-item list-group-item-action " v-bind:class="{'text-danger':obs.isNew, 'text-primary':obs.toUpload}" v-for="obs in observations" v-bind:key="obs.observationId">
 
         {{ obs.timeOfObservation | dateFormat }}  <b>{{obs.observationHeading}}</b> 
     </router-link >
@@ -35,6 +35,7 @@ export default {
   data() {
     return {
       /*msg: 'Startsiden'*/
+      isInitialized     : false,
       CONST_URL_DOMAIN  : '',
       observations      : undefined,
     };
@@ -43,8 +44,22 @@ export default {
   methods : {
         getObservationsFromStore()
         {
+          this.isInitialized = true;
           let strObservations = localStorage.getItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST);
           let lstObservations = JSON.parse(strObservations);
+          lstObservations.forEach(function(observation){
+              if(observation.uploaded==false)
+              {
+                if(observation.observationId < 0)
+                {
+                  observation.isNew = true;
+                }
+                else{
+                  observation.toUpload = true;
+                }
+              }
+
+          });
           this.observations = lstObservations;
         },
 
@@ -57,6 +72,7 @@ export default {
     }
   },
   mounted()  {
+
               let valueObj = {"name":CommonUtil.CONST_STORAGE_OBSERVATION_LIST,"complete":false};
               //this.$refs.Sync.syncObservationSendPrepare(valueObj);
               this.CONST_URL_DOMAIN = this.$refs.CommonUtil.getDomain();

src/components/Sync.vue

@@ -453,6 +453,7 @@ export default {
             let userUUID = localStorage.getItem(CommonUtil.CONST_STORAGE_UUID);
 
             let jsonBody = JSON.stringify(observation);
+
             fetch(
                     CommonUtil.CONST_URL_DOMAIN + CommonUtil.CONST_URL_SYNC_UPDATE_OBSERVATION,
                     {
@@ -476,7 +477,29 @@ export default {
             })
             .then((data)=>{
                 let updatedObservation = JSON.parse(data);
-               
+
+               if(observation.observationId < 0)
+               {
+                   let indexPosition = null;
+                   let lstObservations = JSON.parse(localStorage.getItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST));
+                   $.each(lstObservations, function(index, jsonObservation){
+                       if(observation.observationId == jsonObservation.observationId)
+                       {
+                           indexPosition = index;
+                           return false;
+
+                       }
+                   })
+
+                    if(indexPosition)
+                    {
+                        /** Remove the Observation with nagative number (localy created ) */
+                        lstObservations.splice(indexPosition,1);
+                        localStorage.setItem(CommonUtil.CONST_STORAGE_OBSERVATION_LIST,JSON.stringify(lstObservations));
+                        this.getObservationsFromServerTwowaySync(1,updatedObservation)
+                    }
+
+               }
                 if(updatedObservation.observationId === observation.observationId)
                 {
                     this.updateObservationPOST(updatedObservation,totalTwoWaySyncPOST);
@@ -551,7 +574,6 @@ export default {
     /** GET Observations */
     getObservationsFromServerTwowaySync(totalTwoWaySyncPOST,updatedObservation)
     {
-        console.log('-- inside GET ');
         
         let This = this;
         let strUUID     = localStorage.getItem(CommonUtil.CONST_STORAGE_UUID);