Fixed some bug in time filter, left only with custom option

openmrs · Jul 9, 2015 · f1a2012 · f1a2012
1 parent 8cf6d96
commit f1a2012
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/omod/src/main/webapp/fragments/resultBox.gsp b/omod/src/main/webapp/fragments/resultBox.gsp
@@ -7,6 +7,7 @@
     jQuery( document ).ready(function() {
         refresh_data(jsonAfterParse);
         autoClickFirstResultToShowItsDetails(jsonAfterParse);
+        storeJsonFromServer(jsonAfterParse);
     });
 
 /*    document.getElementById('result_main_box').innerHTML += resultText;*/

diff --git a/omod/src/main/webapp/fragments/searchSavingSection.gsp b/omod/src/main/webapp/fragments/searchSavingSection.gsp
@@ -563,10 +563,12 @@
 			            jq(".inside_filter_categories").fadeOut(500);
 			
 			            jsonAfterParse = JSON.parse(results);
+			            
 			            refresh_data(jsonAfterParse);
+			            storeJsonFromServer(jsonAfterParse);
+			            autoClickFirstResultToShowItsDetails(jsonAfterParse);
 			
 			            jq(".results_table_wrap").fadeIn(500);
-			            autoClickFirstResultToShowItsDetails(jsonAfterParse);
 			            jq(".inside_filter_categories").fadeIn(500);
 			            jq("#bookmark-category-names").text(cats);
 			            jq("#bookmark-search-phrase").text(phrase);

diff --git a/omod/src/main/webapp/fragments/topArea.gsp b/omod/src/main/webapp/fragments/topArea.gsp
@@ -297,10 +297,12 @@
 						jq(".inside_filter_categories").fadeOut(500);
 										
 						jsonAfterParse = JSON.parse(results);
+						
 						refresh_data(jsonAfterParse);
+						storeJsonFromServer(jsonAfterParse);
+						autoClickFirstResultToShowItsDetails(jsonAfterParse);
 						
 						jq(".results_table_wrap").fadeIn(500);
-						autoClickFirstResultToShowItsDetails(jsonAfterParse);
 						jq(".inside_filter_categories").fadeIn(500);
 								
 						showHistorySuggestionsOnLoad();

diff --git a/omod/src/main/webapp/pages/chartsearch.gsp b/omod/src/main/webapp/pages/chartsearch.gsp
@@ -29,4 +29,6 @@ ${ ui.includeFragment("chartsearch", "cssIncludes") }
     ${ ui.includeFragment("chartsearch", "topArea") }
     <div style="clear:both;"></div>
 
+    <input type='hidden' id='json-stored-string' />
+
 </div>
diff --git a/omod/src/main/webapp/resources/scripts/views_factory.js b/omod/src/main/webapp/resources/scripts/views_factory.js
@@ -1588,8 +1588,8 @@ function isLoggedInSynchronousCheck() {// $.getJSON(emr.fragmentActionLink('html
 }
 
 function filterResultsUsingTime(selectedPeriod) {
-
-	var newResultsJson = jsonAfterParse;
+	var storedJsonAfterParse = JSON.parse($("#json-stored-string").val());
+	var newResultsJson = storedJsonAfterParse;
 	var new_obs_groups = [];
 	var new_obs_singles = [];
 	var new_patientAllergies = [];
@@ -1789,3 +1789,8 @@ function getMatchedDatePeriod(dateTime, period) {
 
 	return matchedPeriod;
 }
+
+function storeJsonFromServer(json) {
+	var jsonStringToStore = JSON.stringify(json);
+	$("#json-stored-string").val(jsonStringToStore);
+}