From 43bee7c3edfd84f397ca924eb705ad68d50cd07c Mon Sep 17 00:00:00 2001 From: paul sandjong Date: Wed, 12 Nov 2025 00:10:59 +0100 Subject: [PATCH 1/3] fix officerCode is null on login --- .../main/java/org/openimis/imispolicies/usecase/Login.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/org/openimis/imispolicies/usecase/Login.java b/app/src/main/java/org/openimis/imispolicies/usecase/Login.java index a142fc34..7c960b5c 100644 --- a/app/src/main/java/org/openimis/imispolicies/usecase/Login.java +++ b/app/src/main/java/org/openimis/imispolicies/usecase/Login.java @@ -53,7 +53,10 @@ public Login( @WorkerThread public void execute(@NonNull String username, @NonNull String password) throws Exception { - String officerCode = Global.getGlobal().getOfficerCode(); + String officerCode = (Global.getGlobal().getOfficerCode() != null) + ? Global.getGlobal().getOfficerCode() + : username; + if (officerCode == null) { throw new IllegalStateException("OfficerCode should not be null on login"); } From e5cc26341422c449a64eeac6c317baa57dfe58fa Mon Sep 17 00:00:00 2001 From: paul sandjong Date: Wed, 12 Nov 2025 12:18:56 +0100 Subject: [PATCH 2/3] corrections --- .../java/org/openimis/imispolicies/usecase/Login.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/openimis/imispolicies/usecase/Login.java b/app/src/main/java/org/openimis/imispolicies/usecase/Login.java index 7c960b5c..260901b7 100644 --- a/app/src/main/java/org/openimis/imispolicies/usecase/Login.java +++ b/app/src/main/java/org/openimis/imispolicies/usecase/Login.java @@ -53,10 +53,10 @@ public Login( @WorkerThread public void execute(@NonNull String username, @NonNull String password) throws Exception { - String officerCode = (Global.getGlobal().getOfficerCode() != null) - ? Global.getGlobal().getOfficerCode() - : username; - + if (Global.getGlobal().getOfficerCode() == null) { + Global.getGlobal().setOfficerCode(username); + } + String officerCode = Global.getGlobal().getOfficerCode(); if (officerCode == null) { throw new IllegalStateException("OfficerCode should not be null on login"); } From 89f015ac1f73a9f6691f57547b7c6e049482422d Mon Sep 17 00:00:00 2001 From: paul sandjong Date: Wed, 19 Nov 2025 16:52:08 +0100 Subject: [PATCH 3/3] fix error when downloading family data --- .../openimis/imispolicies/ClientAndroidInterface.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java index e06e4dfb..b18021c7 100644 --- a/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java +++ b/app/src/main/java/org/openimis/imispolicies/ClientAndroidInterface.java @@ -4852,9 +4852,12 @@ private JSONObject toPolicyJSONObject (Family.Policy policy) throws JSONExceptio policyObject.put("PolicyId",policy.getId()); policyObject.put("FamilyId",policy.getFamilyId()); policyObject.put("EnrollDate",policy.getEnrollDate()); - policyObject.put("StartDate",DateUtils.toDateString(Objects.requireNonNull(policy.getStartDate()))); - policyObject.put("EffectiveDate", DateUtils.toDateString(Objects.requireNonNull(policy.getEffectiveDate()))); - policyObject.put("ExpiryDate", DateUtils.toDateString(Objects.requireNonNull(policy.getExpiryDate()))); + policyObject.put("StartDate", + policy.getStartDate() != null ? DateUtils.toDateString(policy.getStartDate()) : JSONObject.NULL); + policyObject.put("EffectiveDate", + policy.getEffectiveDate() != null ? DateUtils.toDateString(policy.getEffectiveDate()) : JSONObject.NULL); + policyObject.put("ExpiryDate", + policy.getExpiryDate() != null ? DateUtils.toDateString(policy.getExpiryDate()) : JSONObject.NULL); policyObject.put("PolicyStatus",policy.getStatus()); policyObject.put("PolicyValue",policy.getValue()); policyObject.put("ProdId",policy.getProductId());