openchs-models 1.23.0 → 1.23.2

package/dist/EntityMetaData.js

@@ -467,7 +467,6 @@ const commentThread = txData(_CommentThread.default, {
   privilegeName: _Privilege.default.privilegeName.viewSubject
 });
 const task = txData(_Task.default, {
-  res: 'tasks',
   syncWeight: 0
 });
 const taskType = refData(_TaskType.default, {

package/dist/Individual.js

@@ -817,6 +817,14 @@ class Individual extends _BaseEntity.default {
     return this.latestEntityApprovalStatus && this.latestEntityApprovalStatus.isRejected;
   }
 
+  getMobileNumber() {
+    const mobileNumberObs = _lodash.default.find(this.observations, obs => obs.concept.isMobileNo());
+
+    if (!_lodash.default.isNil(mobileNumberObs)) {
+      return mobileNumberObs.getReadableValue();
+    }
+  }
+
   toJSON() {
     return {
       uuid: this.uuid,

package/dist/Observation.js

@@ -209,6 +209,10 @@ class Observation {
     return !_lodash.default.isEmpty(formElement) && this.concept.datatype === _Concept.default.dataType.PhoneNumber && this.concept.recordValueByKey('verifyPhoneNumber') && this.getValueWrapper().isVerificationRequired();
   }
 
+  isMobileNumberObs() {
+    return this.concept.isMobileNo();
+  }
+
 }
 
 _defineProperty(Observation, "schema", {

package/dist/application/Form.js

@@ -296,7 +296,8 @@ _defineProperty(Form, "formTypes", {
   ProgramExit: "ProgramExit",
   ProgramEncounterCancellation: "ProgramEncounterCancellation",
   ChecklistItem: "ChecklistItem",
-  IndividualEncounterCancellation: "IndividualEncounterCancellation"
+  IndividualEncounterCancellation: "IndividualEncounterCancellation",
+  Task: "Task"
 });
 
 var _default = Form;

package/dist/application/FormMapping.js

@@ -23,6 +23,8 @@ var _ProgramEncounter = _interopRequireDefault(require("../ProgramEncounter"));
 
 var _ChecklistItem = _interopRequireDefault(require("../ChecklistItem"));
 
+var _TaskType = _interopRequireDefault(require("../task/TaskType"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -40,6 +42,7 @@ class FormMapping {
   static fromResource(resource, entityService) {
     const form = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "formUUID"), _Form.default.schema.name);
     const subjectType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "subjectTypeUUID"), _SubjectType.default.schema.name);
+    const taskType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "taskTypeUUID"), _TaskType.default.schema.name);
 
     const formMapping = _General.default.assignFields(resource, new FormMapping(), ["uuid", "voided", "enableApproval"]);
 
@@ -47,6 +50,7 @@ class FormMapping {
     formMapping.observationsTypeEntityUUID = _ResourceUtil.default.getUUIDFor(resource, "observationsTypeEntityUUID");
     formMapping.form = form;
     formMapping.subjectType = subjectType;
+    formMapping.taskType = taskType;
     return formMapping;
   }
 
@@ -110,7 +114,10 @@ _defineProperty(FormMapping, "schema", {
   properties: {
     uuid: "string",
     form: "Form",
-    subjectType: "SubjectType",
+    subjectType: {
+      type: "SubjectType",
+      optional: true
+    },
     entityUUID: {
       type: "string",
       optional: true
@@ -126,6 +133,10 @@ _defineProperty(FormMapping, "schema", {
     enableApproval: {
       type: "bool",
       default: false
+    },
+    taskType: {
+      type: "TaskType",
+      optional: true
     }
   }
 });

package/dist/task/Task.js

@@ -5,8 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _index = require("../index");
-
 var _TaskType = _interopRequireDefault(require("./TaskType"));
 
 var _TaskStatus = _interopRequireDefault(require("./TaskStatus"));
@@ -17,11 +15,19 @@ var _General = _interopRequireDefault(require("../utility/General"));
 
 var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
 
+var _ObservationsHolder = _interopRequireDefault(require("../ObservationsHolder"));
+
+var _moment = _interopRequireDefault(require("moment"));
+
+var _lodash = _interopRequireDefault(require("lodash"));
+
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-class Task extends _index.BaseEntity {
+class Task extends _BaseEntity.default {
   constructor(...args) {
     super(...args);
 
@@ -46,6 +52,26 @@ class Task extends _index.BaseEntity {
     _defineProperty(this, "voided", void 0);
   }
 
+  get toResource() {
+    const taskResource = _lodash.default.pick(this, ["uuid", "voided", "name"]);
+
+    taskResource.observations = _lodash.default.map(this.observations, "toResource");
+    taskResource.metadata = _lodash.default.map(this.metadata, "toResource");
+    taskResource.taskTypeUUID = this.taskType.uuid;
+    taskResource.taskStatusUUID = this.taskStatus.uuid;
+    if (!_lodash.default.isNil(this.scheduledOn)) taskResource.scheduledOn = (0, _moment.default)(this.scheduledOn).format();
+
+    if (!_lodash.default.isNil(this.completedOn)) {
+      taskResource.completedOn = (0, _moment.default)(this.completedOn).format();
+    }
+
+    if (!_lodash.default.isNil(this.subject)) {
+      taskResource.subjectUUID = this.subject.uuid;
+    }
+
+    return taskResource;
+  }
+
   static fromResource(resource, entityService) {
     const task = _General.default.assignFields(resource, new Task(), ['uuid', 'name', 'voided'], ['scheduledOn', 'completedOn'], ['metadata', 'observations'], entityService);
 
@@ -55,6 +81,45 @@ class Task extends _index.BaseEntity {
     return task;
   }
 
+  setScheduledOn(date) {
+    this.scheduledOn = date;
+  }
+
+  setCompletedOn(date = new Date()) {
+    this.completedOn = date;
+  }
+
+  setTaskStatus(newStatus) {
+    this.taskStatus = newStatus;
+  }
+
+  isCallType() {
+    return this.taskType.type === _TaskType.default.TaskTypeName.Call;
+  }
+
+  isTaskStatusTerminal() {
+    return this.taskStatus.isTerminal;
+  }
+
+  isOpenSubjectType() {
+    return this.taskType.type === _TaskType.default.TaskTypeName.OpenSubject;
+  }
+
+  cloneForEdit() {
+    const task = new Task();
+    task.uuid = this.uuid;
+    task.name = this.name;
+    task.taskType = this.taskType.clone();
+    task.taskStatus = this.taskStatus.clone();
+    task.scheduledOn = this.scheduledOn;
+    task.completedOn = this.completedOn;
+    task.metadata = _ObservationsHolder.default.clone(this.metadata);
+    task.subject = this.subject;
+    task.observations = _ObservationsHolder.default.clone(this.observations);
+    task.voided = this.voided;
+    return task;
+  }
+
 }
 
 _defineProperty(Task, "schema", {

package/dist/task/TaskStatus.js

@@ -5,19 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _index = require("../index");
-
 var _TaskType = _interopRequireDefault(require("./TaskType"));
 
 var _General = _interopRequireDefault(require("../utility/General"));
 
 var _ResourceUtil = _interopRequireDefault(require("../utility/ResourceUtil"));
 
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-class TaskStatus extends _index.BaseEntity {
+class TaskStatus extends _BaseEntity.default {
   constructor(...args) {
     super(...args);
 
@@ -33,12 +33,23 @@ class TaskStatus extends _index.BaseEntity {
   }
 
   static fromResource(resource, entityService) {
-    const taskStatus = _General.default.assignFields(resource, new TaskStatus(), ['uuid', 'name', 'voided', 'isTerminal'], [], [], entityService);
+    const taskStatus = _General.default.assignFields(resource, new TaskStatus(), ['uuid', 'name', 'voided'], [], [], entityService);
 
+    taskStatus.isTerminal = resource.terminal;
     taskStatus.taskType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "taskTypeUUID"), _TaskType.default.schema.name);
     return taskStatus;
   }
 
+  clone() {
+    const taskStatus = new TaskStatus();
+    taskStatus.uuid = this.uuid;
+    taskStatus.name = this.name;
+    taskStatus.isTerminal = this.isTerminal;
+    taskStatus.taskType = this.taskType.clone();
+    taskStatus.voided = this.voided;
+    return taskStatus;
+  }
+
 }
 
 _defineProperty(TaskStatus, "schema", {

package/dist/task/TaskType.js

@@ -5,19 +5,19 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _index = require("../index");
-
 var _General = _interopRequireDefault(require("../utility/General"));
 
 var _Concept = _interopRequireDefault(require("../Concept"));
 
 var _lodash = require("lodash");
 
+var _BaseEntity = _interopRequireDefault(require("../BaseEntity"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-class TaskType extends _index.BaseEntity {
+class TaskType extends _BaseEntity.default {
   constructor(...args) {
     super(...args);
 
@@ -35,7 +35,17 @@ class TaskType extends _index.BaseEntity {
   static fromResource(resource, entityService) {
     const taskType = _General.default.assignFields(resource, new TaskType(), ['uuid', 'name', 'type', 'voided']);
 
-    taskType.metadataSearchFields = (0, _lodash.map)(resource.metadataSearchFields, name => entityService.findByKey("name", name, _Concept.default.schema.name));
+    taskType.metadataSearchFields = (0, _lodash.map)(resource.metadataSearchFields, name => entityService.findByKey("name", name, _Concept.default.schema.name)).filter(concept => !(0, _lodash.isNil)(concept));
+    return taskType;
+  }
+
+  clone() {
+    const taskType = new TaskType();
+    taskType.uuid = this.uuid;
+    taskType.name = this.name;
+    taskType.type = this.type;
+    taskType.metadataSearchFields = this.metadataSearchFields;
+    taskType.voided = this.voided;
     return taskType;
   }
 

package/package.json

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