DCM-41: Support BiMonthly period type in Automation

openmrs · Jun 25, 2021 · 133f50d · 133f50d
1 parent 83df953
commit 133f50d
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/module/dhisconnector/api/impl/DHISConnectorServiceImpl.java b/api/src/main/java/org/openmrs/module/dhisconnector/api/impl/DHISConnectorServiceImpl.java
@@ -1482,6 +1482,15 @@ public String transformToDHISPeriod(Calendar startDate, Calendar endDate, String
 					.equals(endDate.get(Calendar.YEAR) + "Q" + getQuarterNumber(endDate))) {
 				period = startDate.get(Calendar.YEAR) + "Q" + getQuarterNumber(startDate);
 			}
+		} else if (ReportingPeriodType.BiMonthly.name().equals(periodType)) {
+			sdf = new SimpleDateFormat("yyyyMM");
+			startDate.add(Calendar.MONTH, -2);
+			startDate.set(Calendar.DAY_OF_MONTH, 1);
+			setBasicsStartsAndEnds(startDate, endDate);
+			endDate.add(Calendar.MONTH, 1);
+			endDate.set(Calendar.DAY_OF_MONTH, endDate.getActualMaximum(Calendar.DAY_OF_MONTH));
+			if (lastRun == null || !sdf.format(lastRun).equals(sdf.format(endDate.getTime())))
+				period = new SimpleDateFormat("yyyyMM").format(startDate.getTime()) + "B";
 		}
 		return period;
 	}