Merge pull request #38 from EyeSeeTea/feat/sort-form-options

Sort form options
EyeSeeTea · May 8, 2024 · 1f1ffdb · 1f1ffdb
2 parents 562a264 + c283836
commit 1f1ffdb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/data/entities/D2Program.ts b/src/data/entities/D2Program.ts
@@ -61,6 +61,7 @@ export interface Option {
     name: string;
     code: string;
     optionSet: { id: string };
+    sortOrder: number;
 }
 
 export interface TrackedEntityAttibute {

diff --git a/src/data/repositories/SurveyFormD2Repository.ts b/src/data/repositories/SurveyFormD2Repository.ts
@@ -72,6 +72,10 @@ export class SurveyD2Repository implements SurveyRepository {
                           .value()
                     : resp.trackedEntityAttributes;
 
+                const sortedOptions = _(resp.options)
+                    .sortBy(option => option.sortOrder)
+                    .value();
+
                 //If event specified,populate the form
                 if (eventId) {
                     if (isTrackerProgram(programId)) {
@@ -86,7 +90,7 @@ export class SurveyD2Repository implements SurveyRepository {
                                             trackedEntity,
                                             programDataElements,
                                             resp.dataElements,
-                                            resp.options,
+                                            sortedOptions,
                                             resp.programStages,
                                             resp.programStageSections,
                                             sortedTrackedentityAttr,