openchs-models 1.22.2 → 1.22.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Individual.js +6 -2
- package/package.json +1 -1
package/dist/Individual.js
CHANGED
|
@@ -178,11 +178,11 @@ class Individual extends _BaseEntity.default {
|
|
|
178
178
|
const gender = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "genderUUID"), _Gender.default.schema.name);
|
|
179
179
|
const subjectType = entityService.findByKey("uuid", _ResourceUtil.default.getUUIDFor(individualResource, "subjectTypeUUID"), _SubjectType.default.schema.name);
|
|
180
180
|
|
|
181
|
-
const individual = _General.default.assignFields(individualResource, new Individual(),
|
|
181
|
+
const individual = _General.default.assignFields(individualResource, new Individual(), this.directCopyFields, this.dateFields, ["observations"], entityService);
|
|
182
182
|
|
|
183
183
|
individual.gender = gender;
|
|
184
184
|
individual.lowestAddressLevel = addressLevel;
|
|
185
|
-
individual.name =
|
|
185
|
+
individual.name = individual.nameString;
|
|
186
186
|
if (!_lodash.default.isNil(individualResource.registrationLocation)) individual.registrationLocation = _Point.default.fromResource(individualResource.registrationLocation);
|
|
187
187
|
individual.subjectType = subjectType;
|
|
188
188
|
return individual;
|
|
@@ -935,6 +935,10 @@ _defineProperty(Individual, "nonIndividualValidationKeys", {
|
|
|
935
935
|
NAME: "NAME"
|
|
936
936
|
});
|
|
937
937
|
|
|
938
|
+
_defineProperty(Individual, "directCopyFields", ["uuid", "firstName", "middleName", "lastName", "profilePicture", "dateOfBirthVerified", "voided"]);
|
|
939
|
+
|
|
940
|
+
_defineProperty(Individual, "dateFields", ["dateOfBirth", "registrationDate"]);
|
|
941
|
+
|
|
938
942
|
_defineProperty(Individual, "merge", childEntityClass => _BaseEntity.default.mergeOn(new Map([[_ProgramEnrolment.default, "enrolments"], [_Encounter.default, "encounters"], [_IndividualRelationship.default, "relationships"], [_Comment.default, "comments"]]).get(childEntityClass)));
|
|
939
943
|
|
|
940
944
|
_defineProperty(Individual, "mergeMultipleParents", (childEntityClass, entities) => {
|