Skip to content

Commit

Permalink
Re-placed Launcher and Aggregate search tabs with Feedback for now
Browse files Browse the repository at this point in the history
  • Loading branch information
@k-joseph
k-joseph committed Jul 27, 2015
1 parent 107def9 commit 0952e1c
Show file tree
Hide file tree
Showing 4 changed files with 51 additions and 32 deletions.
55 changes: 43 additions & 12 deletions api/src/main/java/org/openmrs/module/chartsearch/cache/ChartSearchPreferences.java
View file
Expand Up @@ -10,6 +10,7 @@
package org.openmrs.module.chartsearch.cache;

import java.io.Serializable;
import java.util.UUID;

import javax.persistence.Column;
import javax.persistence.Entity;
Expand All @@ -18,46 +19,64 @@
import javax.persistence.Id;
import javax.persistence.Table;

import org.openmrs.BaseOpenmrsObject;
import org.openmrs.User;

/**
* One row column (for each user) table which stores and updates preferences defined by a user
*/
@Entity
@Table(name = "chartsearch_preferences")
public class ChartSearchPreferences extends BaseOpenmrsObject implements Serializable {
public class ChartSearchPreferences implements Serializable {

private static final long serialVersionUID = 1L;

@Id
@GeneratedValue(strategy = GenerationType.AUTO)
@Column(name = "preference_id")
@Column(name = "preference_id", nullable = false)
private Integer preferenceId;

@Column(name = "uuid", unique = true, nullable = false, length = 38)
private String uuid = UUID.randomUUID().toString();

/**
* Enabling and disabling history similar to Google chrome's Incognito mode
*/
@Column(name = "enable_history")
private boolean enableHistory;

@Column(name = "enable_bookmark")
private boolean enableBookmarks;

@Column(name = "enable_notes")
private boolean enableNotes;

@Column(name = "enable_duplicateresults")
private boolean enableDuplicateResults;

@Column(name = "enable_multiplefiltering")
private boolean enableMultipleFiltering;

private String[] personalNotesColors;
/**
* Comma separated personal notes colors
*/
@Column(name = "personalnotes_colors")
private String personalNotesColors;

@Column(name = "enable_history")
private boolean enableQuickSearches;

@Column(name = "enable_defaultsearch")
private boolean enableDefaultSearch;

@Override
public Integer getId() {
return getPreferenceId();
@Column(name = "user_id", nullable = false)
private User loggedInUSer;

public String getUuid() {
return uuid;
}

@Override
public void setId(Integer id) {
setPreferenceId(id);
public void setUuid(String uuid) {
this.uuid = uuid;
}

public Integer getPreferenceId() {
Expand Down Expand Up @@ -108,14 +127,18 @@ public void setEnableMultipleFiltering(boolean enableMultipleFiltering) {
this.enableMultipleFiltering = enableMultipleFiltering;
}

public String[] getPersonalNotesColors() {
public String getPersonalNotesColors() {
return personalNotesColors;
}

public void setPersonalNotesColors(String[] personalNotesColors) {
public void setPersonalNotesColors(String personalNotesColors) {
this.personalNotesColors = personalNotesColors;
}

public String[] personalNotesColorsArray() {
return personalNotesColors.split(", ");
}

public boolean isEnableQuickSearches() {
return enableQuickSearches;
}
Expand All @@ -132,4 +155,12 @@ public void setEnableDefaultSearch(boolean enableDefaultSearch) {
this.enableDefaultSearch = enableDefaultSearch;
}

public User getLoggedInUSer() {
return loggedInUSer;
}

public void setLoggedInUSer(User loggedInUSer) {
this.loggedInUSer = loggedInUSer;
}

}
1 change: 1 addition & 0 deletions omod/src/main/webapp/fragments/chartsearchFeedback.gsp
View file
@@ -0,0 +1 @@
<h1>User's Feedback</h1>
11 changes: 3 additions & 8 deletions omod/src/main/webapp/fragments/searchSavingSection.gsp
View file
Expand Up @@ -267,12 +267,8 @@
window.open('../chartsearch/chartSearchManager.page#notes', '_blank');
});
jq("#aggregate-searches").click(function(event) {
window.open('../chartsearch/chartSearchManager.page#aggregate-searches', '_blank');
});
jq("#chartsearch-laucher").click(function(event) {
window.open('../chartsearch/chartSearchManager.page#launcher', '_blank');
jq("#feedback").click(function(event) {
window.open('../chartsearch/chartSearchManager.page#feedback', '_blank');
});
jq("#new-note-color").change(function(event) {
Expand Down Expand Up @@ -764,6 +760,5 @@
<div class="possible-task-list-item" id="commands-task-list-item">Commands</div>
<div class="possible-task-list-item" id="settings-task-list-item">Settings</div>
<div class="possible-task-list-item" id="notes-task-list-item">Notes Manager</div>
<div class="possible-task-list-item" id="aggregate-searches">Aggregate Searches</div>
<div class="possible-task-list-item" id="chartsearch-laucher">Choose Another Patient</div>
<div class="possible-task-list-item" id="feedback">Feedback</div>
</div>
16 changes: 4 additions & 12 deletions omod/src/main/webapp/pages/chartSearchManager.gsp
View file
Expand Up @@ -29,11 +29,6 @@ input[type="radio"], input[type="checkbox"] {

<div class="ui-tabs">
<ul class="ui-tabs-nav ui-helper-reset ui-helper-clearfix ui-widget-header ui-corner-all" role="tablist">
<li class="ui-state-default ui-corner-top">
<a class="ui-tabs-anchor" href="#launcher">
Launcher
</a>
</li>
<li class="ui-state-default ui-corner-top ui-state-active" >
<a class="ui-tabs-anchor" href="#history" >
History
Expand Down Expand Up @@ -65,15 +60,12 @@ input[type="radio"], input[type="checkbox"] {
</a>
</li>
<li class="ui-state-default ui-corner-top ui-state-active" >
<a class="ui-tabs-anchor" href="#aggregate-searches" >
Aggregate Searches
<a class="ui-tabs-anchor" href="#feedback" >
Feedback
</a>
</li>
</ul>

<div id="launcher">
${ ui.includeFragment("chartsearch", "chartsearchLauncher") }
</div>
<div id="preferences">
${ ui.includeFragment("chartsearch", "managePreferences") }
</div>
Expand All @@ -92,8 +84,8 @@ input[type="radio"], input[type="checkbox"] {
<div id="notes">
${ ui.includeFragment("chartsearch", "manageNotes") }
</div>
<div id="aggregate-searches">
${ ui.includeFragment("chartsearch", "aggregateSearches") }
<div id="feedback">
${ ui.includeFragment("chartsearch", "chartsearchFeedback") }
</div>

</div>

0 comments on commit 0952e1c

Please sign in to comment.