Merge branch '7.0'

avniproject · Feb 13, 2024 · 305dd0b · 305dd0b
2 parents 856ad85 + f955285
commit 305dd0b
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/packages/openchs-android/package-lock.json b/packages/openchs-android/package-lock.json
diff --git a/packages/openchs-android/package.json b/packages/openchs-android/package.json
@@ -58,7 +58,7 @@
     "lodash": "4.17.21",
     "moment": "2.29.4",
     "native-base": "3.4.9",
-    "openchs-models": "1.31.33",
+    "openchs-models": "1.31.34",
     "prop-types": "15.8.1",
     "react": "18.2.0",
     "react-native": "0.72.3",

diff --git a/packages/openchs-android/src/service/IndividualService.js b/packages/openchs-android/src/service/IndividualService.js
@@ -112,7 +112,7 @@ class IndividualService extends BaseService {
             db.create(Individual.schema.name, {
                 uuid: individual.uuid,
                 observations: individual.observations
-            }, true);
+            }, Realm.UpdateMode.Modified);
             db.create(EntityQueue.schema.name, EntityQueue.create(individual, Individual.schema.name));
         });
     }

diff --git a/packages/openchs-android/src/service/MediaQueueService.js b/packages/openchs-android/src/service/MediaQueueService.js
@@ -201,6 +201,7 @@ class MediaQueueService extends BaseService {
             })
             .then(() => this.uploadToUrl(uploadUrl, mediaQueueItem))
             .then(() => this.replaceObservation(mediaQueueItem, uploadUrl))
+            .then(() => this.popItem(mediaQueueItem))
             .catch((error) => {
                 General.logError("MediaQueueService", `Error while uploading ${mediaQueueItem.uuid} - ${mediaQueueItem.fileName}`);
                 General.logError("MediaQueueService", error);

diff --git a/packages/openchs-android/src/service/ProgramEnrolmentService.js b/packages/openchs-android/src/service/ProgramEnrolmentService.js
@@ -67,7 +67,7 @@ class ProgramEnrolmentService extends BaseService {
             db.create(ProgramEnrolment.schema.name, {
                 uuid: programEnrolment.uuid,
                 observations: programEnrolment.observations
-            }, true);
+            }, Realm.UpdateMode.Modified);
             db.create(EntityQueue.schema.name, EntityQueue.create(programEnrolment, ProgramEnrolment.schema.name));
         });
     }