Merge pull request #268 from EyeSeeTea/development

Release 3.17.3
EyeSeeTea · Feb 25, 2022 · ba97859 · ba97859
2 parents 9737791 + 70309c4
commit ba97859
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "bulk-load",
     "description": "Bulk importing made easy",
-    "version": "3.17.2",
+    "version": "3.17.3",
     "license": "GPL-3.0",
     "author": "EyeSeeTea team",
     "homepage": ".",

diff --git a/src/data/InstanceDhisRepository.ts b/src/data/InstanceDhisRepository.ts
@@ -250,6 +250,8 @@ export class InstanceDhisRepository implements InstanceRepository {
             enrollmentStartDate: params.filterTEIEnrollmentDate ? params.startDate : undefined,
             enrollmentEndDate: params.filterTEIEnrollmentDate ? params.endDate : undefined,
             relationshipsOuFilter: params.relationshipsOuFilter,
+            // @ts-ignore FIXME: Add property in d2-api
+            fields: "*",
         });
 
         return {
@@ -508,6 +510,8 @@ export class InstanceDhisRepository implements InstanceRepository {
                     startDate: startDate?.format("YYYY-MM-DD"),
                     endDate: endDate?.format("YYYY-MM-DD"),
                     cache: Math.random(),
+                    // @ts-ignore FIXME: Add property in d2-api
+                    fields: "*",
                 })
                 .getData();
         };

diff --git a/src/domain/helpers/ExcelBuilder.ts b/src/domain/helpers/ExcelBuilder.ts
@@ -260,7 +260,7 @@ export class ExcelBuilder {
         for (const dataEntry of payload.dataEntries) {
             const { id, period, dataValues, trackedEntityInstance, attribute: cocId, programStage } = dataEntry;
             const someDataElementPresentInSheet = _(dataValues).some(dv => dataElementIdsSet.has(dv.dataElement));
-            if (!someDataElementPresentInSheet) continue;
+            if (!someDataElementPresentInSheet && !_.isEmpty(dataValues)) continue;
 
             const eventBelongsToCurrentProgramStage =
                 dataSourceProgramStageId && dataSourceProgramStageId === programStage;