openchs-models 1.32.40 → 1.32.41

package/dist/SyncTelemetry.js

@@ -92,6 +92,14 @@ class SyncTelemetry extends _BaseEntity.default {
     this.that.deviceInfo = x;
   }
 
+  get appInfo() {
+    return this.that.appInfo;
+  }
+
+  set appInfo(x) {
+    this.that.appInfo = x;
+  }
+
   static fromResource() {
     throw new Error("This should never be called because server always returns an empty array for this resource");
   }
@@ -130,11 +138,16 @@ class SyncTelemetry extends _BaseEntity.default {
     return this.deviceInfo === '' ? {} : JSON.parse(this.deviceInfo);
   }
 
+  getAppInfo() {
+    return JSON.parse(this.appInfo);
+  }
+
   get toResource() {
     const resource = _lodash.default.pick(this, ["uuid", "syncStatus", "syncStartTime", "syncEndTime", "appVersion", "androidVersion", "deviceName", "syncSource"]);
 
     resource.entityStatus = this.getEntityStatus();
     resource.deviceInfo = this.getDeviceInfo();
+    resource.appInfo = this.getAppInfo();
     return resource;
   }
 
@@ -150,6 +163,7 @@ class SyncTelemetry extends _BaseEntity.default {
     syncTelemetry.androidVersion = this.androidVersion;
     syncTelemetry.deviceName = this.deviceName;
     syncTelemetry.deviceInfo = this.deviceInfo;
+    syncTelemetry.appInfo = this.appInfo;
     syncTelemetry.syncSource = this.syncSource;
     return syncTelemetry;
   }
@@ -169,7 +183,8 @@ _defineProperty(SyncTelemetry, "schema", {
     syncEndTime: "date?",
     entityStatus: "string",
     syncSource: 'string?',
-    deviceInfo: "string"
+    deviceInfo: "string",
+    appInfo: "string"
   }
 });
 

package/dist/application/Form.js

@@ -120,26 +120,9 @@ class Form extends _BaseEntity.default {
   }
 
   static fromResource(resource, entityService) {
-    const formSyncStatus = entityService.findByCriteria(`entityName = 'Form'`, _EntitySyncStatus.default.schema.name);
-
-    if (resource.formType === this.formTypes.IndividualProfile && formSyncStatus && (0, _moment.default)(formSyncStatus.loadedSince).isBefore((0, _moment.default)(resource.lastModifiedDateTime))) {
-      this.deleteOutOfSyncDrafts(entityService, resource.uuid);
-    }
-
     return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
-  static deleteOutOfSyncDrafts(entityService, formUUID) {
-    const formMappings = entityService.findAllByCriteria(`form.uuid = '${formUUID}'`, _FormMapping.default.schema.name);
-
-    _lodash.default.forEach(formMappings, ({
-      subjectType
-    }) => {
-      const outOfSyncDrafts = entityService.findAll("DraftSubject").filtered(`subjectType.uuid = $0`, subjectType.uuid);
-      entityService.deleteEntities(outOfSyncDrafts);
-    });
-  }
-
   static associateChild(child, childEntityClass, childResource, entityService) {
     let form = _BaseEntity.default.getParentEntity(entityService, childEntityClass, childResource, "formUUID", Form.schema.name);
 

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "openchs-models",
     "description": "OpenCHS data model to be used by front end clients",
-    "version": "1.32.40",
+    "version": "1.32.41",
     "private": false,
     "repository": {
         "type": "git",