@os1-platform/dispatch-mobile 2.1.13 → 2.1.15

package/src/manager/syncmanager/document/DocumentSyncManager.ts

@@ -42,7 +42,7 @@ export default class DocumentSyncManager {
     this._retries = value;
   }
 
-  private constructor() {}
+  private constructor() { }
 
   public init(baseURL: string, retryCount: number) {
     if (isEmptyOrBlank(baseURL))
@@ -80,7 +80,7 @@ export default class DocumentSyncManager {
               screenName: cta,
               cta: cta,
               extraParams: {
-                msg:'No data to sync'
+                msg: 'No data to sync'
               },
             });
             Logger.getInstance().logEvent(
@@ -97,7 +97,7 @@ export default class DocumentSyncManager {
             screenName: cta,
             cta: cta,
             extraParams: {
-              msg:'No Network'
+              msg: 'No Network'
             },
           });
           Logger.getInstance().logEvent(
@@ -114,7 +114,7 @@ export default class DocumentSyncManager {
           screenName: cta,
           cta: cta,
           extraParams: {
-            msg:flattenObject(error)
+            msg: flattenObject(error)
           },
         });
         Logger.getInstance().logEvent(
@@ -138,7 +138,7 @@ export default class DocumentSyncManager {
             screenName: cta,
             cta: cta,
             extraParams: {
-              msg:flattenObject(extraParameters)
+              msg: flattenObject(extraParameters)
             },
           });
           Logger.getInstance().logEvent(
@@ -156,7 +156,7 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg:'sync already in progress or max count reached'
+          msg: 'sync already in progress or max count reached'
         },
       });
       Logger.getInstance().logEvent(
@@ -206,7 +206,7 @@ export default class DocumentSyncManager {
       if (!this.docManager) {
         this.docManager = await DocumentManager.getInstance();
       }
-      console.log('insertDocument1:',fmsFolderID);
+      console.log('insertDocument1:', fmsFolderID);
       let insertResponse = await this.docManager?.insertDocument(
         fmsFolderID,
         desc,
@@ -229,7 +229,7 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg:'INIT DOC SYNC AGAIN'
+          msg: 'INIT DOC SYNC AGAIN'
         },
       });
       Logger.getInstance().logEvent(
@@ -294,7 +294,7 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg:flattenObject(extraParameters)
+          msg: flattenObject(extraParameters)
         },
       });
       Logger.getInstance().logEvent(
@@ -304,7 +304,7 @@ export default class DocumentSyncManager {
       );
       // Calling update method for attempt count and sync to update event row of type POD_DOC
       await eventsManager.markPODDocEventSynced(sync, attempt, podId);
-      if(sync == 1){
+      if (sync == 1) {
         const lastSyncedEventId = await Storage.getInstance().getSharedItem(
           LAST_SYNCED_EVENT_ID
         );
@@ -323,7 +323,7 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg:flattenObject(err)
+          msg: flattenObject(err)
         },
       });
       Logger.getInstance().logEvent(
@@ -334,7 +334,7 @@ export default class DocumentSyncManager {
     }
   }
 
