r6179 - in trunk: data/schema/mysql ui/gwt/src/main/java/org/freemedsoftware/gwt/client/screen/patient

[subve...@svn.freemedsoftware.org]

Author: jeff
Date: 2011-11-16 01:15:46 -0500 (Wed, 16 Nov 2011)
New Revision: 6179

Modified:
trunk/data/schema/mysql/config.sql
trunk/ui/gwt/src/main/java/org/freemedsoftware/gwt/client/screen/patient/VitalsEntry.java
Log:
Add "metric_mode" config switch to make metric units default.

Modified: trunk/data/schema/mysql/config.sql
===================================================================
--- trunk/data/schema/mysql/config.sql 2011-11-16 06:07:10 UTC (rev 6178)
+++ trunk/data/schema/mysql/config.sql 2011-11-16 06:15:46 UTC (rev 6179)
@@ -242,6 +242,15 @@
);

CALL config_Register (
+ 'metric_system',
+ 'Standard',
+ 'Metric System',
+ 'UI',
+ 'Select',
+ 'Standard,Metric'
+);
+
+CALL config_Register (
'xmpp_notify',
'0',
'XMPP Notifications',

Modified: trunk/ui/gwt/src/main/java/org/freemedsoftware/gwt/client/screen/patient/VitalsEntry.java
===================================================================
--- trunk/ui/gwt/src/main/java/org/freemedsoftware/gwt/client/screen/patient/VitalsEntry.java 2011-11-16 06:07:10 UTC (rev 6178)
+++ trunk/ui/gwt/src/main/java/org/freemedsoftware/gwt/client/screen/patient/VitalsEntry.java 2011-11-16 06:15:46 UTC (rev 6179)
@@ -26,6 +26,7 @@

import static org.freemedsoftware.gwt.client.i18n.I18nUtil._;

+import org.freemedsoftware.gwt.client.CurrentState;
import org.freemedsoftware.gwt.client.PatientEntryScreenInterface;
import org.freemedsoftware.gwt.client.i18n.AppConstants;
import org.freemedsoftware.gwt.client.widget.CustomButton;
@@ -153,8 +154,13 @@
flexTable.setWidget(pos, 3, temperatureValue);

temperatureUnits = new CustomListBox();
- temperatureUnits.addItem("F");
- temperatureUnits.addItem("C");
+ if (CurrentState.getSystemConfig("metric_system").equals("Standard")) {
+ temperatureUnits.addItem("F");
+ temperatureUnits.addItem("C");
+ } else {
+ temperatureUnits.addItem("C");
+ temperatureUnits.addItem("F");
+ }
temperatureUnits.setHashMapping("v_temp_units");
temperatureUnits.setEnabled(Boolean.FALSE);
addEntryWidget("v_temp_units", temperatureUnits);
@@ -561,8 +567,13 @@
flexTable.setWidget(pos, 3, cgValue);

cgUnits = new CustomListBox();
- cgUnits.addItem("IN");
- cgUnits.addItem("CM");
+ if (CurrentState.getSystemConfig("metric_system").equals("Standard")) {
+ cgUnits.addItem("IN");
+ cgUnits.addItem("CM");
+ } else {
+ cgUnits.addItem("CM");
+ cgUnits.addItem("IN");
+ }
cgUnits.setHashMapping("v_cg_units");
cgUnits.setEnabled(Boolean.FALSE);
addEntryWidget("v_cg_units", cgUnits);
@@ -627,8 +638,13 @@
flexTable.setWidget(pos, 3, hValue);

hUnits = new CustomListBox();
- hUnits.addItem("IN");
- hUnits.addItem("CM");
+ if (CurrentState.getSystemConfig("metric_system").equals("Standard")) {
+ hUnits.addItem("IN");
+ hUnits.addItem("CM");
+ } else {
+ hUnits.addItem("CM");
+ hUnits.addItem("IN");
+ }
hUnits.setHashMapping("v_h_units");
hUnits.setEnabled(Boolean.FALSE);
addEntryWidget("v_h_units", hUnits);