Merge pull request #1954 from ojwanganto/show-all-patient-flags

show all patient flags in 2.x based on eligibility criteria

omod/src/main/java/org/openmrs/module/kenyaemr/fragment/controller/patient/PatientUtilsFragmentController.java

@@ -78,27 +78,8 @@ public class PatientUtilsFragmentController {
 	public List<SimpleObject> getFlags(@RequestParam("patientId") Integer patientId, @SpringBean CalculationManager calculationManager) {
 
 		List<SimpleObject> flags = new ArrayList<SimpleObject>();
-		List<String> openFlags = Arrays.asList(
-				"NeedsCACXTestCalculation",
-				"NotVaccinatedCalculation",
-				"IsPregnantCalculation",
-				"EligibleForIliScreeningCalculation",
-				"EligibleForSariScreeningCalculation",
-				"EligibleForCholeraCalculation",
-				"EligibleForDysenteryCalculation",
-				"EligibleForMalariaCalculation",
-				"EligibleForHaemorrhagicCalculation",
-				"EligibleForChikungunyaCalculation",
-				"EligibleForMeaslesCalculation",
-				"EligibleForPoliomyelitisCalculation",
-				"EligibleForRiftValleyFeverCalculation"
-		); // flags that don't require specific role
 		// Gather all flag calculations that evaluate to true
 		for (PatientFlagCalculation calc : calculationManager.getFlagCalculations()) {
-			if (openFlags.isEmpty() || !openFlags.contains(calc.getClass().getSimpleName())) {
-				// TODO: check if logged in user has the globally required role/privilege
-				continue;
-			}
 			try {
 				CalculationResult result = Context.getService(PatientCalculationService.class).evaluate(patientId, calc);
 				if (result != null && (Boolean) result.getValue()) {