From bf8185d409446803184468693aedcd9ccb3a435f Mon Sep 17 00:00:00 2001
From: Manu Tarus <manutarus@gmail.com>
Date: Tue, 3 Sep 2019 09:59:00 +0300
Subject: [PATCH] handle extra quotations on lation names

---
 .../teammodule/web/controller/TeamController.java      | 10 +++++++++-
 .../teammodule/web/controller/TeamMemberViewForm.java  |  9 ++++++++-
 omod/src/main/webapp/teamMemberAddForm.jsp             |  4 ++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamController.java b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamController.java
index 99c3dad..e028ba8 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamController.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamController.java
@@ -3,13 +3,17 @@
  */
 package org.openmrs.module.teammodule.web.controller;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.openmrs.Location;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.teammodule.Team;
+import org.openmrs.module.webservices.rest.web.v1_0.search.openmrs1_8.LocationSearchHandler;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.validation.BindingResult;
@@ -40,7 +44,11 @@ public class TeamController {
 	@RequestMapping(method = RequestMethod.GET)
 	public String showForm(Model model, HttpServletRequest request) {
 		try {
-			model.addAttribute("allLocations", Context.getLocationService().getAllLocations());
+			List<Location> locations = Context.getLocationService().getAllLocations();
+			for(Location location:locations) {
+				location.setName(location.getName().replace("\"", "'"));
+			}
+			model.addAttribute("allLocations", locations);
 		}
 		catch(Exception e) { e.printStackTrace(); throw new RuntimeException(e); }
 		
diff --git a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamMemberViewForm.java b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamMemberViewForm.java
index 83bc99d..92ed964 100644
--- a/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamMemberViewForm.java
+++ b/omod/src/main/java/org/openmrs/module/teammodule/web/controller/TeamMemberViewForm.java
@@ -4,9 +4,12 @@
 
 package org.openmrs.module.teammodule.web.controller;
 
+import java.util.List;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import org.openmrs.Location;
 import org.openmrs.api.context.Context;
 import org.openmrs.module.teammodule.api.TeamRoleService;
 import org.openmrs.module.teammodule.api.TeamMemberService;
@@ -50,10 +53,14 @@ public class TeamMemberViewForm {
 	@RequestMapping(method = RequestMethod.GET)
 	public String showForm(Model model, HttpServletRequest request) {
 		try {
+			List<Location> locations = Context.getLocationService().getAllLocations();
+			for(Location location:locations) {
+				location.setName(location.getName().replace("\"", "'"));
+			}
 			model.addAttribute("allTeams", Context.getService(TeamService.class).getAllTeams(false, 0, 1000));
 			model.addAttribute("allSupervisors", Context.getService(TeamMemberService.class).searchTeamMember(null, null, null, null, null, 0, 1000));
 			model.addAttribute("allTeamRoles", Context.getService(TeamRoleService.class).getAllTeamRole(true, false, null, null));
-			model.addAttribute("allLocations", Context.getLocationService().getAllLocations());
+			model.addAttribute("allLocations", locations);
 			model.addAttribute("allTeamMembers", Context.getService(TeamMemberService.class).getAllTeamMember(null, true, null, null));
 		}
 		catch(Exception e) { e.printStackTrace(); throw new RuntimeException(e); }
diff --git a/omod/src/main/webapp/teamMemberAddForm.jsp b/omod/src/main/webapp/teamMemberAddForm.jsp
index ba44530..5026b52 100644
--- a/omod/src/main/webapp/teamMemberAddForm.jsp
+++ b/omod/src/main/webapp/teamMemberAddForm.jsp
@@ -133,7 +133,7 @@
 			var selectedValue = gender.options[gender.selectedIndex].value;
 			var selectedMemberRoleValue = teamRoleOption.options[teamRoleOption.selectedIndex].value;
 			var selectedMemberValue = teamOption.options[teamOption.selectedIndex].value;
-			var regexp = /^[a-z/i][a-z.\- ]*[a-z/i]{2,}$/i;
+			var regexp = /^[a-zA-Z0-9]{3,20}$/i;
 			var idRegExp = /^[a-z|0-9]+[a-z.\-_]*[a-z|0-9]{2,}$/i;
 			var mustSelectMessage = "";
 			var dataTypeMessage = "";
@@ -158,7 +158,7 @@
 			//if (selectedMemberValue == 0) { mustSelectMessage += "<br>Please select a Member Team."; }
 			if(document.getElementById("loginChoice").checked) {
 				if (user == null || user == "") { mustSelectMessage += "<br>UserName can't be empty."; }
-				if (!regexp.test(user)) { dataTypeMessage += "<br>In UserName Min 3, max 20 All data types and either [- . Or _ ] are allowed for text field."; }
+				if (!regexp.test(user)) { dataTypeMessage += user+"<br>In ---- UserName Min 3, max 20 All data types and either [- . Or _ ] are allowed for text field."; }
 			}
 			if(mustSelectMessage != ""){ alertify.alert(mustSelectMessage); }
 			else if(dataTypeMessage != ""){ alertify.alert(dataTypeMessage); }