openchs-models 1.31.54 → 1.31.56

package/dist/AbstractEncounter.js

@@ -412,6 +412,19 @@ class AbstractEncounter extends _BaseEntity.default {
     this.that.latestEntityApprovalStatus = this.fromObject(entityApprovalStatus);
   }
 
+  updateAudit(userInfo, isNew, isGettingFilled) {
+    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
+
+    if (_lodash.default.isNil(this.filledByUUID) && isGettingFilled) {
+      this.filledByUUID = userInfo.userUUID;
+      this.filledBy = userInfo.name;
+    }
+  }
+
+  isFilled() {
+    return !_lodash.default.isNil(this.encounterDateTime);
+  }
+
 }
 
 _defineProperty(AbstractEncounter, "fieldKeys", {

package/dist/Individual.js

@@ -1054,6 +1054,10 @@ class Individual extends _BaseEntity.default {
     return _SchemaNames.default.Individual;
   }
 
+  updateAudit(userInfo, isNew) {
+    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
+  }
+
 }
 
 _defineProperty(Individual, "schema", {

package/dist/ProgramEncounter.js

@@ -17,8 +17,6 @@ var _lodash = _interopRequireDefault(require("lodash"));
 
 var _ValidationResult = _interopRequireDefault(require("./application/ValidationResult"));
 
-var _Point = _interopRequireDefault(require("./geo/Point"));
-
 var _EntityApprovalStatus = _interopRequireDefault(require("./EntityApprovalStatus"));
 
 var _SchemaNames = _interopRequireDefault(require("./SchemaNames"));

package/dist/ProgramEnrolment.js

@@ -670,6 +670,10 @@ class ProgramEnrolment extends _BaseEntity.default {
     return _SchemaNames.default.ProgramEnrolment;
   }
 
+  updateAudit(userInfo, isNew) {
+    (0, _AuditUtil.updateAuditFields)(this, userInfo, isNew);
+  }
+
 }
 
 _defineProperty(ProgramEnrolment, "schema", {

package/dist/application/Form.js

@@ -66,6 +66,14 @@ class Form extends _BaseEntity.default {
     this.that.decisionRule = x;
   }
 
+  get editFormRule() {
+    return this.that.editFormRule;
+  }
+
+  set editFormRule(x) {
+    this.that.editFormRule = x;
+  }
+
   get visitScheduleRule() {
     return this.that.visitScheduleRule;
   }
@@ -118,7 +126,7 @@ class Form extends _BaseEntity.default {
       this.deleteOutOfSyncDrafts(entityService, resource.uuid);
     }
 
-    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
+    return _General.default.assignFields(resource, new Form(), ["uuid", "name", "formType", "decisionRule", "editFormRule", "visitScheduleRule", "taskScheduleRule", "validationRule", "checklistsRule", "taskScheduleRule"]);
   }
 
   static deleteOutOfSyncDrafts(entityService, formUUID) {
@@ -348,6 +356,10 @@ _defineProperty(Form, "schema", {
       type: "string",
       optional: true
     },
+    editFormRule: {
+      type: "string",
+      optional: true
+    },
     visitScheduleRule: {
       type: "string",
       optional: true

package/dist/utility/AuditUtil.js

@@ -3,10 +3,14 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapAuditFields = exports.AuditFields = void 0;
+exports.updateAuditFields = updateAuditFields;
+exports.mapAuditFields = mapAuditFields;
+exports.AuditFields = void 0;
 
 var _ResourceUtil = _interopRequireDefault(require("./ResourceUtil"));
 
+var _lodash = _interopRequireDefault(require("lodash"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const AuditFields = {
@@ -29,11 +33,23 @@ const AuditFields = {
 };
 exports.AuditFields = AuditFields;
 
-const mapAuditFields = function (txnEntity, txnResource) {
+function updateAuditFields(entity, userInfo, isNew = false) {
+  // old entities may have createdByUUID as null if never synced after audit release
+  // isNew must be passed by callers to specify that it is indeed a create scenario
+  if (_lodash.default.isNil(entity.createdByUUID) && isNew) {
+    entity.createdByUUID = userInfo.userUUID;
+    entity.createdBy = userInfo.name;
+  }
+
+  if (_lodash.default.isNil(entity.lastModifiedByUUID)) {
+    entity.lastModifiedByUUID = userInfo.userUUID;
+    entity.lastModifiedBy = userInfo.name;
+  }
+}
+
+function mapAuditFields(txnEntity, txnResource) {
   txnEntity.createdBy = _ResourceUtil.default.getFieldValue(txnResource, "createdBy");
   txnEntity.createdByUUID = _ResourceUtil.default.getFieldValue(txnResource, "createdByUUID");
   txnEntity.lastModifiedBy = _ResourceUtil.default.getFieldValue(txnResource, "lastModifiedBy");
   txnEntity.lastModifiedByUUID = _ResourceUtil.default.getFieldValue(txnResource, "lastModifiedByUUID");
-};
-
-exports.mapAuditFields = mapAuditFields;
+}

package/package.json

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