openchs-models 1.22.2 → 1.22.5

package/dist/Individual.js

@@ -178,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", "middleName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"], ["dateOfBirth", "registrationDate"], ["observations"], entityService);
+    const individual = _General.default.assignFields(individualResource, new Individual(), this.directCopyFields, this.dateFields, ["observations"], entityService);
 
     individual.gender = gender;
     individual.lowestAddressLevel = addressLevel;
-    individual.name = `${individual.firstName} ${individual.middleName ? individual.middleName : ''} ${individual.lastName}`;
+    individual.name = individual.nameString;
     if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
     individual.subjectType = subjectType;
     return individual;
@@ -292,7 +292,12 @@ class Individual extends _BaseEntity.default {
   }
 
   get nameString() {
-    return this.isPerson() ? `${this.firstName} ${this.middleName ? this.middleName : ''} ${this.lastName}` : this.firstName;
+    return this.isPerson() ? Individual.getFullName(this) : this.firstName;
+  }
+
+  static getFullName(obj) {
+    let name = `${obj.firstName} ${obj.middleName ? obj.middleName : ''}`.trim();
+    return `${name} ${obj.lastName ? obj.lastName : ''}`.trim();
   } //TODO: this will be fixed later where we specify the option to create a template to display another unique field along with the name
 
 
@@ -376,17 +381,19 @@ class Individual extends _BaseEntity.default {
   }
 
   validateName(value, validationKey, validFormat, mandatory = true) {
-    const failure = new _ValidationResult.default(false, validationKey);
+    const validationResult = new _ValidationResult.default(false, validationKey);
 
-    if (_lodash.default.isEmpty(value) && mandatory) {
-      failure.messageKey = "emptyValidationMessage";
-    } else if (!_lodash.default.isEmpty(validFormat) && !validFormat.valid(value)) {
-      failure.messageKey = validFormat.descriptionKey;
+    if (_lodash.default.isEmpty(value) && !mandatory) {
+      return new _ValidationResult.default(true, validationKey, null);
+    } else if (_lodash.default.isEmpty(value)) {
+      validationResult.messageKey = "emptyValidationMessage";
+    } else if (!_lodash.default.isNil(validFormat) && !validFormat.valid(value)) {
+      validationResult.messageKey = validFormat.descriptionKey;
     } else {
       return new _ValidationResult.default(true, validationKey, null);
     }
 
-    return failure;
+    return validationResult;
   }
 
   validateFirstName() {
@@ -935,6 +942,10 @@ _defineProperty(Individual, "nonIndividualValidationKeys", {
   NAME: "NAME"
 });
 
+_defineProperty(Individual, "directCopyFields", ["uuid", "firstName", "middleName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"]);
+
+_defineProperty(Individual, "dateFields", ["dateOfBirth", "registrationDate"]);
+
 _defineProperty(Individual, "merge", childEntityClass => _BaseEntity.default.mergeOn(new Map([[_ProgramEnrolment.default, "enrolments"], [_Encounter.default, "encounters"], [_IndividualRelationship.default, "relationships"], [_Comment.default, "comments"]]).get(childEntityClass)));
 
 _defineProperty(Individual, "mergeMultipleParents", (childEntityClass, entities) => {

package/package.json

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