fix text messaging

fortitudoinc · Mar 5, 2020 · 9aa0b81 · 9aa0b81
1 parent 37d870b
commit 9aa0b81
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/omod/src/main/java/org/openmrs/module/patientlist/advice/DoctorRequestedAfterSaveAdvise.java b/omod/src/main/java/org/openmrs/module/patientlist/advice/DoctorRequestedAfterSaveAdvise.java
@@ -45,7 +45,7 @@ public void afterReturning(Object returnValue, Method method, Object[] args, Obj
 		String message = "A Fortitudo patient has just requested your assistance";
 
 		try {
-			//sendAwsSms(telNo, message);
+			sendAwsSms(telNo, message);
 		}
 		catch (Exception e) {
 			System.out.println("There was an error sending the sms message:");

diff --git a/...java/org/openmrs/module/patientlist/page/controller/EnterPersonnelInfoPageController.java b/...java/org/openmrs/module/patientlist/page/controller/EnterPersonnelInfoPageController.java
@@ -51,6 +51,10 @@ public void controller(HttpServletRequest request, PageModel model, HttpSession
 				}
 			}
 			 */
+			if (user.getRetired() || user.getPerson().isPersonVoided() || user.getPerson().isVoided()
+			        || user.getPerson().getVoided()) {
+				continue;
+			}
 			personId = user.getPerson().getPersonId();
 			List<PersonCountries> pp = Context.getService(PersonCountriesService.class).getPersonCountriesForPerson(
 			    user.getPerson().getPersonId());