-    // This function is updating processed_file_path column for the base64 overlayed data and overlayed image file for POD. Also if it is base 64 then it is also storing temprary file path in file_path as original bae64 image.
+  // This function is updating processed_file_path column for the base64 overlayed data and overlayed image file for POD. Also if it is base 64 then it is also storing temprary file path in file_path as original bae64 image.
   private async updateDocumentProcessedPath(
     documentRow: DocumentRow,
     origialFilePath: String,
@@ -355,7 +355,7 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg:flattenObject(err)
+          msg: flattenObject(err)
         },
       });
       Logger.getInstance().logEvent(
@@ -378,7 +378,7 @@ export default class DocumentSyncManager {
         screenName: cta,
         cta: cta,
         extraParams: {
-          msg:flattenObject(err)
+          msg: flattenObject(err)
         },
       });
       Logger.getInstance().logEvent(
@@ -407,9 +407,9 @@ export default class DocumentSyncManager {
       let cta = 'processImageData-started';
       let extra = {
         msg: 'processImageData-started',
-        fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4): '',
-        dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4): '',
-        dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9): ''
+        fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
+        dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',
+        dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9) : ''
       };
       fireEventWithScreenName({
         severityLevel: SeverityLevelValue.LOG,
@@ -431,7 +431,7 @@ export default class DocumentSyncManager {
       let lng = objGeoStamp.lng; // Longitude
       let accuracy = objGeoStamp.accuracy; // Location accuracy
       let strDMS = latlngToDms(`${lat}, ${lng}`); // Location in degree format
-      let strDMSWithAccuracy = strDMS; 
+      let strDMSWithAccuracy = strDMS;
       if (accuracy !== '') {
         strDMSWithAccuracy = strDMS + ' (Accuracy: ' + accuracy + 'm)'; // Appedning accuracy in location 
       }
@@ -444,7 +444,7 @@ export default class DocumentSyncManager {
           src: documentRow.file_path,
           scale: 1,
         },
-        watermarkTexts: [ 
+        watermarkTexts: [
           {
             text: `${dateTime}\n${strDMSWithAccuracy}`,  //Overlay text
             position: {
@@ -463,7 +463,7 @@ export default class DocumentSyncManager {
           },
         ],
         scale: 0,
-        quality: 100, 
+        quality: 100,
         filename: pFilePath,
         saveFormat: ImageFormat.jpg, // Saving in jpeg format
       };
@@ -480,15 +480,15 @@ export default class DocumentSyncManager {
           documentRow.file_path, //original file path catprued from camera
           completeFilePath // completeFilePath is the path with file:// of processed file 
         );
-        documentRow.processed_file_path = completeFilePath; 
+        documentRow.processed_file_path = completeFilePath;
       }
     }
     let cta = 'processImageData-completed';
     let extra = {
       msg: 'processImageData-completed',
-      fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4): '',
-      dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4): '',
-      dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9): ''
+      fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
+      dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',
+      dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9) : ''
     };
     fireEventWithScreenName({
       severityLevel: SeverityLevelValue.LOG,
@@ -507,7 +507,6 @@ export default class DocumentSyncManager {
 
   // This function will generate overlay base64 data and update documents table for processed_file_path columns with overlayed base64 data.
   private async processBase64Data(documentRow: DocumentRow) {
-        // If base64 overlayed data already existing then do not generate it again.
     if (
       documentRow.processed_file_path === null ||
       documentRow.processed_file_path === ''
@@ -515,9 +514,9 @@ export default class DocumentSyncManager {
       let cta = 'processBase64Data-started';
       let extra = {
         msg: 'processBase64Data-started',
-        fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4): '',
-        dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4): '',
-        dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9): ''
+        fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
+        dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',
+        dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9) : ''
       };
       fireEventWithScreenName({
         severityLevel: SeverityLevelValue.LOG,
@@ -553,7 +552,7 @@ export default class DocumentSyncManager {
       let lng = objGeoStamp.lng; // Longitude
       let accuracy = objGeoStamp.accuracy; // Location accuracy
       let strDMS = latlngToDms(`${lat}, ${lng}`); // Location in degree format
-      let strDMSWithAccuracy = strDMS; 
+      let strDMSWithAccuracy = strDMS;
       if (accuracy !== '') {
         strDMSWithAccuracy = strDMS + ' (Accuracy: ' + accuracy + 'm)'; // Appedning accuracy in location 
       }
@@ -603,9 +602,9 @@ export default class DocumentSyncManager {
     let cta = 'processBase64Data-completed';
     let extra = {
       msg: 'processBase64Data-completed',
-      fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4): '',
-      dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4): '',
-      dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9): ''
+      fName: documentRow.file_name && documentRow.file_name.length != 0 ? documentRow.file_name.substring(4) : '',
+      dName: documentRow.fms_folder_id && documentRow.fms_folder_id.length != 0 ? documentRow.fms_folder_id.substring(4) : '',
+      dispId: documentRow.dispatch_id && documentRow.dispatch_id.length != 0 ? documentRow.dispatch_id.substring(9) : ''
     };
     fireEventWithScreenName({
       severityLevel: SeverityLevelValue.LOG,
@@ -636,15 +635,15 @@ export default class DocumentSyncManager {
       let docRow = documentRow;
       let cta = 'uploadDocToServer-geoStamp';
       let geoStampAvailable = false
-      if(documentRow.geo_timestamp && documentRow.geo_timestamp.length != 0){
+      if (documentRow.geo_timestamp && documentRow.geo_timestamp.length != 0) {
         geoStampAvailable = true;
         docRow = await this.processPODData(documentRow);
       }
       let extra = {
         msg: geoStampAvailable ? "geoStamp availale" : 'geoStamp not availale',
-        fName: docRow.file_name && docRow.file_name.length != 0 ? docRow.file_name.substring(4): '',
-        dName: docRow.fms_folder_id && docRow.fms_folder_id.length != 0 ? docRow.fms_folder_id.substring(4): '',
-        dispId: docRow.dispatch_id && docRow.dispatch_id.length != 0 ? docRow.dispatch_id.substring(9): ''
+        fName: docRow.file_name && docRow.file_name.length != 0 ? docRow.file_name.substring(4) : '',
+        dName: docRow.fms_folder_id && docRow.fms_folder_id.length != 0 ? docRow.fms_folder_id.substring(4) : '',
+        dispId: docRow.dispatch_id && docRow.dispatch_id.length != 0 ? docRow.dispatch_id.substring(9) : ''
       };
       fireEventWithScreenName({
         severityLevel: SeverityLevelValue.LOG,
@@ -662,13 +661,13 @@ export default class DocumentSyncManager {
 
       let extraParameters = {
         fmsID: fmsID ?? '',
-        fName: docRow.file_name && docRow.file_name.length != 0 ? docRow.file_name.substring(4): '',
-        dName: docRow.fms_folder_id && docRow.fms_folder_id.length != 0 ? docRow.fms_folder_id.substring(4): '',
-        dispId: docRow.dispatch_id && docRow.dispatch_id.length != 0 ? docRow.dispatch_id.substring(9): ''
+        fName: docRow.file_name && docRow.file_name.length != 0 ? docRow.file_name.substring(4) : '',
+        dName: docRow.fms_folder_id && docRow.fms_folder_id.length != 0 ? docRow.fms_folder_id.substring(4) : '',
+        dispId: docRow.dispatch_id && docRow.dispatch_id.length != 0 ? docRow.dispatch_id.substring(9) : ''
       };
       // TODO: SOLELY DEPENDS ON FMS_ID WHICH IS WRONG => IT SHOULD BE Response.status = 202
       if (fmsID) {
-          // Calling function updating document row along with attempt count and sync as true.
+        // Calling function updating document row along with attempt count and sync as true.
         await this.updateDocumentWithAttempt(
           documentRow,
           fmsID,
@@ -676,7 +675,7 @@ export default class DocumentSyncManager {
           1
         );
         this._retries = 0;
-       // await this.updateDocument(docRow, fmsID);
+        // await this.updateDocument(docRow, fmsID);
       } else {
         // Calling function updating document row withalong  attempt count and sync as false.
         await this.updateDocumentWithAttempt(
@@ -703,8 +702,8 @@ export default class DocumentSyncManager {
         await this.updateDocError(docRow, 'Unexpected Error');
       }
     } catch (error: any) {
-        // Calling function updating document row withalong  attempt count and sync as false.
-        await this.updateDocumentWithAttempt(
+      // Calling function updating document row withalong  attempt count and sync as false.
+      await this.updateDocumentWithAttempt(
         documentRow,
         '',
         this._retries + 1,
@@ -738,8 +737,8 @@ export default class DocumentSyncManager {
     }
   }
 
-  private async startSyncAfterMaxRetry(extraParameters:any, error:any){
-    if(this.retries >= this.maxRetryCount){
+  private async startSyncAfterMaxRetry(extraParameters: any, error: any) {
+    if (this.retries >= this.maxRetryCount) {
       let cta = 'startSyncAfterMaxRetry-max-retry-reached'
       fireEventWithScreenName({
         severityLevel: SeverityLevelValue.LOG,
@@ -757,7 +756,7 @@ export default class DocumentSyncManager {
         this.docManager = await DocumentManager.getInstance();
       }
       let documentRows: DocumentRow[] =
-      await this.docManager.getUnsyncedDocument();
+        await this.docManager.getUnsyncedDocument();
       if (documentRows?.length > 0) {
         await this.docManager.updateDocPriority(documentRows[0].id, documentRows[0].priority + 1);
         this._retries = 0;

package/src/ui/screens/DeliverScreen.tsx

@@ -10,15 +10,11 @@ import CancelOrderDialog from '../../components/widgets/CancelOrderDialog';
 import { onTaskStart } from '../../utils/ExecTaskUtils';
 import { DispatchExecutor } from '@os1-platform/platform-coreos-execution-engine-sdk';
 import Storage from '../../utils/storage';
-import {
-  SCAN_MERGED_OBJ_ID_OUTPUT,
-  SHARED_PREFERENCE_SCAN_OUTPUT,
-} from '../../manager/syncmanager/constants';
 import { GO_BACK_EVENT_CODE } from '../../constants/constants';
 import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
-import AsyncStorage from '@react-native-async-storage/async-storage';
+import { PROGRESS_GROUP } from '../../utils/Constants';
 
 const DeliverScreen = ({
   navigation,
@@ -69,8 +65,14 @@ const DeliverScreen = ({
   }
 
   const getMergedReturnPackageCount = async () => {
-    const count = await DispatchExecutor.getScannedShipmentsCount(
-      mergedObjectiveId
+    let progressGroup = null;
+    try {
+      progressGroup = await Storage.getInstance().getSharedItem(PROGRESS_GROUP, false);
+    } catch (error) {
+      progressGroup = null;
+    }
+    const count = await DispatchExecutor.getShipmentsCountForDeliverET(
+      mergedObjectiveId, progressGroup
     );
     setReturnPackageCount(count.totalCount);
     setShipCount(count.shipCount);

package/src/ui/screens/FormsScreen.tsx

@@ -16,7 +16,8 @@ import { AjvError } from '@rjsf/core';
 import Helper from '../../utils/helper';
 import { ScreenNameSdkConstants, SentryEventNameSdkConstants, SeverityLevelValue } from '../../analytics/sentry/SentrySdkConstants';
 import { fireEventWithScreenName } from '../../analytics/sentry/SentryAnalyticsUtils';
-import AsyncStorage from '@react-native-async-storage/async-storage';
+import { PROGRESS_GROUP } from '../../utils/Constants';
+import Storage from '../../utils/storage';
 
 const FormsScreen = ({
   route,
@@ -48,12 +49,18 @@ const FormsScreen = ({
       );
 
       if (route.params[RouteParams.ROOT_META_DATA]) {
-        
-       //Call objectiveDetails fn and fetch sds ids
-       const { contact } = await dispatchExecutor.getObjectiveTaskDetails(
-        mergedObjectiveId[0],
-        route.params[RouteParams.ROOT_META_DATA].statusFilter
-      );
+        //Call objectiveDetails fn and fetch sds ids
+        let progressGroup = null;
+        try {
+          progressGroup = await Storage.getInstance().getSharedItem(PROGRESS_GROUP, false);
+        } catch (error) {
+          progressGroup = null;
+        }
+        const { contact } = await dispatchExecutor.getObjectiveTaskDetails(
+          mergedObjectiveId[0],
+          progressGroup,
+          route.params[RouteParams.ROOT_META_DATA].statusFilter
+        );
 
         // run callback to get corresponding phone numbers
         const phoneNumbers = await callbackHandler.getPhoneNumbers(contact);

package/src/ui/screens/ImageCaptureScreen.tsx

@@ -33,7 +33,7 @@ const ImageCaptureScreen = ({
   useEffect(() => {
     (async () => {
       //fire sentry event
-      fireEventWithScreenName({severityLevel:SeverityLevelValue.LOG, eventName:SentryEventNameSdkConstants.CAPTURE_IMAGE_ET_OPENED, screenName:ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN});
+      fireEventWithScreenName({ severityLevel: SeverityLevelValue.LOG, eventName: SentryEventNameSdkConstants.CAPTURE_IMAGE_ET_OPENED, screenName: ScreenNameSdkConstants.CAPTURE_IMAGE_ET_SCREEN });
       //      
       onTaskStart(
         route.params[RouteParams.NEXT_STATES],

package/src/utils/Constants.ts

@@ -0,0 +1,2 @@
+const KEY_STORAGE_PREFIX = '@Dsp_Executor_';
+export const PROGRESS_GROUP = KEY_STORAGE_PREFIX + 'progressGroup';

package/src/utils/Enums.ts

@@ -0,0 +1,4 @@
+export enum Bool {
+    TRUE = "1",
+    FALSE = "0"
+}

package/src/utils/storage.ts

@@ -203,13 +203,13 @@ class Storage {
   /**
    * Shared preferences
    */
-  async setSharedItem(key: string, value: string, prefix:boolean = true): Promise<void> {
+  async setSharedItem(key: string, value: string, prefix: boolean = true): Promise<void> {
     if (Platform.OS === 'android') {
       await SharedPreferencesModule.setItem(key, value);
     } else {
-      if(prefix){
+      if (prefix) {
         await this.setItem(key, value);
-      }else{
+      } else {
         await AsyncStorage.setItem(key, value);
       }
     }
@@ -225,14 +225,14 @@ class Storage {
     }
   }
 
-  async getSharedItem(key: string, prefix:boolean = true): Promise<any> {
+  async getSharedItem(key: string, prefix: boolean = true): Promise<any> {
     if (Platform.OS === 'android') {
       return await SharedPreferencesModule.getItem(key);
     } else {
-      if(prefix){
+      if (prefix) {
         let item = await this.getItem(key);
         return item;
-      }else{
+      } else {
         let item = await AsyncStorage.getItem(key);
         return item;
       }
@@ -280,13 +280,13 @@ class Storage {
     }
   }
 
-  async removeSharedItem(key: string, prefix:boolean = true): Promise<void> {
+  async removeSharedItem(key: string, prefix: boolean = true): Promise<void> {
     if (Platform.OS === 'android') {
       await SharedPreferencesModule.removeItem(key);
     } else {
-      if(prefix){
+      if (prefix) {
         await this.deleteItem(key);
-      }else{
+      } else {
         await AsyncStorage.removeItem(key);
       }
     }