Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: DHIS2-10723 port on 2.36.0 #1630

Merged
merged 2 commits into from
Apr 21, 2021
Merged

fix: DHIS2-10723 port on 2.36.0 #1630

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b65c5dc
fix: DHIS2-10723 (#1622)
paschalidi Apr 21, 2021
5b8f96d
chore: covers all cases
paschalidi Apr 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 37 additions & 2 deletions ...es/capture-core/components/Pages/New/RegistrationDataEntry/RegistrationDataEntry.epics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,41 @@ import { navigateToTrackedEntityDashboard } from '../../../../utils/navigateToTr
import { getTrackerProgramThrowIfNotFound, scopeTypes } from '../../../../metaData';


const geometryType = (key) => {
const types = ['Point', 'None', 'Polygon'];
return types.find(type => key.toLowerCase().includes(type.toLowerCase()));
};

const standardGeoJson = (geometry) => {
if (!geometry) {
return undefined;
}
if (Array.isArray(geometry)) {
return {
type: 'Polygon',
coordinates: geometry,
};
} else if (geometry.longitude && geometry.latitude) {
return {
type: 'Point',
coordinates: [geometry.longitude, geometry.latitude],
};
}
return undefined;
};


const deriveAttributesFromFormValues = (formValues = {}) =>
Object.keys(formValues)
.filter(key => !geometryType(key))
.map(key => ({ attribute: key, value: formValues[key] }));

const deriveGeometryFromFormValues = (formValues = {}) =>
Object.keys(formValues)
.filter(key => geometryType(key))
.reduce((acc, currentKey) => (standardGeoJson(formValues[currentKey])), undefined);


const deriveEvents = ({ stages, enrollmentDate, incidentDate, programId, orgUnitId }) => {
// in case we have a program that does not have an incident date, such as Malaria case diagnosis,
// we want the incident to default to enrollmentDate
Expand Down Expand Up @@ -65,6 +96,7 @@ export const startSavingNewTrackedEntityInstanceEpic: Epic = (action$: InputObse
return saveNewTrackedEntityInstance(
{
attributes: deriveAttributesFromFormValues(values),
geometry: deriveGeometryFromFormValues(values),
enrollments: [],
orgUnit: orgUnitId,
trackedEntityType: trackedEntityTypeId,
Expand Down Expand Up @@ -96,16 +128,19 @@ export const startSavingNewTrackedEntityInstanceWithEnrollmentEpic: Epic = (acti
ofType(registrationFormActionTypes.NEW_TRACKED_ENTITY_INSTANCE_WITH_ENROLLMENT_SAVE_START),
map(() => {
const { currentSelections: { orgUnitId, programId }, formsValues, dataEntriesFieldsValue } = store.value;
const { incidentDate, enrollmentDate } = dataEntriesFieldsValue['newPageDataEntryId-newEnrollment'] || { };
const { incidentDate, enrollmentDate, geometry } = dataEntriesFieldsValue['newPageDataEntryId-newEnrollment'] || { };
const { trackedEntityType, stages } = getTrackerProgramThrowIfNotFound(programId);
const values = formsValues['newPageDataEntryId-newEnrollment'];
const values = formsValues['newPageDataEntryId-newEnrollment'] || {};
const events = deriveEvents({ stages, enrollmentDate, incidentDate, programId, orgUnitId });


return saveNewTrackedEntityInstanceWithEnrollment(
{
attributes: deriveAttributesFromFormValues(values),
geometry: deriveGeometryFromFormValues(values),
enrollments: [
{
geometry: standardGeoJson(geometry),
incidentDate,
enrollmentDate,
program: programId,
Expand Down