r5269 - in branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client: . i18n screen screen/patient widget
subve...@svn.freemedsoftware.org
Date: 2010-03-11 09:39:30 -0500 (Thu, 11 Mar 2010)
New Revision: 5269
Modified:
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/CurrentState.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/EntryScreenInterface.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/JsonUtil.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/PatientEntryScreenInterface.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/SystemNotifications.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/Util.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/i18n/AppConstants.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ACLScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/BottleTransferScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/CallInScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ConfigurationScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/DispenseDose.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MainScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MedicationInventoryScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingComposeScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientForm.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientsGroupScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PreferencesScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataManagementScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/UserManagementScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/AllergyEntryScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ClinicalAssessmentNotes.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/CounselorIntakeEntry.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DoseHold.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosePlan.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosingMessage.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/EncounterScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntakeInitialContactEntry.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntensifiedTreatmentNotes.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/PrescriptionsScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ProgressNoteEntry.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ScheduleToxicologyScreen.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentClinicalNotes.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentDischargeForm.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentNoteTemplate.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/EmrPrintDialog.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MugshotWebcamWidget.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MultiPageImageCompositedForm.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAddresses.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAuthorizations.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientCoverages.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagWidget.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagsWidget.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PrescriptionRefillBox.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/ReconciliationWidget.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/SchedulerWidget.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/WorkList.java
Log:
* [FreeMED - Bug #101] (Resolved) Toaster Messages or Yellow Popup message?\226?\128?\143
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/CurrentState.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/CurrentState.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/CurrentState.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -86,12 +86,14 @@
public static String CUR_THEME = "chrome";
- public static Integer defaultProviderGroup = null;
-
public static String LAST_THEME = "chrome";
+ public static Integer defaultProviderGroup = null;
+
public static Integer BREAK_HOUR = null;
-
+
+ public static String SYSTEM_NOTIFY_TYPE = "";
+
public CurrentState() {
retrieveUserConfiguration(true);
retrieveSystemConfiguration(true, null);
@@ -257,6 +259,30 @@
}
/**
+ * Get user specific configuration JSONified value, or "" if there is no value.
+ *
+ * @param key
+ * @return
+ */
+ public static Object getUserConfig(String key,String objectType) {
+ JsonUtil.debug("getUserConfig() called");
+ JsonUtil.debug("key:"+key);
+ JsonUtil.debug("objectType:"+objectType);
+ if (userConfiguration.size() != 0) {
+ try{
+ return JsonUtil
+ .shoehornJson(JSONParser.parse(userConfiguration.get(key).toString()
+ ),
+ objectType);
+ }catch(Exception e){return userConfiguration.get(key);//if already Jsonified
+ }
+ }
+ JsonUtil.debug("getUserConfig(): was unable to find userConfiguration "
+ + "| key = " + key);
+ return "";
+ }
+
+ /**
* Get system specific configuration value, or "" if there is no value.
*
* @param key
@@ -309,28 +335,20 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- getToaster().addItem("CurrentState",
- "Failed to update configuration value.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CurrentState", "Failed to update configuration value.");
}
public void onResponseReceived(Request request,
Response response) {
if (200 == response.getStatusCode()) {
- getToaster().addItem("CurrentState",
- "Updated configuration value.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("CurrentState", "Updated configuration value.");
} else {
- getToaster().addItem("CurrentState",
- "Failed to update configuration value.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CurrentState", "Failed to update configuration value.");
}
}
});
} catch (RequestException e) {
- getToaster().addItem("CurrentState",
- "Failed to update configuration value.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CurrentState", "Failed to update configuration value.");
}
} else {
@@ -391,7 +409,6 @@
"LeftNavigationMenu")
.toString()),
"HashMap<String,HashMap<String,String>>");
- // mainScreen.initNavigations();
mainScreen.initMainScreen();
}
if (onLoad != null) {
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/EntryScreenInterface.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/EntryScreenInterface.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/EntryScreenInterface.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -153,8 +153,7 @@
if (internalId.intValue() == 0) {
// Add record
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem(moduleName,
- "Added successfully.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Added successfully.");
if (doneCommand != null) {
doneCommand.execute();
}
@@ -171,9 +170,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(moduleName,
- "Failed to add record.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to add record.");
}
public void onResponseReceived(Request request,
@@ -184,34 +181,25 @@
.parse(response.getText()),
"Integer");
if (r != null) {
- CurrentState.getToaster().addItem(
- moduleName,
- "Added successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Added successfully.");
if (doneCommand != null) {
doneCommand.execute();
}
closeScreen();
}
} else {
- CurrentState.getToaster().addItem(
- moduleName,
- "Failed to add record.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to add record.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(moduleName,
- "Failed to add record.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to add record.");
}
} else {
service.ModuleAddMethod(moduleName, data,
new AsyncCallback<Integer>() {
public void onSuccess(Integer r) {
- CurrentState.getToaster().addItem(
- moduleName, "Added successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Added successfully.");
if (doneCommand != null) {
doneCommand.execute();
}
@@ -226,8 +214,7 @@
} else {
// Modify record
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem(moduleName,
- "Modified successfully.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Modified successfully.");
closeScreen();
} else if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String[] params = { moduleName, JsonUtil.jsonify(data) };
@@ -241,9 +228,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(moduleName,
- "Failed to modify record.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to modify record.");
}
public void onResponseReceived(Request request,
@@ -254,25 +239,16 @@
.parse(response.getText()),
"Boolean");
if (r != false && r != null) {
- CurrentState.getToaster().addItem(
- moduleName,
- "Modified successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Modified successfully");
if (doneCommand != null) {
doneCommand.execute();
}
closeScreen();
} else {
- CurrentState.getToaster().addItem(
- moduleName,
- "Failed to modify record.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to modify record.");
}
} else {
- CurrentState.getToaster().addItem(
- moduleName,
- "Failed to modify record.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to modify record.");
}
}
});
@@ -282,10 +258,7 @@
service.ModuleModifyMethod(moduleName, data,
new AsyncCallback<Integer>() {
public void onSuccess(Integer r) {
- CurrentState.getToaster().addItem(
- moduleName,
- "Modified successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Modified successfully.");
if (doneCommand != null) {
doneCommand.execute();
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/JsonUtil.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/JsonUtil.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/JsonUtil.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -34,6 +34,7 @@
import com.google.gwt.json.client.JSONBoolean;
import com.google.gwt.json.client.JSONNumber;
import com.google.gwt.json.client.JSONObject;
+import com.google.gwt.json.client.JSONParser;
import com.google.gwt.json.client.JSONString;
import com.google.gwt.json.client.JSONValue;
@@ -184,6 +185,10 @@
* @return
*/
@SuppressWarnings("unchecked")
+ public static synchronized Object shoehornJson(String r, String t){
+ return shoehornJson(JSONParser.parse(r), t);
+ }
+ @SuppressWarnings("unchecked")
public static synchronized Object shoehornJson(JSONValue r, String t) {
if (t.compareToIgnoreCase("HashMap<String,HashMap<String,String>[]>") == 0) {
HashMap<String, HashMap<String, String>[]> oResult = new HashMap<String, HashMap<String, String>[]>();
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/PatientEntryScreenInterface.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/PatientEntryScreenInterface.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/PatientEntryScreenInterface.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -104,9 +104,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to update.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to update.");
}
public void onResponseReceived(Request request,
@@ -116,21 +114,15 @@
JSONParser.parse(response.getText()),
"Integer");
if (r != null) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Updated.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Updated.");
}
} else {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to update.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to update.");
}
}
});
} catch (RequestException e) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to update.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to update.");
}
} else {
if (Util.getProgramMode() == ProgramMode.JSONRPC) {
@@ -145,9 +137,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to add.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to add.");
}
public void onResponseReceived(Request request,
@@ -158,35 +148,25 @@
.parse(response.getText()),
"Integer");
if (r != null) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Added.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Added.");
}
} else {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to add.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to add.");
}
}
});
} catch (RequestException e) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to update.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to update.");
}
} else {
service.ModuleModifyMethod(moduleName, rec,
new AsyncCallback<Integer>() {
public void onSuccess(Integer result) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Updated.",
- Toaster.TOASTER_INFO);
+ Util.showErrorMsg(moduleName, "Failed to update.");
}
public void onFailure(Throwable th) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to update.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to update.");
}
});
}
@@ -196,15 +176,11 @@
service.ModuleAddMethod(moduleName, rec,
new AsyncCallback<Integer>() {
public void onSuccess(Integer result) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Added.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(moduleName, "Added.");
}
public void onFailure(Throwable th) {
- Toaster t = CurrentState.getToaster();
- t.addItem(moduleName, "Failed to add.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to Add.");
}
});
}
@@ -238,8 +214,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(moduleName,
- "Failed to load data.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to load data.");
}
@SuppressWarnings("unchecked")
@@ -256,9 +231,7 @@
populateData(r);
}
} else {
- CurrentState.getToaster().addItem(moduleName,
- "Failed to load data.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to load data.");
}
}
});
@@ -274,9 +247,7 @@
}
public void onFailure(Throwable t) {
- CurrentState.getToaster().addItem(moduleName,
- "Failed to load data.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(moduleName, "Failed to load data.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/SystemNotifications.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/SystemNotifications.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/SystemNotifications.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -112,10 +112,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(
- "SystemNotifications",
- "Failed to get system notifications.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SystemNotifications", "Failed to get system notifications.");
mutexStatus = false;
}
@@ -158,10 +155,7 @@
.debug("SystemNotifications(): Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem(
- "SystemNotifications",
- "Failed to get system notifications.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SystemNotifications", "Failed to get system notifications.");
}
// Release mutex
@@ -169,9 +163,7 @@
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("SystemNotifications",
- "Failed to get system notifications.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SystemNotifications", "Failed to get system notifications.");
mutexStatus = false;
}
} else {
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/Util.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/Util.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/Util.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -74,6 +74,7 @@
import org.freemedsoftware.gwt.client.Public.LoginAsync;
import org.freemedsoftware.gwt.client.Public.Protocol;
import org.freemedsoftware.gwt.client.Public.ProtocolAsync;
+import org.freemedsoftware.gwt.client.i18n.AppConstants;
import org.freemedsoftware.gwt.client.screen.PatientScreen;
import org.freemedsoftware.gwt.client.screen.PreferencesScreen;
import org.freemedsoftware.gwt.client.widget.AsyncPicklistWidgetBase;
@@ -1222,6 +1223,9 @@
*/
public static void showErrorMsg(String module,String msg){
+ JsonUtil.debug("Error SYSTEM_NOTIFY_TYPE" + CurrentState.SYSTEM_NOTIFY_TYPE);
+ if(CurrentState.SYSTEM_NOTIFY_TYPE.equals(AppConstants.SYSTEM_NOTIFY_ERROR)
+ ||CurrentState.SYSTEM_NOTIFY_TYPE.equals(AppConstants.SYSTEM_NOTIFY_ALL))
CurrentState.getToaster().addItem(module,
msg,
Toaster.TOASTER_ERROR);
@@ -1237,6 +1241,9 @@
*/
public static void showInfoMsg(String module,String msg){
+ JsonUtil.debug("INFO SYSTEM_NOTIFY_TYPE" + CurrentState.SYSTEM_NOTIFY_TYPE);
+ if(CurrentState.SYSTEM_NOTIFY_TYPE.equals(AppConstants.SYSTEM_NOTIFY_INFO)
+ ||CurrentState.SYSTEM_NOTIFY_TYPE.equals(AppConstants.SYSTEM_NOTIFY_ALL))
CurrentState.getToaster().addItem(module,
msg,
Toaster.TOASTER_INFO);
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/i18n/AppConstants.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/i18n/AppConstants.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/i18n/AppConstants.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -141,11 +141,22 @@
/////////////////////////////Reporting Constants//////////////////////////
public final static String REPORTING_TREATMENT = "treatment_report";
/////////////////////////////End Permissions Constants//////////////////////////
-
+
+ /////////////////////////////APPOINTMENT Constants//////////////////////////
public final static String APPOINTMENT_TYPE_PATIENT = "pat";
public final static String APPOINTMENT_TYPE_GROUP = "group";
public final static String APPOINTMENT_TYPE_CALLIN_PATIENT = "temp";
+ /////////////////////////////END APPOINTMENT Constants//////////////////////////
+ /////////////////////////////Preferences Constants//////////////////////////
+ public final static String SYSTEM_THEME = "Theme";
+ public final static String SYSTEM_NOTIFICATION = "Notifications";
+ public final static String SYSTEM_NOTIFY_INFO = "Info";
+ public final static String SYSTEM_NOTIFY_ERROR = "Error";
+ public final static String SYSTEM_NOTIFY_ALL = "All";
+ public final static String SYSTEM_NOTIFY_NONE = "None";
+ /////////////////////////////END Preferences Constants//////////////////////////
+
//////////////////////////////////////////////////////////////////////////////
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ACLScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ACLScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ACLScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -222,9 +222,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(className,
- "Failed to add Group.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Bottle Transfer", "Failed to add Group.");
}
public void onResponseReceived(Request request,
@@ -235,10 +233,7 @@
.parse(response.getText()),
"Integer");
if (r != null) {
- CurrentState.getToaster().addItem(
- className,
- "Successfully Added Group.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Successfully Added Group.");
retrieveAllGroups();
clearForm();
}else{
@@ -247,25 +242,18 @@
.parse(response.getText()),
"Boolean");
if(b){
- CurrentState.getToaster().addItem(
- className,
- "Successfully Modified Group.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Successfully Modified Group.");
retrieveAllGroups();
clearForm();
}
}
} else {
- CurrentState.getToaster().addItem(
- className, "Failed to add Group.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Bottle Transfer", "Failed to add Group.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(className,
- "Failed to send message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Bottle Transfer", "Failed to add Group.");
}
} else {
// TODO: Create GWT-RPC stuff here
@@ -289,9 +277,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(className,
- "Failed to delete Group.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Bottle Transfer", "Failed to delete Group.");
}
public void onResponseReceived(Request request,
@@ -302,24 +288,17 @@
.parse(response.getText()),
"Boolean");
if(flag){
- CurrentState.getToaster().addItem(
- className,
- "Successfully deleted Group.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Successfully deleted Group.");
retrieveAllGroups();
clearForm();
}
} else {
- CurrentState.getToaster().addItem(
- className, "Failed to delete Group.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Bottle Transfer", "Failed to add Group.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(className,
- "Failed to delete Group.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Bottle Transfer", "Failed to add Group.");
}
} else {
// TODO: Create GWT-RPC stuff here
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/BottleTransferScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/BottleTransferScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/BottleTransferScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -406,13 +406,11 @@
Response response) {
if (200 == response.getStatusCode()) {
- CurrentState.getToaster().addItem("Bottle Transfer",
- "Bottle Transfer is Successful.");
+ Util.showInfoMsg("Bottle Transfer", "Bottle Transfer is Successful.");
bottleTransferToPopup.hide();
} else {
- CurrentState.getToaster().addItem("Bottle Transfer",
- "Bottle Transfer Failed.");
+ Util.showErrorMsg("Bottle Transfer", "Bottle Transfer Failed.");
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/CallInScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/CallInScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/CallInScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -854,9 +854,7 @@
if (r != null) {
clearForm();
populate();
- CurrentState.getToaster().addItem(
- "Callin Form",
- "Entry successfully added.");
+ Util.showInfoMsg("Callin Form", "Entry successfully added.");
}else {
r=(Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
@@ -864,9 +862,7 @@
if(r==1){
clearForm();
populate();
- CurrentState.getToaster().addItem(
- "Callin Form",
- "Entry successfully modified.");
+ Util.showInfoMsg("Callin Form", "Entry successfully modified.");
btnAdd.setText("Add");
}else{
@@ -874,8 +870,7 @@
}
} else {
- CurrentState.getToaster().addItem(
- "Callin Form", "Callin Form failed.");
+ Util.showErrorMsg("Callin Form", "Callin Form failed.");
}
}
});
@@ -957,9 +952,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("CallinScreen",
- "Failed to delete entry.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Failed to delete entry.");
}
public void onResponseReceived(Request request,
@@ -970,16 +963,11 @@
JSONParser.parse(response.getText()),
"Boolean");
if (r != null) {
- CurrentState.getToaster().addItem(
- "CallinScreen", "Entry deleted.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("Callin Form", "Entry deleted.");
// populate(tag);
}
} else {
- CurrentState.getToaster().addItem(
- "CallinScreen",
- "Failed to delete entry.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Failed to delete entry.");
}
}
}
@@ -1099,9 +1087,7 @@
@Override
public void onClick(ClickEvent arg0) {
if(!CurrentState.canBookAppoinment(start.getValue(date.getValue()), end.getValue(date.getValue()))){
- CurrentState.getToaster().addItem("Scheduler",
- "Can not book appointment in between("+CurrentState.BREAK_HOUR+":00 -"+(CurrentState.BREAK_HOUR+1)+":00) !",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Can not book appointment in between("+CurrentState.BREAK_HOUR+":00 -"+(CurrentState.BREAK_HOUR+1)+":00) !");
return;
}
@@ -1195,16 +1181,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Failed to get scheduler items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Failed to get scheduler items.");
}
} else {
// GWT-RPC
@@ -1235,21 +1217,14 @@
Response response) {
if (200 == response.getStatusCode()) {
hide();
- CurrentState.getToaster().addItem(
- "CallinScheduler",
- "Appointment saved successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("Callin Form", "Appointment saved successfully.");
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to save appointment.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Failed to save appointment.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to save appointment.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Callin Form", "Failed to save appointment.");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ConfigurationScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ConfigurationScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/ConfigurationScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -139,8 +139,7 @@
protected void commitValues() {
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem("ConfigurationScreen",
- "Updated configuration.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("ConfigurationScreen", "Updated configuration.");
} else if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String[] params = { JsonUtil.jsonify(getAllValues()) };
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST,
@@ -150,10 +149,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(
- "ConfigurationScreen",
- "Failed to update configuration.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ConfigurationScreen", "Failed to update configuration.");
}
public void onResponseReceived(Request request,
@@ -163,42 +159,26 @@
JSONParser.parse(response.getText()),
"Boolean");
if (r.booleanValue()) {
- CurrentState.getToaster().addItem(
- "ConfigurationScreen",
- "Updated configuration.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("ConfigurationScreen", "Updated configuration.");
CurrentState.retrieveSystemConfiguration(true);//re-evaluate system configuration
} else {
- CurrentState.getToaster().addItem(
- "ConfigurationScreen",
- "Failed to update configuration.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ConfigurationScreen", "Failed to update configuration.");
}
} else {
- CurrentState.getToaster().addItem(
- "ConfigurationScreen",
- "Failed to update configuration.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ConfigurationScreen", "Failed to update configuration.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("ConfigurationScreen",
- "Failed to update configuration.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ConfigurationScreen", "Failed to update configuration.");
}
} else {
getProxy().SetValues(getAllValues(), new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
if (result.booleanValue()) {
- CurrentState.getToaster().addItem(
- "ConfigurationScreen",
- "Updated configuration.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("ConfigurationScreen", "Updated configuration.");
} else {
- CurrentState.getToaster().addItem(
- "ConfigurationScreen",
- "Failed to update configuration.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ConfigurationScreen", "Failed to update configuration.");
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/DispenseDose.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/DispenseDose.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/DispenseDose.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -1062,13 +1062,10 @@
}
//populatePrevWeekDoseStatus();
- CurrentState.getToaster().addItem(
- "Dispense Dose",
- "Lost Dose successfully re-dispensed");
+ Util.showInfoMsg("Dispense Dose", "Lost Dose successfully re-dispensed");
} else {
- CurrentState.getToaster().addItem("Dispense Dose",
- "Dispense Dose failed.");
+ Util.showErrorMsg("Dispense Dose", "Dispense Dose failed.");
calculateDosePopUp.hide();
populateDoseStatus();
//printLabelForAllTakeHome();
@@ -1130,13 +1127,10 @@
}
- CurrentState.getToaster().addItem(
- "Dispense Dose",
- "Dispense Dose successfully added.");
+ Util.showInfoMsg("Dispense Dose", "Dispense Dose successfully added.");
}
} else {
- CurrentState.getToaster().addItem("Dispense Dose",
- "Dispense Dose failed.");
+ Util.showErrorMsg("Dispense Dose", "Dispense Dose failed.");
calculateDosePopUp.hide();
populateDoseStatus();
//printLabelForAllTakeHome();
@@ -1245,14 +1239,11 @@
"Integer");
if (r != 0) {
- CurrentState.getToaster().addItem(
- "Dispense Dose",
- "Mistake successfully added.");
+ Util.showInfoMsg("Dispense Dose", "Mistake successfully added.");
}
populateDoseStatus();
} else {
- CurrentState.getToaster().addItem("Dispense Dose",
- "Mistake Dose failed.");
+ Util.showErrorMsg("Dispense Dose", "Mistake Dose failed.");
}
}
});
@@ -1799,9 +1790,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Dispense Dose", "Failed to retrieve patient information.");
}
@SuppressWarnings("unchecked")
@@ -1818,16 +1807,12 @@
}
} else {
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Dispense Dose", "Failed to retrieve patient information.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Dispense Dose", "Failed to retrieve patient information.");
}
} else {
// Set off async method to get information
@@ -1846,9 +1831,7 @@
public void onFailure(Throwable t) {
GWT.log("FAILURE: ", t);
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Dispense Dose", "Failed to retrieve patient information.");
}
});
}
@@ -3270,8 +3253,7 @@
Integer r = (Integer) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Integer");
- CurrentState.getToaster().addItem("Bottle",
- numberOfBottlesBeingReturned.getText()+" bottles successfully returned ");
+ Util.showInfoMsg("Dispense Dose", numberOfBottlesBeingReturned.getText()+" bottles successfully returned ");
getTakenHomeBottlesCount();
} else {
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MainScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MainScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MainScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -554,10 +554,10 @@
public void initMainScreen() {
initNavigations();
- String theme = CurrentState.getUserConfig("Theme").toString()
- .replaceAll("\"", "");
- CurrentState.CUR_THEME = theme;
+ CurrentState.CUR_THEME = CurrentState.getUserConfig(AppConstants.SYSTEM_THEME,"String").toString();
Util.updateStyleSheets(CurrentState.CUR_THEME, CurrentState.LAST_THEME);
+ CurrentState.SYSTEM_NOTIFY_TYPE = CurrentState.getUserConfig(AppConstants.SYSTEM_NOTIFICATION,"String").toString();
+
}
public void initNavigations() {
@@ -1191,8 +1191,7 @@
public void onResponseReceived(Request request,
Response response) {
if (200 == response.getStatusCode()) {
- String userName = response.getText().replaceAll(
- "\"", "");
+ String userName = (String)JsonUtil.shoehornJson(response.getText(),"String");
loginUserInfo.setText(userName.trim());
CurrentState.assignDefaultUser(userName);
}
@@ -1278,9 +1277,7 @@
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("MainScreen",
- "Could not determine provider information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MainScreen", "Could not determine provider information.");
}
} else {
// TODO: GWT-RPC support for this function
@@ -1306,9 +1303,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("MainScreen",
- "Could not determine Facility information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MainScreen", "Could not determine Facility information.");
}
public void onResponseReceived(Request request,
@@ -1326,8 +1321,7 @@
+ data.get("facility"));
CurrentState.assignDefaultFacility(Integer
.parseInt(data.get("id")));
- setFacility(data.get("facility").replaceAll(
- "\"", ""));
+ setFacility(data.get("facility"));
} else {
JsonUtil
.debug("MainScreen.populateDefaultProvider: found error");
@@ -1339,9 +1333,7 @@
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("MainScreen",
- "Could not determine facility information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MainScreen", "Could not determine Facility information.");
}
} else {
// TODO: GWT-RPC support for this function
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MedicationInventoryScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MedicationInventoryScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MedicationInventoryScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -476,12 +476,11 @@
retLotRecNo();
if (r != 0) {
+ Util.showInfoMsg("Lot Management", "Lot Management successfully added..");
- CurrentState.getToaster().addItem("Lot Management","Lot Management successfully added.");
-
}
} else {
- CurrentState.getToaster().addItem("Lot Management","Adding Lot Management failed.");
+ Util.showErrorMsg("Lot Management", "Adding Lot Management failed.");
}
}
@@ -836,11 +835,11 @@
// addressContainer.setPatient(r);
// addressContainer.commitChanges();
// searchAndSpawnPatientScreen();
- CurrentState.getToaster().addItem("Bulk Medication Inventory","Bulk Medication Inventory successfully added.");
+ Util.showInfoMsg("Lot Management","Bulk Medication Inventory successfully added.");
clearBulkMethodInventroyForm();
}
} else {
- CurrentState.getToaster().addItem("Bulk Medication Inventory","Adding Bulk Medication Inventory failed.");
+ Util.showErrorMsg("Lot Management","Adding Bulk Medication Inventory failed.");
}
}
});
@@ -1195,7 +1194,7 @@
lotInfoPopUp.hide();
retLotRecNo();
populateLotMagt();
- CurrentState.getToaster().addItem("Lot Receive","Lot successfully received.");
+ Util.showInfoMsg("Lot Receive","Lot successfully received.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingComposeScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingComposeScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingComposeScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -228,8 +228,7 @@
if (Util.getProgramMode() == ProgramMode.STUBBED) {
CurrentState.statusBarRemove(className);
- CurrentState.getToaster().addItem(className, "Sent message.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Message Sent.");
} else if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String[] params = { JsonUtil.jsonify(data) };
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST,
@@ -239,9 +238,7 @@
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
CurrentState.statusBarRemove(className);
- CurrentState.getToaster().addItem(className,
- "Failed to send message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to send message.");
}
public void onResponseReceived(Request request,
@@ -252,8 +249,7 @@
"String[]");
if (r != null) {
CurrentState.statusBarRemove(className);
- CurrentState.getToaster().addItem(className,
- "Sent message.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Message Sent.");
if (!sendAnother) {
if(parentScreen != null){
parentScreen.populate("");
@@ -270,22 +266,18 @@
}
} else {
CurrentState.statusBarRemove(className);
- CurrentState.getToaster().addItem(className,
- "Failed to send message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to send message.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(className,
- "Failed to send message.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to send message.");
}
} else {
getProxy().Send(data, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
CurrentState.statusBarRemove(className);
- CurrentState.getToaster().addItem(className,
- "Sent message.", Toaster.TOASTER_INFO);
+ Util.showErrorMsg(className, "Failed to send message.");
if (!sendAnother && parentScreen != null) {
parentScreen.populate("");
getThisObject().closeScreen();
@@ -294,8 +286,7 @@
public void onFailure(Throwable t) {
CurrentState.statusBarRemove(className);
- CurrentState.getToaster().addItem(className,
- "Failed to send message.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to send message.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/MessagingScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -497,8 +497,7 @@
protected void deleteMessage(Integer messageId) {
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem("MessagingScreen",
- "Deleted message.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("MessagingScreen", "Deleted message.");
populate("");
} else if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String[] params = { JsonUtil.jsonify(messageId) };
@@ -508,9 +507,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("MessagingScreen",
- "Failed to delete message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MessagingScreen", "Failed to delete message.");
}
public void onResponseReceived(Request request,
@@ -521,17 +518,11 @@
JSONParser.parse(response.getText()),
"Boolean");
if (r != null) {
- CurrentState.getToaster().addItem(
- "MessagingScreen",
- "Deleted message.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("MessagingScreen", "Deleted message.");
// populate(tag);
}
} else {
- CurrentState.getToaster().addItem(
- "MessagingScreen",
- "Failed to delete message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MessagingScreen", "Failed to delete message.");
}
}
}
@@ -545,25 +536,20 @@
service = (MessagesAsync) Util
.getProxy("org.freemedsoftware.gwt.client.Api.Messages");
} catch (Exception e) {
- CurrentState.getToaster().addItem("MessagingScreen",
- "Failed to delete message.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MessagingScreen", "Failed to delete message.");
}
service.Remove(messageId, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean data) {
if (data) {
- CurrentState.getToaster().addItem("MessagingScreen",
- "Deleted message.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("MessagingScreen", "Deleted message.");
populate("");
} else {
- CurrentState.getToaster().addItem("MessagingScreen",
- "Failed to delete message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MessagingScreen", "Failed to delete message.");
}
}
public void onFailure(Throwable t) {
- CurrentState.getToaster().addItem("MessagingScreen",
- "Failed to delete message.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("MessagingScreen", "Failed to delete message.");
}
});
}
@@ -682,8 +668,7 @@
public void onSystemEvent(SystemEvent e) {
if (e.getSourceModule() == "messages") {
populate(messageTagSelect.getWidgetValue());
- CurrentState.getToaster().addItem("Messages",
- "You have new messages.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("MessagingScreen", "You have new messages.");
}
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientForm.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientForm.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientForm.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -652,9 +652,7 @@
if (Util.getProgramMode() == ProgramMode.STUBBED) {
submitButton.setEnabled(true);
- CurrentState.getToaster().addItem("Patient",
- "Updated patient information.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientForm", "Updated patient information.");
addressContainer.setOnCompletion(new Command() {
public void execute() {
closeScreen();
@@ -882,8 +880,7 @@
} else {
// Form validation failed, allow user to continue
submitButton.setEnabled(true);
- CurrentState.getToaster().addItem("PatientForm",
- "Form validation failed");
+ Util.showErrorMsg("PatientForm", "Form validation failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -432,9 +432,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Patientscreen", "Failed to retrieve patient information.");
}
@SuppressWarnings("unchecked")
@@ -449,16 +447,12 @@
populatePatientInformation(r);
}
} else {
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Patientscreen", "Failed to retrieve patient information.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Patientscreen", "Failed to retrieve patient information.");
}
} else {
// Set off async method to get information
@@ -477,9 +471,7 @@
public void onFailure(Throwable t) {
GWT.log("FAILURE: ", t);
- CurrentState.getToaster().addItem("Patient",
- "Failed to retrieve patient information.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Patientscreen", "Failed to retrieve patient information.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientsGroupScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientsGroupScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PatientsGroupScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -249,9 +249,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("CalendarGroup Screen",
- "Failed to add entry.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to add entry.");
}
public void onResponseReceived(Request request,
@@ -282,9 +280,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("CalendarGroup Screen",
- "Failed to add entry.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to add entry.");
}
public void onResponseReceived(Request request,
@@ -298,14 +294,10 @@
List<String> params = new ArrayList<String>();
params.add(r+"");
Util.generateReportToPrinter("Treatment Group Note", "pdf", params);
- CurrentState.getToaster().addItem("CalendarGroup Screen",
- "Note added successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("CalendarGroupScreen", "Note added successfully.");
}
}else{
- CurrentState.getToaster().addItem("CalendarGroup Screen",
- "Failed to add note.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to Note.");
}
}
}
@@ -1137,9 +1129,7 @@
if (r != null) {
clearForm();
populate();
- CurrentState.getToaster().addItem(
- "Calgroup Form",
- "Entry successfully added.");
+ Util.showInfoMsg("CalendarGroupScreen", "Entry successfully added.");
}else{
r=(Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
@@ -1147,17 +1137,14 @@
if(r==1){
clearForm();
populate();
- CurrentState.getToaster().addItem(
- "Callin Form",
- "Entry successfully modified.");
+ Util.showInfoMsg("CalendarGroupScreen", "Entry successfully modified.");
btnAdd.setText("Add");
}else{
}
}
} else {
- CurrentState.getToaster().addItem(
- "Calgroup Form", "Group Form failed.");
+ Util.showErrorMsg("CalendarGroupScreen", "Group Form failed.");
}
}
});
@@ -1258,9 +1245,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("CalendarGroup Screen",
- "Failed to delete entry.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to delete entry.");
}
public void onResponseReceived(Request request,
@@ -1271,16 +1256,11 @@
JSONParser.parse(response.getText()),
"Boolean");
if (r != null) {
- CurrentState.getToaster().addItem(
- "CalendarGroup Screen", "Entry deleted.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("CalendarGroupScreen", "Entry deleted.");
// populate(tag);
}
} else {
- CurrentState.getToaster().addItem(
- "CalendarGroup Screen",
- "Failed to delete entry.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to delete entry.");
}
}
}
@@ -1400,9 +1380,7 @@
@Override
public void onClick(ClickEvent arg0) {
if(!CurrentState.canBookAppoinment(start.getValue(date.getValue()), end.getValue(date.getValue()))){
- CurrentState.getToaster().addItem("Scheduler",
- "Can not book appointment in between("+CurrentState.BREAK_HOUR+":00 -"+(CurrentState.BREAK_HOUR+1)+":00) !",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Can not book appointment in between("+CurrentState.BREAK_HOUR+":00 -"+(CurrentState.BREAK_HOUR+1)+":00) !");
return;
}
@@ -1493,16 +1471,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to get scheduler items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to get scheduler items.");
}
} else {
// GWT-RPC
@@ -1533,21 +1507,14 @@
Response response) {
if (200 == response.getStatusCode()) {
hide();
- CurrentState.getToaster().addItem(
- "CallinScheduler",
- "Appointment saved successfully.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("CalendarGroupScreen", "Appointment saved successfully.");
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to save appointment.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to save appointment.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to save appointment.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CalendarGroupScreen", "Failed to save appointment.");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PreferencesScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PreferencesScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/PreferencesScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -38,8 +38,6 @@
import org.freemedsoftware.gwt.client.Util.ProgramMode;
import org.freemedsoftware.gwt.client.i18n.AppConstants;
import org.freemedsoftware.gwt.client.widget.CustomListBox;
-import org.freemedsoftware.gwt.client.widget.CustomMulltiSelectListBox;
-import org.freemedsoftware.gwt.client.widget.Toaster;
import com.google.gwt.core.client.GWT;
import com.google.gwt.event.dom.client.ChangeEvent;
@@ -59,7 +57,6 @@
import com.google.gwt.user.client.ui.FlexTable;
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Label;
-import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.PasswordTextBox;
import com.google.gwt.user.client.ui.TabPanel;
import com.google.gwt.user.client.ui.VerticalPanel;
@@ -84,9 +81,14 @@
protected boolean isNavigatioMenuChanged = false;
+ protected CustomListBox themesList = null;
+
protected CustomListBox printersList = null;
protected CustomListBox providerGroupList =null;
+
+ protected CustomListBox systemNotificationSettingsList =null;
+
private static List<PreferencesScreen> preferencesScreenList = null;
// Creates only desired amount of instances if we follow this pattern
@@ -131,22 +133,28 @@
commitChangesButton.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
+ ////////////////Handling UI////////////////////////
if (isThemeChanged)
- CurrentState.setUserConfig("Theme", CurrentState.CUR_THEME);
+ CurrentState.setUserConfig(AppConstants.SYSTEM_THEME, CurrentState.CUR_THEME);
CurrentState.setUserConfig("defaultPrinter", printersList.getStoredValue());
CurrentState.setUserConfig("providerGroup", providerGroupList.getStoredValue());
+ CurrentState.setUserConfig(AppConstants.SYSTEM_NOTIFICATION, systemNotificationSettingsList.getStoredValue());
+ CurrentState.SYSTEM_NOTIFY_TYPE = systemNotificationSettingsList.getStoredValue();
try{
CurrentState.defaultProviderGroup=new Integer(providerGroupList.getStoredValue());
}
catch(Exception e){
}
+ ////////////////End Handling UI////////////////////////
+
+ ////////////////Handling Navigation////////////////////////
if (isNavigatioMenuChanged)
CurrentState.setUserConfig("LeftNavigationMenu",
CurrentState.getLeftNavigationOptions());
CurrentState.getMainScreen().initNavigations();
- CurrentState.getToaster().addItem("Preferences Screen.",
- "Preferences saved!!!", Toaster.TOASTER_INFO);
+ ////////////////End Handling Navigation////////////////////////
+ Util.showInfoMsg("PreferencesScreen", "Preferences saved!!!");
if (currentPassword.getText().length() > 0
|| newPassword.getText().length() > 0
|| newPassword.getText().length() > 0)
@@ -156,9 +164,22 @@
}
});
- // populate();
+ setDefaultPreferences();
+ loadPrefererences();
}
+ public void setDefaultPreferences(){
+ if(CurrentState.getUserConfig(AppConstants.SYSTEM_THEME)==null)
+ CurrentState.setUserConfig(AppConstants.SYSTEM_THEME, CurrentState.CUR_THEME);
+ if(CurrentState.getUserConfig(AppConstants.SYSTEM_NOTIFICATION)==null)
+ CurrentState.setUserConfig(AppConstants.SYSTEM_NOTIFICATION, systemNotificationSettingsList.getStoredValue());
+ }
+
+ public void loadPrefererences(){
+ themesList.setWidgetValue(CurrentState.getUserConfig(AppConstants.SYSTEM_THEME,"String").toString());
+ systemNotificationSettingsList.setWidgetValue(CurrentState.getUserConfig(AppConstants.SYSTEM_NOTIFICATION,"String").toString());
+ }
+
public void refreshPreferences() {
JsonUtil.debug("PreferencesScreen:refreshPreferences - start");
// refreshing Navigations
@@ -193,13 +214,10 @@
public void onResponseReceived(Request request,
Response response) {
if (200 == response.getStatusCode()) {
- validateUser(response.getText(),
+ validateUser((String)JsonUtil.shoehornJson(response.getText(),"String"),
currentPassword.getText());
} else
- CurrentState.getToaster().addItem(
- "change password failed.",
- "password change failed!!!",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PreferencesScreen", "password change failed!!!");
}
});
} catch (RequestException e) {
@@ -215,7 +233,6 @@
}
public void validateUser(String username, String password) {
- username = username.replaceAll("\"", "");
String[] params = { username, password };
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST, URL
.encode(Util.getJsonRequest(
@@ -232,10 +249,7 @@
if (response.getText().compareToIgnoreCase("true") == 0) {
changePassword();
} else
- CurrentState.getToaster().addItem(
- "invalid password changed.",
- "invalid password!!!",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PreferencesScreen", "invalid password!!!");
}
}
});
@@ -260,19 +274,13 @@
Response response) {
if (Util.checkValidSessionResponse(response.getText())) {
if (200 == response.getStatusCode()) {
- CurrentState.getToaster().addItem(
- "password changed.",
- "password changed successfully!!!",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PreferencesScreen", "password changed successfully!!!");
currentPassword.setText("");
newPassword.setText("");
confirmNewPassword.setText("");
Util.closeTab(getPreferencesScreen());
} else
- CurrentState.getToaster()
- .addItem("password changed failed.",
- "password failed!!!",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("FaxSubsystem", "password change failed!!!");
}
}
});
@@ -289,18 +297,20 @@
*/
protected void createTabs() {
- // Preparing UI tab elements
+ //////////////////////////////////// Preparing UI Tab Elements //////////////////////////////////
final FlexTable uiFlexTable = new FlexTable();
uiFlexTable.addStyleName("cw-FlexTable");
- uiFlexTable.setHTML(0, 0, "Select theme to apply");
+ int row = 0;
- final ListBox themesList = new ListBox();
+ uiFlexTable.setHTML(row, 0, "Select theme to apply");
+
+ themesList = new CustomListBox();
themesList.addItem("chrome");
themesList.addItem("standard");
themesList.addItem("dark");
- uiFlexTable.setWidget(0, 1, themesList);
+ uiFlexTable.setWidget(row, 1, themesList);
themesList.addChangeHandler(new ChangeHandler() {
public void onChange(ChangeEvent evt) {
@@ -312,18 +322,33 @@
}
});
+ row++;
+
providerGroupList = new CustomListBox();
populateProviderGroupList();
Label provGroupLabel=new Label("Defaul Provider Group :");
- uiFlexTable.setWidget(1, 0, provGroupLabel);
- uiFlexTable.setWidget(1, 1, providerGroupList);
+ uiFlexTable.setWidget(row, 0, provGroupLabel);
+ uiFlexTable.setWidget(row, 1, providerGroupList);
+ row++;
+
+ Label notificationLabel=new Label("Show System Notifications :");
+ uiFlexTable.setWidget(row, 0, notificationLabel);
+ systemNotificationSettingsList = new CustomListBox();
+ systemNotificationSettingsList.addItem(AppConstants.SYSTEM_NOTIFY_NONE);
+ systemNotificationSettingsList.addItem(AppConstants.SYSTEM_NOTIFY_ALL);
+ systemNotificationSettingsList.addItem(AppConstants.SYSTEM_NOTIFY_INFO);
+ systemNotificationSettingsList.addItem(AppConstants.SYSTEM_NOTIFY_ERROR);
+ uiFlexTable.setWidget(row, 1, systemNotificationSettingsList);
+
VerticalPanel uiVerticalPanel = new VerticalPanel();
uiVerticalPanel.add(uiFlexTable);
// Adding theme tab
tabPanel.add(uiVerticalPanel, "UI");
-
- // preparing password tab
+ ////////////////////////////////////End Preparing UI Tab Elements //////////////////////////////////
+
+
+ //////////////////////////////////// Preparing Password Tab //////////////////////////////////
final FlexTable passwordsFlexTable = new FlexTable();
passwordsFlexTable.addStyleName("cw-FlexTable");
@@ -343,7 +368,9 @@
passwordsVerticalPanel.add(passwordsFlexTable);
// Adding password tab
tabPanel.add(passwordsVerticalPanel, "Password");
+ //////////////////////////////////// End Preparing Password Tab //////////////////////////////////
+ //////////////////////////////////// Preparing Navigations Tab //////////////////////////////////
navigationsVerticalPanel = new VerticalPanel();
Label navLabel = new Label("Show following items for navigation.");
navLabel.setStyleName("label");
@@ -352,7 +379,9 @@
navigationsVerticalPanel.add(navigationsFlexTable);
// Adding password tab
tabPanel.add(navigationsVerticalPanel, "Navigations");
-
+ //////////////////////////////////// End Preparing Navigations Tab //////////////////////////////////
+
+ //////////////////////////////////// Preparing Printer Tab //////////////////////////////////
final FlexTable printersFlexTable = new FlexTable();
printersFlexTable.addStyleName("cw-FlexTable");
@@ -388,7 +417,7 @@
printersVerticalPanel.add(printersFlexTable);
// Adding theme tab
tabPanel.add(printersVerticalPanel, "Printers");
-
+ ////////////////////////////////////End Preparing Printer Tab //////////////////////////////////
}
protected void createNavigatonOptions() {
@@ -476,7 +505,7 @@
Set<String> keys = result.keySet();
Iterator<String> iter = keys.iterator();
-
+ providerGroupList.addItem("","" );
while (iter.hasNext()) {
final String key = (String) iter.next();
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataManagementScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataManagementScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataManagementScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -254,10 +254,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(
- "SupportDataManagementScreen",
- "Could not load support data records.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SupportDataScreen", "Could not load list of support data modules.");
}
public void onResponseReceived(Request request,
@@ -270,10 +267,7 @@
"HashMap<String,String>[]");
sortableTable.loadData(r);
} else {
- CurrentState.getToaster().addItem(
- "SupportDataManagementScreen",
- "Could not load support data records.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SupportDataScreen", "Could not load list of support data modules.");
}
}
}
@@ -298,10 +292,7 @@
}
public void onFailure(Throwable t) {
- CurrentState.getToaster().addItem(
- "SupportDataManagementScreen",
- "Could not load support data records.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SupportDataScreen", "Could not load list of support data modules.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/SupportDataScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -133,9 +133,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("SupportDataScreen",
- "Could not load list of support data modules.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SupportDataScreen", "Could not load list of support data modules.");
}
public void onResponseReceived(Request request,
@@ -148,12 +146,7 @@
"HashMap<String,String>[]");
sortableTable.loadData(r);
} else {
- CurrentState
- .getToaster()
- .addItem(
- "SupportDataScreen",
- "Could not load list of support data modules.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SupportDataScreen", "Could not load list of support data modules.");
}
}
}
@@ -176,12 +169,7 @@
}
public void onFailure(Throwable t) {
- CurrentState
- .getToaster()
- .addItem(
- "SupportDataScreen",
- "Could not load list of support data modules.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SupportDataScreen", "Could not load list of support data modules.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/UserManagementScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/UserManagementScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/UserManagementScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -294,9 +294,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(className,
- "Failed to add user.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("UserManagementScreen", "Failed to add user.");
}
public void onResponseReceived(Request request,
@@ -307,10 +305,7 @@
.parse(response.getText()),
"Integer");
if (r != null) {
- CurrentState.getToaster().addItem(
- className,
- "Successfully Added User.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("UserManagementScreen", "Successfully Added User.");
retrieveAllUsers();
clearForm();
}else{
@@ -319,25 +314,18 @@
.parse(response.getText()),
"Boolean");
if(b){
- CurrentState.getToaster().addItem(
- className,
- "Successfully Modified User.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("UserManagementScreen", "Successfully Modified User.");
retrieveAllUsers();
clearForm();
}
}
} else {
- CurrentState.getToaster().addItem(
- className, "Failed to add user.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("UserManagementScreen", "Failed to add user.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(className,
- "Failed to send message.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("UserManagementScreen", "Failed to add user.");
}
} else {
// TODO: Create GWT-RPC stuff here
@@ -361,9 +349,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(className,
- "Failed to delete user.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("UserManagementScreen", "Failed to delete user.");
}
public void onResponseReceived(Request request,
@@ -374,24 +360,17 @@
.parse(response.getText()),
"Boolean");
if(flag){
- CurrentState.getToaster().addItem(
- className,
- "Successfully deleted User.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("UserManagementScreen", "Successfully deleted User.");
retrieveAllUsers();
clearForm();
}
} else {
- CurrentState.getToaster().addItem(
- className, "Failed to delete user.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("UserManagementScreen", "Failed to delete user.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(className,
- "Failed to delete user.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("UserManagementScreen", "Failed to delete user.");
}
} else {
// TODO: Create GWT-RPC stuff here
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/AllergyEntryScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/AllergyEntryScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/AllergyEntryScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -141,8 +141,7 @@
data.put("severity", severityTextBox.getText());
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem(className, "Added Allergy.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Allergy Added .");
} else if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String[] params = { JsonUtil.jsonify(data) };
RequestBuilder builder = new RequestBuilder(RequestBuilder.POST,
@@ -153,9 +152,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster()
- .addItem(className, "Failed to add Allergy.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to add Allergy.");
}
public void onResponseReceived(Request request,
@@ -165,20 +162,16 @@
JSONParser.parse(response.getText()),
"Integer");
if (r != null) {
- CurrentState.getToaster().addItem(className,
- "Added Allergy.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg(className, "Allergy added.");
patientScreen.getSummaryScreen().populateClinicalInformation();
}
} else {
- CurrentState.getToaster().addItem(className,
- "Failed to add Allergy",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to add Allergy.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem(className,
- "Failed to add Allergy.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg(className, "Failed to add Allergy.");
}
} else {
// TODO: GWT-RPC Stuff
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ClinicalAssessmentNotes.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ClinicalAssessmentNotes.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ClinicalAssessmentNotes.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -478,8 +478,7 @@
tabPanel.selectTab(1);
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -538,16 +537,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Clinical Assessment Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Clinical Assessment Notes items.");
}
} else {
// GWT-RPC
@@ -593,16 +588,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Clinical Assessment Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Clinical Assessment Notes items.");
}
} else {
// GWT-RPC
@@ -635,21 +626,16 @@
"Integer");
if (r != null) {
populateAvailableData();
- CurrentState.getToaster().addItem(
- "ClinicalAssessmentNotes",
- "Entry successfully added.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully added.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
if(b!=null)
- CurrentState.getToaster().addItem(
- "ClinicalAssessmentNotes",
- "Entry successfully modified.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully modified.");
}
} else {
- CurrentState.getToaster().addItem(
- "ClinicalAssessmentNotes", "Clinical Assessment Notes Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Clinical Assessment Notes Form failed.");
}
}
});
@@ -701,16 +687,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Clinical Assessment Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Clinical Assessment Notes items.");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/CounselorIntakeEntry.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/CounselorIntakeEntry.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/CounselorIntakeEntry.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -5040,16 +5040,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
} else {
// GWT-RPC
@@ -5096,16 +5092,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentInitialIntake",
- "Failed to get Treatment Initial Intake items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Treatment Initial Intake items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentInitialIntake",
- "Failed to get Treatment Initial Intake items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Treatment Initial Intake items.");
}
} else {
// GWT-RPC
@@ -5151,23 +5143,18 @@
else if(moduleName.equalsIgnoreCase(TREATMENT_COUNSELOR_INTAKE_D6))
dimension6Id = r;
checkAndSaveTreatmentCounselorIntakeId();
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm",
- "Entry successfully added.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully added.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
if(b!=null && b.booleanValue()){
checkAndSaveTreatmentCounselorIntakeId();
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm",
- "Entry successfully modified.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully modified.");
}
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -5207,13 +5194,11 @@
if(b!=null && b.booleanValue()){
if(module.equalsIgnoreCase(moduleName)){
retrieveAndFillListData();
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake entry deleted.");
+ Util.showInfoMsg("CounselorIntakeForm", "Counselor Intake entry deleted.");
}
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -5266,16 +5251,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
} else {
// GWT-RPC
@@ -5317,12 +5298,9 @@
data = Util.populateHashMap(containerDimension1Point3FormFields);
data.put("id", dimension1Id.toString());
saveFormData(TREATMENT_COUNSELOR_INTAKE_D1,data,true);
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm",
- "Entry successfully added.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully added.");
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -5375,16 +5353,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
} else {
// GWT-RPC
@@ -5427,12 +5401,9 @@
data = Util.populateHashMap(containerDimension3MHFormFields);
data.put("id", dimension3Id.toString());
saveFormData(TREATMENT_COUNSELOR_INTAKE_D3,data,true);
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm",
- "Entry successfully added.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully added.");
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -5488,16 +5459,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
} else {
// GWT-RPC
@@ -5547,12 +5514,9 @@
data = Util.populateHashMap(containerDimension6MHFormFields);
data.put("id", dimension6Id.toString());
saveFormData(TREATMENT_COUNSELOR_INTAKE_D6,data,true);
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm",
- "Entry successfully added.");
+ Util.showInfoMsg("CounselorIntakeForm", "Entry successfully added.");
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -5610,16 +5574,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake Form items.");
}
} else {
// GWT-RPC
@@ -5679,8 +5639,7 @@
}
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("CounselorIntakeForm", "Counselor Intake Form failed.");
}
}
});
@@ -5731,16 +5690,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake items.");
}
} else {
// GWT-RPC
@@ -5793,16 +5748,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("CounselorIntakeForm",
- "Failed to get Counselor Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("CounselorIntakeForm", "Failed to get Counselor Intake items.");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DoseHold.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DoseHold.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DoseHold.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -199,11 +199,11 @@
if (r != 0) {
populateDoseHold();
- CurrentState.getToaster().addItem("Dose Hold","Dose Hold successfully added.");
+ Util.showInfoMsg("Dose Hold", "Dose Hold successfully added.");
clearDoseHoldForm();
}
} else {
- CurrentState.getToaster().addItem("Dose Hold","Adding Dose Hold failed.");
+ Util.showErrorMsg("Dose Hold", "Adding Dose Hold failed.");
}
}
});
@@ -360,7 +360,7 @@
flexTable.setWidget(10, 0, hp1);
hasButtonPannel = true;
populateDoseHold();
- CurrentState.getToaster().addItem("Dose Hold ","Dose Hold successfully Modified.");
+ Util.showInfoMsg("Dose Hold", "Dose Hold successfully Modified.");
clearDoseHoldForm();
}
else
@@ -368,7 +368,7 @@
Window.alert(res);
}
} else {
- CurrentState.getToaster().addItem("Dose Hold","Dose Hold modified failed.");
+ Util.showErrorMsg("Dose Hold", "Dose Hold modified failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosePlan.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosePlan.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosePlan.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -838,8 +838,8 @@
saveDosePlan();
} else {
- // CurrentState.getToaster().addItem("Dose Plan","Adding Dose Plan failed.");
+
}
}
});
@@ -990,14 +990,12 @@
"Integer");
if (r != 0) {
- CurrentState.getToaster().addItem("Dose Plan",
- "Dose Plan successfully added.");
+ Util.showInfoMsg("Dose Plan", "Dose Plan successfully added.");
populateDosePlan();
resetForm();
}
} else {
- CurrentState.getToaster().addItem("Dose Plan",
- "Adding Dose Plan failed.");
+ Util.showErrorMsg("Dose Plan", "Adding Dose Plan failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosingMessage.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosingMessage.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/DosingMessage.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -217,10 +217,10 @@
flexTable.setWidget(4, 0, hp1);
hasButtonPannel = true;
populateDosingMessage();
- CurrentState.getToaster().addItem("Dosing Message","Dosing Message successfully Modified.");
+ Util.showInfoMsg("Dosing Message", "Dosing Message successfully Modified.");
clearDosingMessageForm();
} else {
- CurrentState.getToaster().addItem("Dosing Message","Dosing Message modified failed.");
+ Util.showErrorMsg("Dosing Message", "Dosing Message modified failed.");
}
}
});
@@ -265,11 +265,11 @@
if (r != 0) {
populateDosingMessage();
- CurrentState.getToaster().addItem("Dosing Message","Dosing Message successfully added.");
+ Util.showInfoMsg("Dosing Message", "Dosing Message successfully added.");
clearDosingMessageForm();
}
} else {
- CurrentState.getToaster().addItem("Dosing Message","Adding Dosing Message failed.");
+ Util.showErrorMsg("Dosing Message", "Adding Dosing Message failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/EncounterScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/EncounterScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/EncounterScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -340,9 +340,7 @@
com.google.gwt.http.client.Request request,
Throwable ex) {
GWT.log("Exception", ex);
- CurrentState.getToaster().addItem("SuperbillTemplate",
- "Failed to load template.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SuperbillTemplate", "Failed to load template.");
}
@SuppressWarnings("unchecked")
@@ -360,17 +358,13 @@
populateSuperbill(result);
}
} else {
- CurrentState.getToaster().addItem(
- "SuperbillTemplate",
- "Failed to load template.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SuperbillTemplate", "Failed to load template.");
}
}
});
} catch (RequestException e) {
GWT.log("Exception", e);
- CurrentState.getToaster().addItem("SuperbillTemplate",
- "Failed to load template.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SuperbillTemplate", "Failed to load template.");
}
} else {
try {
@@ -388,17 +382,13 @@
}
public void onFailure(Throwable caught) {
- CurrentState.getToaster().addItem(
- "SuperbillTemplate",
- "Failed to load template.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SuperbillTemplate", "Failed to load template.");
}
});
} catch (Exception e) {
e.printStackTrace();
- CurrentState.getToaster().addItem("SuperbillTemplate",
- "Failed to load template.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("SuperbillTemplate", "Failed to load template.");
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntakeInitialContactEntry.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntakeInitialContactEntry.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntakeInitialContactEntry.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -2031,7 +2031,7 @@
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
JsonUtil
- .debug("Error on retrieving AppointmentTemplate");
+ .debug("Error on retrieving data");
}
@SuppressWarnings("unchecked")
@@ -2059,16 +2059,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to get Initial Intake items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to get Initial Intake items.");
}
} else {
// GWT-RPC
@@ -2118,16 +2114,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to delete Initial Intake items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to delete Initial Intake items.");
}
} else {
// GWT-RPC
@@ -2167,29 +2159,17 @@
}else if(moduleName.equalsIgnoreCase(PATIENT_SUBSTANCE)){
patientSubstanceId = r;
}
- /*
- CurrentState.getToaster().addItem(
- "InitialIntakeForm",
- "Entry successfully added.");
- */
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
- /*
- if(b!=null)
- CurrentState.getToaster().addItem(
- "InitialIntakeForm",
- "Entry successfully modified.");
- */
}
if(substanceAbuseIntakeId!=null && mentalHealthDiagnosesId!=null && patientSubstanceId!=null && !requestAlreadySent){
requestAlreadySent = true;
saveTreatmentIntakeInitialContactIds();
}
} else {
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial Intake Form failed.");
+ Util.showErrorMsg("InitialIntakeForm", "Initial Intake Form failed.");
}
}
});
@@ -2228,13 +2208,11 @@
if(b!=null && b.booleanValue()){
if(module.equalsIgnoreCase(moduleName)){
retrieveAndFillListData();
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial intake entry deleted.");
+ Util.showInfoMsg("InitialIntakeForm", "Initial intake entry deleted.");
}
}
} else {
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial Intake Form failed.");
+ Util.showErrorMsg("InitialIntakeForm", "Initial Intake Form failed.");
}
}
});
@@ -2288,16 +2266,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("InitialIntakeForm",
- "Failed to get Initial Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to get Initial Intake Form items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("InitialIntakeForm",
- "Failed to get Initial Intake Form items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to get Initial Intake Form items.");
}
} else {
// GWT-RPC
@@ -2346,8 +2320,7 @@
tabPanelMain.selectTab(1);
retrieveAndFillListData();
populateDefaultData();
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial Intake Form Saved.");
+ Util.showInfoMsg("InitialIntakeForm", "Initial Intake Form Saved.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
@@ -2358,8 +2331,7 @@
resetForm();
populateDefaultData();
tabPanelMain.selectTab(1);
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial Intake Form Modified.");
+ Util.showInfoMsg("InitialIntakeForm", "Initial Intake Form Modified.");
}
}
}else{
@@ -2370,12 +2342,10 @@
wSubmit.setText("Modify");
wDelete.setVisible(true);
JsonUtil.debug("autoSaved");
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial Intake Form Auto Saved.");
+ Util.showInfoMsg("InitialIntakeForm", "Initial Intake Form Auto Saved.");
}
} else {
- CurrentState.getToaster().addItem(
- "InitialIntakeForm", "Initial Intake Form failed.");
+ Util.showInfoMsg("InitialIntakeForm", "Initial Intake Form failed.");
}
}
});
@@ -2426,16 +2396,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to retireve Initial Intake data.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("InitialIntakeForm", "Failed to retireve Initial Intake data.");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntensifiedTreatmentNotes.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntensifiedTreatmentNotes.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/IntensifiedTreatmentNotes.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -693,8 +693,7 @@
tabPanel.selectTab(1);
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("IntensifiedTreatmentForm", "Failed to delete entry.");
}
}
});
@@ -743,16 +742,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("IntensifiedTreatmentForm", "Failed to get Intensified Treatment Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("IntensifiedTreatmentForm", "Failed to get Intensified Treatment Notes items.");
}
} else {
// GWT-RPC
@@ -798,16 +793,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("IntensifiedTreatmentForm", "Failed to get Intensified Treatment Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("ClinicalAssessmentNotes",
- "Failed to get Clinical Assessment Notes items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("IntensifiedTreatmentForm", "Failed to get Intensified Treatment Notes items.");
}
} else {
// GWT-RPC
@@ -840,21 +831,16 @@
"Integer");
if (r != null) {
populateAvailableData();
- CurrentState.getToaster().addItem(
- "ClinicalAssessmentNotes",
- "Entry successfully added.");
+ Util.showInfoMsg("IntensifiedTreatmentForm", "Entry successfully added.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
if(b!=null)
- CurrentState.getToaster().addItem(
- "ClinicalAssessmentNotes",
- "Entry successfully modified.");
+ Util.showInfoMsg("IntensifiedTreatmentForm", "Entry successfully modified.");
}
} else {
- CurrentState.getToaster().addItem(
- "ClinicalAssessmentNotes", "Clinical Assessment Notes Form failed.");
+ Util.showErrorMsg("IntensifiedTreatmentForm", "Intensified Treatment Form failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/PrescriptionsScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/PrescriptionsScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/PrescriptionsScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -194,9 +194,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("PrescriptionScreen",
- "Failed to add Prescription",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PrescriptionScreen", "Failed to add Prescription.");
}
@SuppressWarnings("unchecked")
@@ -210,26 +208,19 @@
"HashMap<String,String>");
if (r != null) {
// Successful
- CurrentState.getToaster().addItem(
- "PrescriptionScreen",
- "Successfully added prescription",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PrescriptionScreen", "Successfully added prescription.");
}
} else {
JsonUtil
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem(
- "PrescriptionScreen",
- "Failed to add Prescription",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PrescriptionScreen", "Failed to add Prescription");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("PrescriptionScreen",
- "Failed to add Prescription", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PrescriptionScreen", "Failed to add Prescription");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ProgressNoteEntry.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ProgressNoteEntry.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ProgressNoteEntry.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -157,9 +157,7 @@
if (wTemplate.getValue() != null && wTemplate.getValue() != 0) {
JsonUtil.debug("loading template " + wTemplate.getValue());
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem(
- "ProgressNotesTemplates", "Template loaded.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("ProgressNotesTemplates", "Template loaded.");
} else if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String[] params = { JsonUtil.jsonify(wTemplate
.getValue()) };
@@ -176,10 +174,7 @@
com.google.gwt.http.client.Request request,
Throwable ex) {
GWT.log("Exception", ex);
- CurrentState.getToaster().addItem(
- "ProgressNotesTemplates",
- "Failed to load template.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ProgressNotesTemplates", "Failed to load template.");
}
public void onResponseReceived(
@@ -194,10 +189,7 @@
"HashMap<String,String>");
if (result != null) {
loadTemplateData(result);
- CurrentState.getToaster().addItem(
- "ProgressNotesTemplates",
- "Loaded template.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("ProgressNotesTemplates", "Loaded template.");
}
} else {
Window.alert(response.toString());
@@ -206,10 +198,7 @@
});
} catch (RequestException e) {
GWT.log("Exception", e);
- CurrentState.getToaster().addItem(
- "ProgressNotesTemplates",
- "Failed to load template.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("ProgressNotesTemplates", "Failed to load template.");
}
} else {
// TODO: Make this work with GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ScheduleToxicologyScreen.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ScheduleToxicologyScreen.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/ScheduleToxicologyScreen.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -522,11 +522,9 @@
populateTestPlanTable();
tabPanelMain.selectTab(1);
reset();
- CurrentState.getToaster().addItem("Toxicology Screening ",
- "Toxicology screening plan successfully added.");
+ Util.showInfoMsg("Toxicology Screening", "Toxicology screening plan successfully added.");
} else {
- CurrentState.getToaster().addItem("Toxicology Screening ",
- "Toxicology screening plan failed.");
+ Util.showErrorMsg("Toxicology Screening", "Toxicology screening plan failed.");
//printLabelForAllTakeHome();
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentClinicalNotes.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentClinicalNotes.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentClinicalNotes.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -631,8 +631,7 @@
tabPanel.selectTab(1);
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("TreatmentClinicalNotes", "Failed to delete entry");
}
}
});
@@ -682,16 +681,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentClinicalNotes", "Failed to get Clinical Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentClinicalNotes", "Failed to get Clinical Notes items.");
}
} else {
// GWT-RPC
@@ -737,16 +732,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentClinicalNotes", "Failed to get Clinical Notes items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentClinicalNotes", "Failed to get Clinical Notes items.");
}
} else {
// GWT-RPC
@@ -779,23 +770,18 @@
"Integer");
if (r != null) {
populateAvailableData();
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote",
- "Entry successfully added.");
+ Util.showInfoMsg("TreatmentClinicalNotes", "Entry successfully added.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
if(b!=null){
populateAvailableData();
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote",
- "Entry successfully modified.");
+ Util.showInfoMsg("TreatmentClinicalNotes", "Entry successfully modified.");
}
}
} else {
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote", "Treatment Plan Note Form failed.");
+ Util.showErrorMsg("TreatmentClinicalNotes", "Treatment Plan Note Form failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentDischargeForm.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentDischargeForm.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentDischargeForm.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -900,8 +900,7 @@
tabPanel.selectTab(1);
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("TreatmentDischargeForm", "Failed to delete entry.");
}
}
});
@@ -951,16 +950,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentDischargeForm", "Failed to get Treatment Discharge items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentDischargeForm", "Failed to get Treatment Discharge items.");
}
} else {
// GWT-RPC
@@ -1006,16 +1001,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentDischargeForm", "Failed to get Treatment Discharge items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentDischargeForm", "Failed to get Treatment Discharge items.");
}
} else {
// GWT-RPC
@@ -1048,21 +1039,16 @@
"Integer");
if (r != null) {
populateAvailableData();
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote",
- "Entry successfully added.");
+ Util.showInfoMsg("TreatmentDischargeForm", "Entry successfully added.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
if(b!=null)
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote",
- "Entry successfully modified.");
+ Util.showInfoMsg("TreatmentDischargeForm", "Entry successfully modified.");
}
} else {
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote", "Treatment Plan Note Form failed.");
+ Util.showErrorMsg("TreatmentDischargeForm", "Treatment Discharge Form failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentNoteTemplate.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentNoteTemplate.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/patient/TreatmentNoteTemplate.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -434,8 +434,7 @@
tabPanel.selectTab(1);
}
} else {
- CurrentState.getToaster().addItem(
- "CounselorIntakeForm", "Counselor Intake Form failed.");
+ Util.showErrorMsg("TreatmentNoteTemplate", "Failed to delete entry.");
}
}
});
@@ -485,16 +484,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentNoteTemplate", "Failed to get Treatment Note Template items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentNoteTemplate", "Failed to get Treatment Note Template items.");
}
} else {
// GWT-RPC
@@ -540,16 +535,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentNoteTemplate", "Failed to get Treatment Note Template items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("TreatmentPlanNote",
- "Failed to get Treatment Plan Note items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("TreatmentNoteTemplate", "Failed to get Treatment Note Template items.");
}
} else {
// GWT-RPC
@@ -581,21 +572,16 @@
JSONParser.parse(response.getText()),
"Integer");
if (r != null) {
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote",
- "Entry successfully added.");
+ Util.showInfoMsg("TreatmentNoteTemplate", "Entry successfully added.");
}else{
Boolean b = (Boolean) JsonUtil.shoehornJson(
JSONParser.parse(response.getText()),
"Boolean");
if(b!=null)
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote",
- "Entry successfully modified.");
+ Util.showInfoMsg("TreatmentNoteTemplate", "Entry successfully modified.");
}
} else {
- CurrentState.getToaster().addItem(
- "TreatmentPlanNote", "Treatment Plan Note Form failed.");
+ Util.showErrorMsg("TreatmentNoteTemplate", "Entry Form failed.");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/EmrPrintDialog.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/EmrPrintDialog.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/EmrPrintDialog.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -179,16 +179,14 @@
printfaxButton.setEnabled(true);
return 1;
}
- CurrentState.getToaster()
- .addItem("FaxSubsystem", "Sending fax to " + f);
+ Util.showInfoMsg("FaxSubsystem", "Sending fax to " + f);
getProxy().PrintToFax(f, items, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean o) {
closeDialog();
}
public void onFailure(Throwable t) {
- CurrentState.getToaster().addItem("FaxSubsystemError",
- "Error faxing document.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("FaxSubsystemError", "Error faxing document.");
}
});
return 0;
@@ -201,16 +199,14 @@
printfaxButton.setEnabled(true);
return 1;
}
- CurrentState.getToaster().addItem("PrintSubsystem",
- "Sending document to printer.");
+ Util.showInfoMsg("PrintSubsystem", "Sending document to printer.");
getProxy().PrintToPrinter("", items, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean o) {
closeDialog();
}
public void onFailure(Throwable t) {
- CurrentState.getToaster().addItem("PrintSubsystemError",
- "Error sending document.", Toaster.TOASTER_ERROR);
+ Util.showInfoMsg("PrintSubsystem", "Error sending document.");
}
});
return 0;
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MugshotWebcamWidget.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MugshotWebcamWidget.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MugshotWebcamWidget.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -120,8 +120,7 @@
// DOM.getElementById("mugshot_url").val(mturl);
// DOM.getElementById("mugshot_mid").val(mid);
}
- CurrentState.getToaster().addItem("MugshotWebcamWidget",
- "Uploaded image.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("MugshotWebcamWidget", "Uploaded image.");
if (getOnFinishedCommand() != null) {
getOnFinishedCommand().execute();
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MultiPageImageCompositedForm.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MultiPageImageCompositedForm.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/MultiPageImageCompositedForm.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -192,8 +192,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("XmrDefinition",
- "Failed to load data.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("XmrDefinition", "Failed to load data.");
}
@SuppressWarnings("unchecked")
@@ -210,9 +209,7 @@
populateFormDefinition(r);
}
} else {
- CurrentState.getToaster().addItem("XmrDefinition",
- "Failed to load data.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("XmrDefinition", "Failed to load data.");
}
}
});
@@ -226,8 +223,7 @@
.getProxy("org.freemedsoftware.gwt.client.Api.ModuleInterface");
} catch (Exception e) {
JsonUtil.debug(e.toString());
- CurrentState.getToaster().addItem("XmrDefinition",
- "Failed to load form.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("XmrDefinition", "Failed to load data.");
}
service.ModuleGetRecordMethod("XmrDefinition", form,
new AsyncCallback<HashMap<String, String>>() {
@@ -236,9 +232,7 @@
}
public void onFailure(Throwable t) {
- CurrentState.getToaster().addItem("XmrDefinition",
- "Failed to load form.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("XmrDefinition", "Failed to load data.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAddresses.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAddresses.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAddresses.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -425,8 +425,7 @@
map = (HashMap<String, String>[]) l.toArray(new HashMap<?, ?>[0]);
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem("PatientAddresses",
- "Updated patient addresses.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientAddresses", "Updated patient addresses.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -445,9 +444,7 @@
com.google.gwt.http.client.Request request,
Throwable ex) {
GWT.log("Exception", ex);
- CurrentState.getToaster().addItem("PatientAddresses",
- "Failed to update patient addresses.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientAddresses", "Failed to update patient addresses.");
}
public void onResponseReceived(
@@ -458,10 +455,7 @@
JSONParser.parse(response.getText()),
"Boolean");
if (result != null) {
- CurrentState.getToaster().addItem(
- "PatientAddresses",
- "Updated patient addresses.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientAddresses", "Updated patient addresses.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -473,9 +467,7 @@
});
} catch (RequestException e) {
GWT.log("Exception", e);
- CurrentState.getToaster().addItem("PatientAddresses",
- "Failed to update patient addresses.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientAddresses", "Failed to update patient addresses.");
}
} else {
PatientModuleAsync service = null;
@@ -488,10 +480,7 @@
service.SetAddresses(patientId, map,
new AsyncCallback<Boolean>() {
public void onSuccess(Boolean result) {
- CurrentState.getToaster().addItem(
- "PatientAddresses",
- "Updated patient addresses.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientAddresses", "Updated patient addresses.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -499,10 +488,7 @@
public void onFailure(Throwable t) {
GWT.log("Exception", t);
- CurrentState.getToaster().addItem(
- "PatientAddresses",
- "Failed to update patient addresses.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientAddresses", "Failed to update patient addresses.");
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAuthorizations.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAuthorizations.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientAuthorizations.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -443,8 +443,7 @@
if(mmp.get("id")!=null)
url = "org.freemedsoftware.module.Authorizations.Mod";
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem("PatientAuthorization",
- "Updated patient Coverages.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientAuthorization", "Updated patient Authorization.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -463,9 +462,7 @@
com.google.gwt.http.client.Request request,
Throwable ex) {
GWT.log("Exception", ex);
- CurrentState.getToaster().addItem("PatientAuthorization",
- "Failed to update patient Coverages.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientAuthorization", "Failed to update patient Authorizations.");
}
public void onResponseReceived(
@@ -476,10 +473,7 @@
JSONParser.parse(response.getText()),
"Boolean");
if (result != null) {
- CurrentState.getToaster().addItem(
- "PatientAuthorization",
- "Updated patient Coverages.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientAuthorization", "Updated patient Coverages.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -491,9 +485,7 @@
});
} catch (RequestException e) {
GWT.log("Exception", e);
- CurrentState.getToaster().addItem("PatientAuthorization",
- "Failed to update patient Coverages.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientAuthorization", "Failed to update patient Authorizations.");
}
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientCoverages.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientCoverages.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientCoverages.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -867,8 +867,7 @@
if(mmp.get("id")!=null)
url = "org.freemedsoftware.module.PatientCoverages.Mod";
if (Util.getProgramMode() == ProgramMode.STUBBED) {
- CurrentState.getToaster().addItem("PatientCoverages",
- "Updated patient Coverages.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientCoverages", "Updated patient Coverages.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -887,9 +886,7 @@
com.google.gwt.http.client.Request request,
Throwable ex) {
GWT.log("Exception", ex);
- CurrentState.getToaster().addItem("PatientCoverages",
- "Failed to update patient Coverages.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientCoverages", "Failed to update patient Coverages.");
}
public void onResponseReceived(
@@ -900,10 +897,7 @@
JSONParser.parse(response.getText()),
"Boolean");
if (result != null) {
- CurrentState.getToaster().addItem(
- "PatientCoverages",
- "Updated patient Coverages.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientCoverages", "Updated patient Coverages.");
if (onCompletion != null) {
onCompletion.execute();
}
@@ -915,9 +909,7 @@
});
} catch (RequestException e) {
GWT.log("Exception", e);
- CurrentState.getToaster().addItem("PatientCoverages",
- "Failed to update patient Coverages.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientCoverages", "Failed to update patient Coverages.");
}
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagWidget.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagWidget.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagWidget.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -349,10 +349,7 @@
public void onFailure(Throwable t) {
GWT.log("Exception thrown: ", t);
- CurrentState.getToaster()
- .addItem("PatientTagWidget",
- "Exception: " + t.toString(),
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTagWidget", "Exception: " + t.toString());
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagsWidget.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagsWidget.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientTagsWidget.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -104,8 +104,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to add tags.", Toaster.TOASTER_ERROR);
+ Util.showInfoMsg("PatientTags", "Failed to add tags.");
}
public void onResponseReceived(Request request,
@@ -117,34 +116,27 @@
if (r != null) {
wEntry.clear();
addTagToDisplay(tag);
- CurrentState.getToaster().addItem(
- "PatientTags", "Added tag.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientTags", "Tag added.");
}
} else {
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to add tags.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to add tags.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to add tags.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to add tags.");
}
} else {
getProxy().CreateTag(patientId, tag, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean o) {
wEntry.clear();
addTagToDisplay(tag);
- CurrentState.getToaster().addItem("PatientTags",
- "Added tag.", Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientTags", "Tag added");
}
public void onFailure(Throwable t) {
GWT.log("Exception", t);
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to add tags.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to add tags.");
}
});
}
@@ -307,8 +299,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to remove tag.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to remove tag.");
}
public void onResponseReceived(Request request,
@@ -319,33 +310,26 @@
"Boolean");
if (r != null) {
hp.removeFromParent();
- CurrentState.getToaster().addItem(
- "PatientTags", "Removed tag.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PatientTags", "Tag removed.");
}
} else {
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to remove tag.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to remove tag.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to remove tag.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to remove tag.");
}
} else {
getProxy().ExpireTag(patientId, tag, new AsyncCallback<Boolean>() {
public void onSuccess(Boolean o) {
hp.removeFromParent();
- CurrentState.getToaster().addItem("PatientTags",
- "Removed tag.", Toaster.TOASTER_INFO);
+ Util.showErrorMsg("PatientTags", "Tag removed.");
}
public void onFailure(Throwable t) {
GWT.log("Exception", t);
- CurrentState.getToaster().addItem("PatientTags",
- "Failed to remove tag.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PatientTags", "Failed to remove tag.");
}
});
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PrescriptionRefillBox.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PrescriptionRefillBox.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PrescriptionRefillBox.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -172,11 +172,8 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem(
- "PrescriptionRefillBox",
- "Error adding refill request."
- + ex.toString(),
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PrescriptionRefillBox", "Error adding refill request."
+ + ex.toString());
}
public void onResponseReceived(Request request,
@@ -187,18 +184,10 @@
.parse(response.getText()),
"Integer");
if (r != 0) {
- CurrentState
- .getToaster()
- .addItem(
- "PrescriptionRefillBox",
- "Prescription refill successfully saved.",
- Toaster.TOASTER_INFO);
+ Util.showInfoMsg("PrescriptionRefillBox", "Prescription refill successfully saved.");
}
} else {
- CurrentState.getToaster().addItem(
- "PrescriptionRefillBox",
- "Error adding prescription refill",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("PrescriptionRefillBox", "Error adding prescription refill");
}
}
});
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/ReconciliationWidget.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/ReconciliationWidget.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/ReconciliationWidget.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -313,20 +313,16 @@
Response response) {
if (200 == response.getStatusCode()) {
-
- CurrentState.getToaster().addItem("Reconcile Bottle",
- "Reconciliation succeeded.");
+ Util.showInfoMsg("Reconciliation", "Reconciliation succeeded.");
printReconciliation();
} else {
- CurrentState.getToaster().addItem("Reconcile Bottle",
- "Reconciliation failed.");
+ Util.showErrorMsg("Reconciliation", "Reconciliation failed.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Reconcile Bottle",
- "Reconciliation failed.");
+ Util.showErrorMsg("Reconciliation", "Reconciliation failed.");
}
}
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/SchedulerWidget.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/SchedulerWidget.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/SchedulerWidget.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -351,18 +351,13 @@
public void createNewAfterClick(Date currentDate,
DateEventListener listener) {
if(!CurrentState.isActionAllowed(AppConstants.WRITE, AppConstants.SYSTEM_CATEGORY, AppConstants.SCHEDULER)){
- CurrentState.getToaster().addItem(
- "Scheduler",
- "Access Denied!\nCan not book appointments.",Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Access Denied!\nCan not book appointments.");
return;
}
if (!CurrentState.canBookAppoinment(currentDate, currentDate)) {
- CurrentState.getToaster().addItem(
- "Scheduler",
- "Can not book appointment in between("
- + CurrentState.BREAK_HOUR + ":00 -"
- + (CurrentState.BREAK_HOUR + 1) + ":00) !",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Can not book appointment in between("
+ + CurrentState.BREAK_HOUR + ":00 -"
+ + (CurrentState.BREAK_HOUR + 1) + ":00) !");
return;
}
@@ -389,19 +384,14 @@
DateEventListener listener) {
if(!CurrentState.isActionAllowed(AppConstants.WRITE, AppConstants.SYSTEM_CATEGORY, AppConstants.SCHEDULER)){
- CurrentState.getToaster().addItem(
- "Scheduler",
- "Access Denied!\nCan not book appointments.",Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Access Denied!\nCan not book appointments.");
return;
}
if (!CurrentState.canBookAppoinment(currentDate, endDate)) {
- CurrentState.getToaster().addItem(
- "Scheduler",
- "Can not book appointment in between("
- + CurrentState.BREAK_HOUR + ":00 -"
- + (CurrentState.BREAK_HOUR + 1) + ":00) !",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Can not book appointment in between("
+ + CurrentState.BREAK_HOUR + ":00 -"
+ + (CurrentState.BREAK_HOUR + 1) + ":00) !");
return;
}
final EventData data = new EventData();
@@ -1067,12 +1057,9 @@
if (!CurrentState.canBookAppoinment(start.getValue(date
.getValue()), end.getValue(date.getValue()))) {
- CurrentState.getToaster().addItem(
- "Scheduler",
- "Can not book appointment in between("
- + CurrentState.BREAK_HOUR + ":00 -"
- + (CurrentState.BREAK_HOUR + 1)
- + ":00) !", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Can not book appointment in between("
+ + CurrentState.BREAK_HOUR + ":00 -"
+ + (CurrentState.BREAK_HOUR + 1) + ":00) !");
return;
}
@@ -1196,16 +1183,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get scheduler items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get scheduler items.");
}
} else {
// GWT-RPC
@@ -1259,9 +1242,7 @@
nextAvailableDateTime.addItem(Util.getSQLDate(slotDateTime).toString(), slotDateTime);
}
}else{
- CurrentState.getToaster().addItem("Scheduler",
- "Next Available Items Not Available.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Next Available Items Not Available.");
}
} else {
@@ -1269,16 +1250,12 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get Next Available items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get Next Available items.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get Next Available items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get Next Available items.");
}
} else {
// GWT-RPC
@@ -1398,9 +1375,8 @@
handleNewOrEditAppointment(real);
}
});
- }else CurrentState.getToaster().addItem(
- "Scheduler",
- "Access Denied!\nCan not edit appointments.",Toaster.TOASTER_ERROR);
+ }else
+ Util.showErrorMsg("Scheduler", "Access Denied!\nCan not edit appointments.");
if (real.getEndTime() == null) {
super.setTitle(format.format(real.getStartTime()) + " "
+ real.getProviderName());
@@ -1527,9 +1503,8 @@
}
});
- }else CurrentState.getToaster().addItem(
- "Scheduler",
- "Access Denied!\nCan not edit appointments.",Toaster.TOASTER_ERROR);
+ }else
+ Util.showErrorMsg("Scheduler", "Access Denied!\nCan not edit appointments.");
if (real.getEndTime() == null) {
super.setTitle(format.format(real.getStartTime())
@@ -1698,9 +1673,7 @@
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
loadingDialog.hide();
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get scheduler items.");
}
public void onResponseReceived(Request request,
@@ -1736,17 +1709,13 @@
.debug("Received dummy response from JSON backend");
}
} else {
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get scheduler items.");
}
}
});
} catch (RequestException e) {
loadingDialog.hide();
- CurrentState.getToaster().addItem("Scheduler",
- "Failed to get scheduler items.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("Scheduler", "Failed to get scheduler items.");
}
} else {
// GWT-RPC
Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/WorkList.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/WorkList.java 2010-03-11 13:20:39 UTC (rev 5268)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/WorkList.java 2010-03-11 14:39:30 UTC (rev 5269)
@@ -142,8 +142,7 @@
statusColorsMap.get(statusid));
} else {
- CurrentState.getToaster().addItem("Patient Status ",
- "Patient Status Change Failed.");
+ Util.showErrorMsg("Patient Status", "Patient Status Change Failed.");
// printLabelForAllTakeHome();
}
@@ -521,9 +520,7 @@
try {
builder.sendRequest(null, new RequestCallback() {
public void onError(Request request, Throwable ex) {
- CurrentState.getToaster().addItem("WorkList",
- "Failed to get work list.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("WorkLists", "Failed to get work list.");
}
@SuppressWarnings("unchecked")
@@ -574,15 +571,12 @@
}
} else {
- CurrentState.getToaster().addItem("WorkLists",
- "Failed to get work list.",
- Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("WorkLists", "Failed to get work list.");
}
}
});
} catch (RequestException e) {
- CurrentState.getToaster().addItem("WorkLists",
- "Failed to get work list.", Toaster.TOASTER_ERROR);
+ Util.showErrorMsg("WorkLists", "Failed to get work list.");
}
} else {
// GWT-RPC