Fixed some small issues in previous commit

openmrs · Aug 4, 2015 · 1665a20 · 1665a20
1 parent 9866a6b
commit 1665a20
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 16 deletions.
diff --git a/api/src/main/java/org/openmrs/module/chartsearch/ChartSearchCache.java b/api/src/main/java/org/openmrs/module/chartsearch/ChartSearchCache.java
@@ -586,9 +586,9 @@ public String[] fetchPersonalNotesColors() {
 		ChartSearchPreference preference = Context.getService(ChartSearchService.class).getRightMatchedPreferences();
 		String[] pColors = null;
 
-		if (preference != null && preference.gePersonalNotesColorsArray() != null
-		        && preference.gePersonalNotesColorsArray().length > 0) {
-			pColors = preference.gePersonalNotesColorsArray();
+		if (preference != null && preference.getPersonalNotesColorsArray() != null
+		        && preference.getPersonalNotesColorsArray().length > 0) {
+			pColors = preference.getPersonalNotesColorsArray();
 		}
 
 		return pColors;

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/GeneratingJson.java b/api/src/main/java/org/openmrs/module/chartsearch/GeneratingJson.java
@@ -694,7 +694,7 @@ private static JSONObject generatePreferencesJSON(ChartSearchPreference pref) {
 
 		if (pref != null) {
 			json.put("owner", pref.getPreferenceOwner().getUsername());
-			json.put("notesColors", pref.gePersonalNotesColorsArray());
+			json.put("notesColors", pref.getPersonalNotesColors());
 			json.put("uuid", pref.getUuid());
 			json.put("enableBookmarks", pref.isEnableBookmarks());
 			json.put("enableDefaultSearch", pref.isEnableDefaultSearch());

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchNote.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchNote.java
@@ -167,9 +167,9 @@ private boolean checkIfColorExistsInPersonalColors(String color) {
 		ChartSearchPreference preference = Context.getService(ChartSearchService.class).getRightMatchedPreferences();
 		boolean exists = false;
 
-		if (preference != null && preference.gePersonalNotesColorsArray() != null
-		        && preference.gePersonalNotesColorsArray().length > 0) {
-			String[] pColors = preference.gePersonalNotesColorsArray();
+		if (preference != null && preference.getPersonalNotesColorsArray() != null
+		        && preference.getPersonalNotesColorsArray().length > 0) {
+			String[] pColors = preference.getPersonalNotesColorsArray();
 			for (int i = 0; i < pColors.length; i++) {
 				if (pColors[i].equals(color)) {
 					exists = true;

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchPreference.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchPreference.java
@@ -138,7 +138,7 @@ public void setPersonalNotesColors(String personalNotesColors) {
 		this.personalNotesColors = personalNotesColors;
 	}
 
-	public String[] gePersonalNotesColorsArray() {
+	public String[] getPersonalNotesColorsArray() {
 		if (personalNotesColors == null) {
 			return null;
 		} else

diff --git a/...g/openmrs/module/chartsearch/fragment/controller/ManagePreferencesFragmentController.java b/...g/openmrs/module/chartsearch/fragment/controller/ManagePreferencesFragmentController.java
@@ -48,6 +48,7 @@ public void controller(FragmentModel model, UiUtils ui) {
 		model.put("redBasedColors", allColors.REDBASEDCOLORS);
 		model.put("greenBasedColors", allColors.GREENBASEDCOLORS);
 		model.put("blueBasedColors", allColors.BLUEBASEDCOLORS);
+		model.put("personalColorsNotes", cache.fetchPersonalNotesColors());
 	}
 
 	public JSONObject saveOrUpdatePrefereces(@RequestParam("history") Boolean enableHistory,

diff --git a/...openmrs/module/chartsearch/fragment/controller/SearchSavingSectionFragmentController.java b/...openmrs/module/chartsearch/fragment/controller/SearchSavingSectionFragmentController.java
@@ -27,7 +27,7 @@ public class SearchSavingSectionFragmentController {
 	ChartSearchCache cache = new ChartSearchCache();
 
 	public void controller(FragmentModel model) {
-		model.put("personalNotes", cache.fetchPersonalNotesColors());
+		model.put("personalColorsNotes", cache.fetchPersonalNotesColors());
 	}
 
 	public boolean checkIfPhraseExisitsInHistory(@RequestParam("searchPhrase") String searchPhrase,

diff --git a/omod/src/main/webapp/fragments/managePreferences.gsp b/omod/src/main/webapp/fragments/managePreferences.gsp
@@ -41,7 +41,8 @@
 	var redBasedColors = '${redBasedColors}'.replace("[", "").replace("]", "").split(", ");
 	var greenBasedColors = '${greenBasedColors}'.replace("[", "").replace("]", "").split(", ");
     var blueBasedColors = '${blueBasedColors}'.replace("[", "").replace("]", "").split(", ");
-	    	
+	var personalNotesColors = '${personalColorsNotes}'.replace("[", "").replace("]", "").split(", ");
+        	
 	jq(document).ready(function() {
 	
 		displayCategoriesForPreferences(cats);
@@ -104,9 +105,9 @@
 			jq("#enable_defaultsearch").prop('checked', prefs.enableDefaultSearch);
 			jq("#enable_multiplefiltering").prop('checked', prefs.enableMultipleFiltering);
 			jq("#enable_duplicateresults").prop('checked', prefs.enableDuplicateResults);
+			jq("#selectedColors").val(prefs.notesColors);
 			displayCategoriesForPreferences(prefs.categoryFilters);
 		}
-		//TODO add support for filters and note colors here
 	}
 
 	function submitPreferences(isNotDefault) {

diff --git a/omod/src/main/webapp/fragments/searchSavingSection.gsp b/omod/src/main/webapp/fragments/searchSavingSection.gsp
@@ -121,6 +121,7 @@
 
 <script type="text/javascript">
 	var jq = jQuery;
+	var pColors = '${personalColorsNotes}'.replace("[", "").replace("]", "").split(", ");
     
     jq(document).ready(function() {
     	displayExistingBookmarks();
@@ -696,12 +697,11 @@
     	}
     	
     	function addPersonalColorsToSelectColorElement() {
-    		//new-note-color
-    		var pColors = '${personalNotes}';
-    		
-    		if(pColors !== undefined) {
+    		if(pColors !== undefined && pColors !== "null") {
     			for(i = 0; i < pColors.length; i++) {
-    				jq("#new-note-color").append("<option>" + pColors[i] + "</option>");
+    				if(pColors[i] !== null) {
+    					jq("#new-note-color").append("<option>" + pColors[i] + "</option>");
+    				}
     			}
     		}
     	}