openchs-models 1.21.0 → 1.22.2

package/dist/Individual.js

@@ -83,6 +83,8 @@ class Individual extends _BaseEntity.default {
 
     _defineProperty(this, "firstName", void 0);
 
+    _defineProperty(this, "middleName", void 0);
+
     _defineProperty(this, "lastName", void 0);
 
     _defineProperty(this, "profilePicture", void 0);
@@ -129,7 +131,7 @@ class Individual extends _BaseEntity.default {
   }
 
   get toResource() {
-    const resource = _lodash.default.pick(this, ["uuid", "firstName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"]);
+    const resource = _lodash.default.pick(this, ["uuid", "firstName", "middleName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"]);
 
     resource.dateOfBirth = this.dateOfBirth ? (0, _moment.default)(this.dateOfBirth).format("YYYY-MM-DD") : null;
     resource.registrationDate = (0, _moment.default)(this.registrationDate).format("YYYY-MM-DD");
@@ -176,11 +178,11 @@ class Individual extends _BaseEntity.default {
     const gender = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "genderUUID"), _Gender.default.schema.name);
     const subjectType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "subjectTypeUUID"), _SubjectType.default.schema.name);
 
-    const individual = _General.default.assignFields(individualResource, new Individual(), ["uuid", "firstName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
+    const individual = _General.default.assignFields(individualResource, new Individual(), ["uuid", "firstName", "middleName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
 
     individual.gender = gender;
     individual.lowestAddressLevel = addressLevel;
-    individual.name = `${individual.firstName} ${individual.lastName}`;
+    individual.name = `${individual.firstName} ${individual.middleName ? individual.middleName : ''} ${individual.lastName}`;
     if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
     individual.subjectType = subjectType;
     return individual;
@@ -254,6 +256,11 @@ class Individual extends _BaseEntity.default {
     this.name = this.nameString;
   }
 
+  setMiddleName(middleName) {
+    this.middleName = middleName;
+    this.name = this.nameString;
+  }
+
   setLastName(lastName) {
     this.lastName = lastName;
     this.name = this.nameString;
@@ -285,7 +292,7 @@ class Individual extends _BaseEntity.default {
   }
 
   get nameString() {
-    return this.isPerson() ? `${this.firstName} ${this.lastName}` : this.firstName;
+    return this.isPerson() ? `${this.firstName} ${this.middleName ? this.middleName : ''} ${this.lastName}` : this.firstName;
   } //TODO: this will be fixed later where we specify the option to create a template to display another unique field along with the name
 
 
@@ -368,10 +375,10 @@ class Individual extends _BaseEntity.default {
     return validationResult;
   }
 
-  validateName(value, validationKey, validFormat) {
+  validateName(value, validationKey, validFormat, mandatory = true) {
     const failure = new _ValidationResult.default(false, validationKey);
 
-    if (_lodash.default.isEmpty(value)) {
+    if (_lodash.default.isEmpty(value) && mandatory) {
       failure.messageKey = "emptyValidationMessage";
     } else if (!_lodash.default.isEmpty(validFormat) && !validFormat.valid(value)) {
       failure.messageKey = validFormat.descriptionKey;
@@ -386,6 +393,10 @@ class Individual extends _BaseEntity.default {
     return this.validateName(this.firstName, Individual.validationKeys.FIRST_NAME, this.subjectType.validFirstNameFormat);
   }
 
+  validateMiddleName() {
+    if (this.subjectType.allowMiddleName) return this.validateName(this.middleName, Individual.validationKeys.MIDDLE_NAME, this.subjectType.validMiddleNameFormat, false);
+  }
+
   validateLastName() {
     return this.validateName(this.lastName, Individual.validationKeys.LAST_NAME, this.subjectType.validLastNameFormat);
   }
@@ -406,6 +417,7 @@ class Individual extends _BaseEntity.default {
     validationResults.push(this.validateFirstName());
 
     if (this.subjectType.isPerson()) {
+      validationResults.push(this.validateMiddleName());
       validationResults.push(this.validateLastName());
       validationResults.push(this.validateDateOfBirth());
       validationResults.push(this.validateGender());
@@ -462,6 +474,7 @@ class Individual extends _BaseEntity.default {
     individual.subjectType = this.subjectType.clone();
     individual.name = this.name;
     individual.firstName = this.firstName;
+    individual.middleName = this.middleName;
     individual.lastName = this.lastName;
     individual.profilePicture = this.profilePicture;
     individual.dateOfBirth = this.dateOfBirth;
@@ -488,6 +501,7 @@ class Individual extends _BaseEntity.default {
     individual.uuid = this.uuid;
     individual.name = this.name;
     individual.firstName = this.firstName;
+    individual.middleName = this.middleName;
     individual.lastName = this.lastName;
     individual.profilePicture = this.profilePicture;
     individual.dateOfBirth = this.dateOfBirth;
@@ -800,6 +814,7 @@ class Individual extends _BaseEntity.default {
     return {
       uuid: this.uuid,
       firstName: this.firstName,
+      middleName: this.middleName,
       lastName: this.lastName,
       profilePicture: this.profilePicture,
       enrolments: this.enrolments,
@@ -830,6 +845,10 @@ _defineProperty(Individual, "schema", {
     subjectType: "SubjectType",
     name: "string",
     firstName: "string",
+    middleName: {
+      type: "string",
+      optional: true
+    },
     lastName: {
       type: "string",
       optional: true
@@ -899,6 +918,7 @@ _defineProperty(Individual, "validationKeys", {
   DOB: "DOB",
   GENDER: "GENDER",
   FIRST_NAME: "FIRST_NAME",
+  MIDDLE_NAME: "MIDDLE_NAME",
   LAST_NAME: "LAST_NAME",
   PROFILE_PICTURE: "PROFILE_PICTURE",
   REGISTRATION_DATE: "REGISTRATION_DATE",

package/dist/Schema.js

@@ -174,7 +174,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var _default = {
   //order is important, should be arranged according to the dependency
   schema: [_LocaleMapping.default, _Settings.default, _Concept.ConceptAnswer, _Concept.default, _EncounterType.default, _Gender.default, _UserDefinedIndividualProperty.default, _AddressLevel.LocationMapping, _AddressLevel.default, _KeyValue.default, _Form.default, _FormMapping.default, _FormElementGroup.default, _FormElement.default, _SubjectType.default, _Individual.default, _ProgramOutcome.default, _Program.default, _ProgramEnrolment.default, _Observation.default, _ProgramEncounter.default, _Encounter.default, _EntitySyncStatus.default, _EntityQueue.default, _ConfigFile.default, _Checklist.default, _ChecklistItem.default, _Format.default, _UserInfo.default, _StringKeyNumericValue.default, _VisitScheduleInterval.default, _VisitScheduleConfig.default, _ProgramConfig.default, _Family.default, _IndividualRelation.default, _IndividualRelationGenderMapping.default, _IndividualRelationshipType.default, _IndividualRelationship.default, _RuleDependency.default, _Rule.default, _ChecklistItemStatus.default, _ChecklistDetail.default, _ChecklistItemDetail.default, _VideoTelemetric.default, _Video.default, _MediaQueue.default, _Point.default, _SyncTelemetry.default, _IdentifierSource.default, _IdentifierAssignment.default, _RuleFailureTelemetry.default, _BeneficiaryModePin.default, _OrganisationConfig.default, _PlatformTranslation.default, _Translation.default, _Groups.default, _MyGroups.default, _GroupPrivileges.default, _Privilege.default, _GroupRole.default, _GroupSubject.default, _DashboardCache.default, _LocationHierarchy.default, _ReportCard.default, _Dashboard.default, _DashboardSectionCardMapping.default, _DraftSubject.default, _StandardReportCardType.default, _ApprovalStatus.default, _EntityApprovalStatus.default, _GroupDashboard.default, _DashboardSection.default, _News.default, _Comment.default, _CommentThread.default, _Extension.default, _SubjectMigration.default, _ResetSync.default, _Documentation.default, _DocumentationItem.default],
-  schemaVersion: 157,
+  schemaVersion: 159,
   migration: function (oldDB, newDB) {
     if (oldDB.schemaVersion < 10) {
       var oldObjects = oldDB.objects("DecisionConfig");

package/dist/SubjectType.js

@@ -33,8 +33,12 @@ class SubjectType extends _ReferenceEntity.default {
 
     _defineProperty(this, "uniqueName", void 0);
 
+    _defineProperty(this, "allowMiddleName", void 0);
+
     _defineProperty(this, "validFirstNameFormat", void 0);
 
+    _defineProperty(this, "validMiddleNameFormat", void 0);
+
     _defineProperty(this, "validLastNameFormat", void 0);
   }
 
@@ -60,8 +64,10 @@ class SubjectType extends _ReferenceEntity.default {
     subjectType.type = operationalSubjectType.type;
     subjectType.subjectSummaryRule = operationalSubjectType.subjectSummaryRule;
     subjectType.uniqueName = operationalSubjectType.uniqueName;
+    subjectType.allowMiddleName = operationalSubjectType.allowMiddleName;
     subjectType.allowProfilePicture = operationalSubjectType.allowProfilePicture;
     subjectType.validFirstNameFormat = _Format.default.fromResource(operationalSubjectType["validFirstNameFormat"]);
+    subjectType.validMiddleNameFormat = _Format.default.fromResource(operationalSubjectType["validMiddleNameFormat"]);
     subjectType.validLastNameFormat = _Format.default.fromResource(operationalSubjectType["validLastNameFormat"]);
     subjectType.iconFileS3Key = operationalSubjectType.iconFileS3Key;
     subjectType.syncRegistrationConcept1 = _ResourceUtil.default.getUUIDFor(operationalSubjectType, 'syncRegistrationConcept1');
@@ -81,9 +87,11 @@ class SubjectType extends _ReferenceEntity.default {
     cloned.type = this.type;
     cloned.subjectSummaryRule = this.subjectSummaryRule;
     cloned.allowEmptyLocation = this.allowEmptyLocation;
+    cloned.allowMiddleName = this.allowMiddleName;
     cloned.allowProfilePicture = this.allowProfilePicture;
     cloned.uniqueName = this.uniqueName;
     cloned.validFirstNameFormat = this.validFirstNameFormat;
+    cloned.validMiddleNameFormat = this.validMiddleNameFormat;
     cloned.validLastNameFormat = this.validLastNameFormat;
     cloned.iconFileS3Key = this.iconFileS3Key;
     cloned.syncRegistrationConcept1 = this.syncRegistrationConcept1;
@@ -153,6 +161,10 @@ _defineProperty(SubjectType, "schema", {
       type: "Format",
       optional: true
     },
+    validMiddleNameFormat: {
+      type: "Format",
+      optional: true
+    },
     validLastNameFormat: {
       type: "Format",
       optional: true
@@ -173,6 +185,10 @@ _defineProperty(SubjectType, "schema", {
       type: 'bool',
       default: false
     },
+    allowMiddleName: {
+      type: 'bool',
+      default: false
+    },
     nameHelpText: {
       type: "string",
       optional: true

package/dist/application/Form.js

@@ -167,7 +167,8 @@ class Form {
         sections.push({
           groupName: feg.name,
           groupUUID: feg.uuid,
-          observations: fegObs
+          observations: fegObs,
+          groupStyles: feg.styles
         });
         allObservations.push(...fegObs);
       }
@@ -177,7 +178,8 @@ class Form {
     if (!_lodash.default.isEmpty(decisionObs)) sections.push({
       groupName: 'decisions',
       groupUUID: null,
-      observations: decisionObs
+      observations: decisionObs,
+      groupStyles: {}
     });
     return sections;
   }
@@ -209,9 +211,16 @@ class Form {
       const isRepeatable = valueWrapper.isRepeatable();
       const sortedChildObs = isRepeatable ? _lodash.default.flatMap(valueWrapper.getValue(), questionGroup => new _QuestionGroup.default(this.orderQuestionGroupObservations(questionGroup.getValue(), formElement.uuid))) : this.orderQuestionGroupObservations(valueWrapper.getValue(), formElement.uuid);
       clonedObs.valueJSON = JSON.stringify(isRepeatable ? new _RepeatableQuestionGroup.default(sortedChildObs) : new _QuestionGroup.default(sortedChildObs));
-      if (!_lodash.default.isEmpty(sortedChildObs)) orderedObservations.push(clonedObs);
+
+      if (!_lodash.default.isEmpty(sortedChildObs)) {
+        clonedObs.styles = formElement.styles;
+        orderedObservations.push(clonedObs);
+      }
     } else {
-      if (!_lodash.default.isNil(foundObs)) orderedObservations.push(foundObs);
+      if (!_lodash.default.isNil(foundObs)) {
+        foundObs.styles = formElement.styles;
+        orderedObservations.push(foundObs);
+      }
     }
   }
 

package/dist/application/FormElement.js

@@ -201,6 +201,26 @@ class FormElement {
     return _lodash.default.isNil(unique) ? false : unique.getValue();
   }
 
+  get styles() {
+    const style = {};
+    const backgroundColour = this.recordValueByKey("backgroundColour");
+    const textColour = this.recordValueByKey("textColour");
+
+    if (!_lodash.default.isEmpty(backgroundColour)) {
+      style['backgroundColor'] = backgroundColour;
+    }
+
+    if (!_lodash.default.isEmpty(textColour)) {
+      style['color'] = textColour;
+    }
+
+    if (!_lodash.default.isEmpty(style)) {
+      style['paddingHorizontal'] = 5;
+    }
+
+    return style;
+  }
+
   matches(elementNameOrUUID) {
     return this.name === elementNameOrUUID || this.uuid === elementNameOrUUID;
   }

package/dist/application/FormElementGroup.js

@@ -27,7 +27,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 class FormElementGroup {
   static fromResource(resource, entityService) {
-    const formElementGroup = _General.default.assignFields(resource, new FormElementGroup(), ["uuid", "name", "displayOrder", "display", "voided", "rule", "startTime", "stayTime", "timed"]);
+    const formElementGroup = _General.default.assignFields(resource, new FormElementGroup(), ["uuid", "name", "displayOrder", "display", "voided", "rule", "startTime", "stayTime", "timed", "textColour", "backgroundColour"]);
 
     formElementGroup.form = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(resource, "formUUID"), _Form.default.schema.name);
     return formElementGroup;
@@ -65,6 +65,24 @@ class FormElementGroup {
     return this.displayOrder === 1;
   }
 
+  get styles() {
+    const style = {};
+
+    if (!_lodash.default.isEmpty(this.backgroundColour)) {
+      style['backgroundColor'] = this.backgroundColour;
+    }
+
+    if (!_lodash.default.isEmpty(this.textColour)) {
+      style['color'] = this.textColour;
+    }
+
+    if (!_lodash.default.isEmpty(style)) {
+      style['paddingHorizontal'] = 5;
+    }
+
+    return style;
+  }
+
   getFormElementsOfType(type) {
     return _lodash.default.filter(this.formElements, formElement => formElement.concept.datatype === type || formElement.type === type);
   }
@@ -169,7 +187,9 @@ class FormElementGroup {
       formUUID: this.form.uuid,
       startTime: this.startTime,
       stayTime: this.stayTime,
-      timed: this.timed
+      timed: this.timed,
+      textColour: this.textColour,
+      backgroundColour: this.backgroundColour
     };
   }
 
@@ -210,6 +230,14 @@ _defineProperty(FormElementGroup, "schema", {
     timed: {
       type: "bool",
       default: false
+    },
+    textColour: {
+      type: "string",
+      optional: true
+    },
+    backgroundColour: {
+      type: "string",
+      optional: true
     }
   }
 });

package/package.json

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