r5293 - in branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client: screen widget

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

Author: sadnan
Date: 2010-03-12 12:03:35 -0500 (Fri, 12 Mar 2010)
New Revision: 5293

Modified:
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/DispenseDose.java
branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientInfoBar.java
Log:
Fixed Bug #123

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-12 16:59:05 UTC (rev 5292)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/screen/DispenseDose.java 2010-03-12 17:03:35 UTC (rev 5293)
@@ -112,7 +112,9 @@
protected HashMap<String, String> patientInfo;

protected Integer patientId = new Integer(0);
-
+
+ protected String lotrecno=null;
+
public void setPatientId(Integer patientId) {
this.patientId = patientId;
}
@@ -893,6 +895,7 @@
if (result.length != 0) {
JsonUtil.debug("after response bottleinfo record found");
HashMap<String, String> m = (HashMap<String, String>) result[0];
+ lotrecno=m.get("lot_rec_no");
lbLotNo.setText("Lot #: "+m.get("lot_rec_no"));
expiryDate = m.get("lot_rec_expdate");
bottleNum=m.get("bottle_number");
@@ -1640,8 +1643,10 @@
if (Util.getProgramMode() == ProgramMode.JSONRPC) {
String patname=JsonUtil.jsonify(ptName.trim());
String proname=JsonUtil.jsonify(patientInfoBar.getProviderName());
- //Window.alert("dsid:"+dsid+", pt name:"+patname+",pt id:"+patientId.toString()+",Pr Name:"+proname+",Exp Date:"+expiryDate+", Quantity:"+doseQuan+",Date:"+dDate+"Lot No:"+lotId);
- String[] params = {dsid,patname,patientId.toString(),proname,expiryDate,doseQuan,dDate,""+lotId};
+ String ptid=JsonUtil.jsonify(patientInfoBar.getPatientPracticeId());
+ String stlottecno=JsonUtil.jsonify(lotrecno);
+
+ String[] params = {dsid,patname,ptid,proname,expiryDate,doseQuan,dDate,stlottecno};
RequestBuilder builder = new RequestBuilder(
RequestBuilder.POST,
URL
@@ -1671,7 +1676,6 @@
}
} else {
JsonUtil.debug(response.toString());
- //Window.alert( );
}
}
});

Modified: branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientInfoBar.java
===================================================================
--- branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientInfoBar.java 2010-03-12 16:59:05 UTC (rev 5292)
+++ branches/bmas-staging/ui/gwt/src/org/freemedsoftware/gwt/client/widget/PatientInfoBar.java 2010-03-12 17:03:35 UTC (rev 5293)
@@ -65,6 +65,7 @@
protected HTML wPatientVisibleInfo;

protected Integer patientId = new Integer(0);
+ protected String patientPracticeId=null;

protected Image photoId = null;

@@ -184,6 +185,10 @@
public Integer getPatientId() {
return patientId;
}
+
+ public String getPatientPracticeId() {
+ return patientPracticeId;
+ }

/**
* Set patient information with HashMap returned from PatientInformation()
@@ -227,6 +232,7 @@
}
try {
patientId = new Integer((String) map.get("id"));
+ patientPracticeId = (String) map.get("ptid");
} catch (Exception e) {
JsonUtil.debug(e.toString());
} finally {