Proposed fix for 'Duplicate property mapping of uuid'

openmrs · Jul 17, 2015 · e6e3839 · e6e3839
1 parent eb1e749
commit e6e3839
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 59 deletions.
diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchBookmark.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchBookmark.java
@@ -65,17 +65,6 @@ public class ChartSearchBookmark extends BaseOpenmrsObject implements Serializab
 	@Column(name = "selected_categories")
 	private String selectedCategories;
 
-	/**
-	 * @see org.openmrs.BaseOpenmrsObject#getUuid()
-	 */
-	@Basic
-	@Access(AccessType.PROPERTY)
-	@Column(name = "bookmark_uuid", length = 38, unique = true)
-	@Override
-	public String getUuid() {
-		return super.getUuid();
-	}
-
 	@Override
 	public Integer getId() {
 		return getBookmarkId();

diff --git a/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchHistory.java b/api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchHistory.java
@@ -55,17 +55,6 @@ public class ChartSearchHistory extends BaseOpenmrsObject implements Serializabl
 	@JoinColumn(name = "user_id", nullable = false)
 	private User historyOwner;
 
-	/**
-	 * @see org.openmrs.BaseOpenmrsObject#getUuid()
-	 */
-	@Basic
-	@Access(AccessType.PROPERTY)
-	@Column(name = "history_uuid", length = 38, unique = true)
-	@Override
-	public String getUuid() {
-		return super.getUuid();
-	}
-
 	@Override
 	public Integer getId() {
 		return getSearchId();

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
@@ -75,17 +75,6 @@ public void setId(Integer id) {
 		setNoteId(id);
 	}
 
-	/**
-	 * @see org.openmrs.BaseOpenmrsObject#getUuid()
-	 */
-	@Basic
-	@Access(AccessType.PROPERTY)
-	@Column(name = "note_uuid", length = 38, unique = true)
-	@Override
-	public String getUuid() {
-		return super.getUuid();
-	}
-
 	public Integer getNoteId() {
 		return noteId;
 	}
@@ -164,9 +153,10 @@ public String getDisplayColor() {
 	 * @param displayColor
 	 */
 	public void setDisplayColor(String displayColor) {
-		if ("orange".equals(displayColor) || "yellow".equals(displayColor)|| "violet".equals(displayColor) || "lime".equals(displayColor)
-		        || "beige".equals(displayColor) || "cyan".equals(displayColor) || "lightgreen".equals(displayColor)
-		        || "deeppink".equals(displayColor) || "magenta".equals(displayColor) || "red".equals(displayColor)) {//don't persist the first option
+		if ("orange".equals(displayColor) || "yellow".equals(displayColor) || "violet".equals(displayColor)
+		        || "lime".equals(displayColor) || "beige".equals(displayColor) || "cyan".equals(displayColor)
+		        || "lightgreen".equals(displayColor) || "deeppink".equals(displayColor) || "magenta".equals(displayColor)
+		        || "red".equals(displayColor)) {//don't persist the first option
 			this.displayColor = displayColor;
 		} else {
 			this.displayColor = "white";

diff --git a/api/src/main/resources/liquibase.xml b/api/src/main/resources/liquibase.xml
@@ -397,4 +397,23 @@
 			<column name="uuid" value="663f961e-24bd-11e5-b345-feff819cdc9f" />
 		</insert>
 	</changeSet>
+	<changeSet id="CSM-111_17072015_1513" author="k-joseph">
+		<preConditions onFail="MARK_RAN">
+			<columnExists tableName="chartsearch_history"
+				columnName="history_uuid" />
+			<columnExists tableName="chartsearch_bookmark"
+				columnName="bookmark_uuid" />
+			<columnExists tableName="chartsearch_note" columnName="note_uuid" />
+		</preConditions>
+		<comment>
+			Re-Renaming history_uuid , bookmark_uuid and note_uuid
+			to uuid
+		</comment>
+		<renameColumn tableName="chartsearch_history"
+			oldColumnName="history_uuid" newColumnName="uuid" columnDataType="char(38)" />
+		<renameColumn tableName="chartsearch_bookmark"
+	oldColumnName="bookmark_uuid" newColumnName="uuid" columnDataType="char(38)" />
+		<renameColumn tableName="chartsearch_note" oldColumnName="note_uuid"
+			newColumnName="uuid" columnDataType="char(38)" />
+	</changeSet>
 </databaseChangeLog>
diff --git a/omod/src/main/webapp/fragments/searchSavingSection.gsp b/omod/src/main/webapp/fragments/searchSavingSection.gsp
@@ -124,7 +124,7 @@
     	jq("#lauche-other-chartsearch-features").hide();
     	
     	displayExistingBookmarks();
-    	displayBothPersonalAndGlobalNotes();
+    	displayBothPersonalAndGlobalNotes(jsonAfterParse);
     	updateBookmarksAndNotesUI();
     	displayQuickSearches();
     
@@ -611,7 +611,7 @@
 								jsonAfterParse.globalNotes = allNotes.globalNotes;
 								jsonAfterParse.currentUser = allNotes.currentUser;
 								
-								displayBothPersonalAndGlobalNotes();
+								displayBothPersonalAndGlobalNotes(jsonAfterParse);
 								jq("#new-comment-or-note").val("");
 	    						jq("#new-comment-or-note").css("border", "");
 							}
@@ -655,7 +655,7 @@
 								jsonAfterParse.globalNotes = allNotes.globalNotes;
 								jsonAfterParse.currentUser = allNotes.currentUser;
 								
-								displayBothPersonalAndGlobalNotes();
+								displayBothPersonalAndGlobalNotes(jsonAfterParse);
 							}
 						},
 						error: function(e) {
@@ -682,7 +682,7 @@
 							jsonAfterParse.globalNotes = allNotes.globalNotes;
 							jsonAfterParse.currentUser = allNotes.currentUser;
 							
-							displayBothPersonalAndGlobalNotes();
+							displayBothPersonalAndGlobalNotes(jsonAfterParse);
 						}
 					},
 					error: function(e) {

diff --git a/omod/src/main/webapp/fragments/topArea.gsp b/omod/src/main/webapp/fragments/topArea.gsp
@@ -15,7 +15,7 @@
 		jq("#ui-datepicker-stop").datepicker();
 		
 		showHistorySuggestionsOnLoad();
-		displayBothPersonalAndGlobalNotes();
+		displayBothPersonalAndGlobalNotes(jsonAfterParse);
 		updateCategeriesAtUIGlobally(jsonAfterParse.appliedCategories);
 		
         jq( "#date_filter_title" ).click(function() {
@@ -339,7 +339,7 @@
 								
 						showHistorySuggestionsOnLoad();
 						hideSearchSuggestions();
-	    				displayBothPersonalAndGlobalNotes();
+	    				displayBothPersonalAndGlobalNotes(jsonAfterParse);
 	    				displayQuickSearches();
 	    				updateBookmarksAndNotesUI();
 	    				updateCategeriesAtUIGlobally(jsonAfterParse.appliedCategories);

diff --git a/omod/src/main/webapp/resources/scripts/views_factory.js b/omod/src/main/webapp/resources/scripts/views_factory.js
@@ -417,11 +417,11 @@ function enable_graph(obs_id) {
 			panRange : [ -maxToBePlottedMilli, maxToBePlottedMilli ]
 		},
 		zoom : {
-			interactive : true,
+			interactive : false,
 			amount : 0.5
 		},
 		pan : {
-			interactive : true
+			interactive : false
 		}
 	});
 
@@ -1047,17 +1047,21 @@ function refresh_data(json) {
 	$("#location_anchor").text('All Locations');
 	$("#provider_anchor").text('All Providers');
 
-	if (!filteredJson || filteredJson === "") {
-		displayCategories(json);
-		displayProviders(json);
-		displayLocations(json);
-	}
-	if (json.noResults.foundNoResults) {
-		document.getElementById('obsgroups_results').innerHTML = "<div id='found_no_results'>"
-				+ json.noResults.foundNoResultsMessage
-				+ " <b> "
-				+ searchText.value + "</b></div>";
+	if (!json || json.noResults.foundNoResults) {
+		if (json) {
+			document.getElementById('obsgroups_results').innerHTML = "<div id='found_no_results'>"
+					+ json.noResults.foundNoResultsMessage
+					+ " <b> "
+					+ searchText.value + "</b></div>";
+		} else {
+			alert("Still Indexing!");
+		}
 	} else {
+		if (!filteredJson || filteredJson === "") {
+			displayCategories(json);
+			displayProviders(json);
+			displayLocations(json);
+		}
 		searchText.value = json.search_phrase;
 		var numberOfResults = json.obs_groups.length + json.obs_singles.length
 				+ json.patientAllergies.length
@@ -1083,7 +1087,6 @@ function refresh_data(json) {
 		addAllResultsFromJSONFromTheServer(json);
 		displayFailedPrivileges(json);
 	}
-	displayBothPersonalAndGlobalNotes();
 }
 
 /*
@@ -1238,14 +1241,14 @@ function updateBookmarksAndNotesUI() {
 	}
 }
 
-function displayBothPersonalAndGlobalNotes() {
-	var personalNotes = jsonAfterParse.personalNotes;
-	var globalNotes = jsonAfterParse.globalNotes;
+function displayBothPersonalAndGlobalNotes(json) {
+	var personalNotes = json.personalNotes;
+	var globalNotes = json.globalNotes;
 	var displayPersonalNotes = "";
 	var displayGlobalNotes = "";
 	var displayAllNotes;
 	var owner;
-	var curUser = jsonAfterParse.currentUser;
+	var curUser = json.currentUser;
 
 	if (personalNotes && personalNotes.length !== 0) {
 		displayPersonalNotes += "<u>Personal Notes (LOW priority):</u><br />";