You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jay G. <jay...@us...> - 2005-04-20 21:07:30
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19307 Modified Files: RxAddReactionForm.java Log Message: changed to handle new fields in allergy.. ageOfOnset, severityOfReaction, onSetOfReaction Index: RxAddReactionForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxAddReactionForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxAddReactionForm.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxAddReactionForm.java 20 Apr 2005 21:07:21 -0000 1.2 *************** *** 36,40 **** String reactionDescription = null; ! String name =null; public String getReactionDescription(){ --- 36,44 ---- String reactionDescription = null; ! String name =null; ! String ageOfOnset = null; ! String severityOfReaction = null; ! String onSetOfReaction = null; ! public String getReactionDescription(){ *************** *** 83,85 **** --- 87,138 ---- } + + /** + * Getter for property ageOfOnset. + * @return Value of property ageOfOnset. + */ + public java.lang.String getAgeOfOnset() { + return ageOfOnset; + } + + /** + * Setter for property ageOfOnset. + * @param ageOfOnset New value of property ageOfOnset. + */ + public void setAgeOfOnset(java.lang.String ageOfOnset) { + this.ageOfOnset = ageOfOnset; + } + + /** + * Getter for property severityOfReaction. + * @return Value of property severityOfReaction. + */ + public java.lang.String getSeverityOfReaction() { + return severityOfReaction; + } + + /** + * Setter for property severityOfReaction. + * @param severityOfReaction New value of property severityOfReaction. + */ + public void setSeverityOfReaction(java.lang.String severityOfReaction) { + this.severityOfReaction = severityOfReaction; + } + + /** + * Getter for property onSetOfReaction. + * @return Value of property onSetOfReaction. + */ + public java.lang.String getOnSetOfReaction() { + return onSetOfReaction; + } + + /** + * Setter for property onSetOfReaction. + * @param onSetOfReaction New value of property onSetOfReaction. + */ + public void setOnSetOfReaction(java.lang.String onSetOfReaction) { + this.onSetOfReaction = onSetOfReaction; + } + } |
|
From: Jay G. <jay...@us...> - 2005-04-20 21:06:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18913 Modified Files: RxAddAllergyAction.java Log Message: changed to handle new fields in allergy.. ageOfOnset, severityOfReaction, onSetOfReaction Index: RxAddAllergyAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxAddAllergyAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RxAddAllergyAction.java 28 Dec 2004 18:38:00 -0000 1.2 --- RxAddAllergyAction.java 20 Apr 2005 21:06:18 -0000 1.3 *************** *** 67,70 **** --- 67,74 ---- String type = request.getParameter("type"); String description = request.getParameter("reactionDescription"); + + String ageOfOnset = request.getParameter("ageOfOnset"); + String severityOfReaction = request.getParameter("severityOfReaction"); + String onSetOfReaction = request.getParameter("onSetOfReaction"); RxPatientData.Patient patient = (RxPatientData.Patient)request.getSession().getAttribute("Patient"); *************** *** 75,78 **** --- 79,85 ---- allergy.setTYPECODE(Integer.parseInt(type)); allergy.setReaction(description); + allergy.setAgeOfOnset(ageOfOnset); + allergy.setSeverityOfReaction(severityOfReaction); + allergy.setOnSetOfReaction(onSetOfReaction); patient.addAllergy(oscar.oscarRx.util.RxUtil.Today(), allergy); |
|
From: Jay G. <jay...@us...> - 2005-04-20 21:05:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18669 Modified Files: RxAddAllergyForm.java Log Message: changed to handle new fields in allergy.. ageOfOnset, severityOfReaction, onSetOfReaction Index: RxAddAllergyForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxAddAllergyForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxAddAllergyForm.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxAddAllergyForm.java 20 Apr 2005 21:05:32 -0000 1.2 *************** *** 38,41 **** --- 38,45 ---- String name =null; String type = null; + + String ageOfOnset = null; + String severityOfReaction = null; + String onSetOfReaction = null; /// public String getReactionDescription(){ *************** *** 91,93 **** --- 95,145 ---- } + + /** + * Getter for property ageOfOnset. + * @return Value of property ageOfOnset. + */ + public java.lang.String getAgeOfOnset() { + return ageOfOnset; + } + + /** + * Setter for property ageOfOnset. + * @param ageOfOnset New value of property ageOfOnset. + */ + public void setAgeOfOnset(java.lang.String ageOfOnset) { + this.ageOfOnset = ageOfOnset; + } + + /** + * Getter for property severityOfReaction. + * @return Value of property severityOfReaction. + */ + public java.lang.String getSeverityOfReaction() { + return severityOfReaction; + } + + /** + * Setter for property severityOfReaction. + * @param severityOfReaction New value of property severityOfReaction. + */ + public void setSeverityOfReaction(java.lang.String severityOfReaction) { + this.severityOfReaction = severityOfReaction; + } + + /** + * Getter for property onSetOfReaction. + * @return Value of property onSetOfReaction. + */ + public java.lang.String getOnSetOfReaction() { + return onSetOfReaction; + } + + /** + * Setter for property onSetOfReaction. + * @param onSetOfReaction New value of property onSetOfReaction. + */ + public void setOnSetOfReaction(java.lang.String onSetOfReaction) { + this.onSetOfReaction = onSetOfReaction; + } } |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:58:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14038 Modified Files: RxAllergyData.java Log Message: changed to handle new fields in allergy.. Index: RxAllergyData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxAllergyData.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RxAllergyData.java 11 Mar 2005 03:12:05 -0000 1.2 --- RxAllergyData.java 20 Apr 2005 20:57:50 -0000 1.3 *************** *** 51,54 **** --- 51,57 ---- int TYPECODE; String reaction; + String ageOfOnset = null; + String severityOfReaction = null; + String onSetOfReaction = null; public Allergy(){ *************** *** 187,190 **** --- 190,242 ---- return s; } + + /** + * Getter for property ageOfOnset. + * @return Value of property ageOfOnset. + */ + public java.lang.String getAgeOfOnset() { + return ageOfOnset; + } + + /** + * Setter for property ageOfOnset. + * @param ageOfOnset New value of property ageOfOnset. + */ + public void setAgeOfOnset(java.lang.String ageOfOnset) { + this.ageOfOnset = ageOfOnset; + } + + /** + * Getter for property severityOfReaction. + * @return Value of property severityOfReaction. + */ + public java.lang.String getSeverityOfReaction() { + return severityOfReaction; + } + + /** + * Setter for property severityOfReaction. + * @param severityOfReaction New value of property severityOfReaction. + */ + public void setSeverityOfReaction(java.lang.String severityOfReaction) { + this.severityOfReaction = severityOfReaction; + } + + /** + * Getter for property onSetOfReaction. + * @return Value of property onSetOfReaction. + */ + public java.lang.String getOnSetOfReaction() { + return onSetOfReaction; + } + + /** + * Setter for property onSetOfReaction. + * @param onSetOfReaction New value of property onSetOfReaction. + */ + public void setOnSetOfReaction(java.lang.String onSetOfReaction) { + this.onSetOfReaction = onSetOfReaction; + } + } |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:46:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7983 Modified Files: RxSessionBean.java Log Message: Added Method to return Interaction Data for the current drug profile Index: RxSessionBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxSessionBean.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxSessionBean.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxSessionBean.java 20 Apr 2005 20:46:36 -0000 1.2 *************** *** 151,153 **** --- 151,179 ---- return false; } + + + public RxDrugData.Interaction[] getInteractions(){ + RxDrugData.Interaction[] interactions = null; + RxPrescriptionData rxData = new RxPrescriptionData(); + RxDrugData drugData = new RxDrugData(); + Vector atcCodes = rxData.getCurrentATCCodesByPatient(this.getDemographicNo()); + + RxPrescriptionData.Prescription rx; + for(int i=0;i<this.getStashSize(); i++) { + rx = this.getStashItem(i); + atcCodes.add(rx.getAtcCode()); + } + try{ + interactions = drugData.getInteractions(atcCodes); + }catch(Exception e){ + e.printStackTrace(); + } + System.out.println("interactions "+interactions.length); + for(int i =0 ; i < interactions.length;i++){ + System.out.println(interactions[i].affectingatc+" "+interactions[i].effect+" "+interactions[i].affectedatc); + } + //interactions = + Arrays.sort(interactions); + return interactions; + } } \ No newline at end of file |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:43:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6236 Modified Files: RxWriteScriptAction.java Log Message: changed to handle 3 new fields unit, method, route also changed how the start date is set Index: RxWriteScriptAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxWriteScriptAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RxWriteScriptAction.java 28 Dec 2004 18:51:43 -0000 1.2 --- RxWriteScriptAction.java 20 Apr 2005 20:43:10 -0000 1.3 *************** *** 87,91 **** } ! rx.setRxDate(RxUtil.StringToDate(frm.getRxDate())); rx.setTakeMin(frm.getTakeMinFloat()); --- 87,91 ---- } ! rx.setRxDate(RxUtil.StringToDate(frm.getRxDate(),"yyyy-MM-dd")); rx.setTakeMin(frm.getTakeMinFloat()); *************** *** 101,104 **** --- 101,108 ---- rx.setAtcCode(frm.getAtcCode()); rx.setRegionalIdentifier(frm.getRegionalIdentifier()); + rx.setUnit(frm.getUnit()); + rx.setMethod(frm.getMethod()); + rx.setRoute(frm.getRoute()); + bean.setStashItem(bean.getStashIndex(), rx); |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:31:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv557 Modified Files: RxWriteScriptForm.java Log Message: changed to handle 3 new fields unit, method, route Index: RxWriteScriptForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxWriteScriptForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxWriteScriptForm.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxWriteScriptForm.java 20 Apr 2005 20:31:07 -0000 1.2 *************** *** 52,55 **** --- 52,58 ---- String atcCode = null; String regionalIdentifier = null; + String method = null; + String unit = null; + String route = null; *************** *** 304,306 **** --- 307,357 ---- } + /** + * Getter for property method. + * @return Value of property method. + */ + public java.lang.String getMethod() { + return method; + } + + /** + * Setter for property method. + * @param method New value of property method. + */ + public void setMethod(java.lang.String method) { + this.method = method; + } + + /** + * Getter for property unit. + * @return Value of property unit. + */ + public java.lang.String getUnit() { + return unit; + } + + /** + * Setter for property unit. + * @param unit New value of property unit. + */ + public void setUnit(java.lang.String unit) { + this.unit = unit; + } + + /** + * Getter for property route. + * @return Value of property route. + */ + public java.lang.String getRoute() { + return route; + } + + /** + * Setter for property route. + * @param route New value of property route. + */ + public void setRoute(java.lang.String route) { + this.route = route; + } + } |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:30:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv331 Modified Files: RxPrescriptionData.java Log Message: changed to handle 3 new fields unit, method, route Index: RxPrescriptionData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** RxPrescriptionData.java 2 Feb 2005 01:50:09 -0000 1.6 --- RxPrescriptionData.java 20 Apr 2005 20:30:17 -0000 1.7 *************** *** 31,34 **** --- 31,35 ---- import java.util.*; import java.sql.*; + import org.apache.commons.lang.*; public class RxPrescriptionData { *************** *** 65,68 **** --- 66,72 ---- prescription.setAtcCode(rs.getString("ATC")); prescription.setRegionalIdentifier(rs.getString("regional_Identifier")); + prescription.setUnit(rs.getString("unit")); + prescription.setMethod(rs.getString("method")); + prescription.setRoute(rs.getString("route")); } *************** *** 104,107 **** --- 108,114 ---- prescription.setAtcCode(favorite.getAtcCode()); prescription.setRegionalIdentifier(favorite.getRegionalIdentifier()); + prescription.setUnit(favorite.getUnit()); + prescription.setMethod(favorite.getMethod()); + prescription.setRoute(favorite.getRoute()); *************** *** 131,135 **** prescription.setAtcCode(rePrescribe.getAtcCode()); prescription.setRegionalIdentifier(rePrescribe.getRegionalIdentifier()); ! return prescription; } --- 138,144 ---- prescription.setAtcCode(rePrescribe.getAtcCode()); prescription.setRegionalIdentifier(rePrescribe.getRegionalIdentifier()); ! prescription.setUnit(rePrescribe.getUnit()); ! prescription.setMethod(rePrescribe.getMethod()); ! prescription.setRoute(rePrescribe.getRoute()); return prescription; } *************** *** 176,179 **** --- 185,191 ---- p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); + p.setUnit(rs.getString("unit")); + p.setMethod(rs.getString("method")); + p.setRoute(rs.getString("route")); lst.add(p); } *************** *** 229,233 **** p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); ! lst.add(p); } --- 241,247 ---- p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); ! p.setUnit(rs.getString("unit")); ! p.setMethod(rs.getString("method")); ! p.setRoute(rs.getString("route")); lst.add(p); } *************** *** 245,248 **** --- 259,278 ---- } + + public Vector getCurrentATCCodesByPatient(int demographicNo) { + Vector vec = new Vector(); + Prescription[] p = getPrescriptionsByPatientHideDeleted(demographicNo); + for( int i =0 ; i < p.length; i++){ + if(p[i].isCurrent()){ + System.out.println(p[i].getAtcCode()+" "+p[i].getBrandName()); + if (!vec.contains(p[i].getAtcCode())){ + System.out.println("Actually Adding "+p[i].getAtcCode()+" "+p[i].getBrandName()); + vec.add(p[i].getAtcCode()); + } + } + } + return vec; + } + /////////////////////// *************** *** 306,310 **** p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); ! lst.add(p); } --- 336,342 ---- p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); ! p.setUnit(rs.getString("unit")); ! p.setMethod(rs.getString("method")); ! p.setRoute(rs.getString("route")); lst.add(p); } *************** *** 370,374 **** p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); ! lst.add(p); } --- 402,408 ---- p.setAtcCode(rs.getString("ATC")); p.setRegionalIdentifier(rs.getString("regional_identifier")); ! p.setUnit(rs.getString("unit")); ! p.setMethod(rs.getString("method")); ! p.setRoute(rs.getString("route")); lst.add(p); } *************** *** 406,410 **** rs.getString("quantity"), rs.getInt("repeat"), rs.getInt("nosubs"), ! rs.getInt("prn"), rs.getString("special"),rs.getString("GN"),rs.getString("ATC"),rs.getString("regional_identifier")); --- 440,444 ---- rs.getString("quantity"), rs.getInt("repeat"), rs.getInt("nosubs"), ! rs.getInt("prn"), rs.getString("special"),rs.getString("GN"),rs.getString("ATC"),rs.getString("regional_identifier"),rs.getString("unit"),rs.getString("method"),rs.getString("route")); *************** *** 442,446 **** rs.getString("quantity"), rs.getInt("repeat"), rs.getInt("nosubs"), ! rs.getInt("prn"), rs.getString("special"),rs.getString("GN"),rs.getString("ATC"),rs.getString("regional_identifier")); } --- 476,480 ---- rs.getString("quantity"), rs.getInt("repeat"), rs.getInt("nosubs"), ! rs.getInt("prn"), rs.getString("special"),rs.getString("GN"),rs.getString("ATC"),rs.getString("regional_identifier"),rs.getString("unit"),rs.getString("method"),rs.getString("route")); } *************** *** 475,479 **** /** This function is used to save a set of prescribed drugs to as one ! * prescription. This is for historical perposes * @param bean This is the oscarRx session bean * @return This returns the insert id of the script to be included --- 509,513 ---- /** This function is used to save a set of prescribed drugs to as one ! * prescription. This is for historical purposes * @param bean This is the oscarRx session bean * @return This returns the insert id of the script to be included *************** *** 540,545 **** System.out.println("date_prescribed " +date_prescribed+" date printed "+date_printed); ! ! String sql = " insert into prescription " --- 574,578 ---- System.out.println("date_prescribed " +date_prescribed+" date printed "+date_printed); ! String sql = " insert into prescription " *************** *** 550,554 **** +" '"+date_prescribed+"', " +" '"+date_printed+"', " ! +" '"+textView.toString()+"') "; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); --- 583,587 ---- +" '"+date_prescribed+"', " +" '"+date_printed+"', " ! +" '"+StringEscapeUtils.escapeSql(textView.toString())+"') "; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); *************** *** 601,604 **** --- 634,640 ---- String atcCode = null; String regionalIdentifier = null; + String method = null; + String unit = null; + String route = null; //RxDrugData.GCN gcn = null; *************** *** 1119,1122 **** --- 1155,1160 ---- b = true; + + // if it doesn't already exist add it. if(this.getDrugId() == 0) { *************** *** 1125,1134 **** + "takemin, takemax, " + "freqcode, duration, durunit, quantity, " ! + "repeat, nosubs, prn, special,GN,script_no,ATC,regional_identifier) " + "VALUES ('" + this.getProviderNo() + "', " + this.getDemographicNo() + ", '" + RxUtil.DateToString(this.getRxDate()) + "', '" + RxUtil.DateToString(this.getEndDate()) + "', '" ! + this.getBrandName() + "', " + this.getGCN_SEQNO() ! + ", '" + this.getCustomName() + "', " + this.getTakeMin() + ", " + this.getTakeMax() + ", '" + this.getFrequencyCode() + "', '" + this.getDuration() + "', '" --- 1163,1172 ---- + "takemin, takemax, " + "freqcode, duration, durunit, quantity, " ! + "repeat, nosubs, prn, special,GN,script_no,ATC,regional_identifier,unit,method,route,create_date) " + "VALUES ('" + this.getProviderNo() + "', " + this.getDemographicNo() + ", '" + RxUtil.DateToString(this.getRxDate()) + "', '" + RxUtil.DateToString(this.getEndDate()) + "', '" ! + StringEscapeUtils.escapeSql(this.getBrandName()) + "', " + this.getGCN_SEQNO() ! + ", '" + StringEscapeUtils.escapeSql(this.getCustomName()) + "', " + this.getTakeMin() + ", " + this.getTakeMax() + ", '" + this.getFrequencyCode() + "', '" + this.getDuration() + "', '" *************** *** 1137,1141 **** + this.getPrnInt() + ", '" + RxUtil.replace(this.getSpecial(), "'", "") + "','"+this.getGenericName()+"','"+scriptId+"', '" ! + this.getAtcCode() +"', '"+this.getRegionalIdentifier()+"')"; --- 1175,1179 ---- + this.getPrnInt() + ", '" + RxUtil.replace(this.getSpecial(), "'", "") + "','"+this.getGenericName()+"','"+scriptId+"', '" ! + this.getAtcCode() +"', '"+this.getRegionalIdentifier()+"','"+this.getUnit()+"','"+this.getMethod()+"','"+this.getRoute()+"',now())"; *************** *** 1157,1162 **** } ! } else // update the daterbase ! { sql = "UPDATE drugs SET " + "provider_no = '" + this.getProviderNo() + "', " --- 1195,1199 ---- } ! } else { // update the daterbase sql = "UPDATE drugs SET " + "provider_no = '" + this.getProviderNo() + "', " *************** *** 1178,1182 **** + "special = '" + RxUtil.replace(this.getSpecial(), "'", "") + "', " + "ATC = '" +this.atcCode+"', " ! + "regional_identifier = '"+this.regionalIdentifier+"' " + "WHERE drugid = " + this.getDrugId(); --- 1215,1222 ---- + "special = '" + RxUtil.replace(this.getSpecial(), "'", "") + "', " + "ATC = '" +this.atcCode+"', " ! + "regional_identifier = '"+this.regionalIdentifier+"', " ! + "unit = '"+this.getUnit()+"', " ! + "method = '"+this.getMethod()+"', " ! + "route = '"+this.getRoute()+"' " + "WHERE drugid = " + this.getDrugId(); *************** *** 1206,1210 **** this.getRepeat(), this.getNosubsInt(), this.getPrnInt(), this.getSpecial(),this.getGenericName(), ! this.getAtcCode(),this.getRegionalIdentifier()); return fav.Save(); --- 1246,1250 ---- this.getRepeat(), this.getNosubsInt(), this.getPrnInt(), this.getSpecial(),this.getGenericName(), ! this.getAtcCode(),this.getRegionalIdentifier(),this.getUnit(),this.getMethod(),this.getRoute()); return fav.Save(); *************** *** 1243,1246 **** --- 1283,1334 ---- } + /** + * Getter for property method. + * @return Value of property method. + */ + public java.lang.String getMethod() { + return method; + } + + /** + * Setter for property method. + * @param method New value of property method. + */ + public void setMethod(java.lang.String method) { + this.method = method; + } + + /** + * Getter for property unit. + * @return Value of property unit. + */ + public java.lang.String getUnit() { + return unit; + } + + /** + * Setter for property unit. + * @param unit New value of property unit. + */ + public void setUnit(java.lang.String unit) { + this.unit = unit; + } + + /** + * Getter for property route. + * @return Value of property route. + */ + public java.lang.String getRoute() { + return route; + } + + /** + * Setter for property route. + * @param route New value of property route. + */ + public void setRoute(java.lang.String route) { + this.route = route; + } + } *************** *** 1265,1268 **** --- 1353,1359 ---- String atcCode; String regionalIdentifier; + String unit; + String method; + String route; public Favorite(int favoriteId, String providerNo, String favoriteName, *************** *** 1270,1274 **** float takeMin, float takeMax, String frequencyCode, String duration, String durationUnit, String quantity, ! int repeat, int nosubs, int prn, String special,String GN,String atc,String regionalIdentifier) { this.favoriteId = favoriteId; this.providerNo = providerNo; --- 1361,1365 ---- float takeMin, float takeMax, String frequencyCode, String duration, String durationUnit, String quantity, ! int repeat, int nosubs, int prn, String special,String GN,String atc,String regionalIdentifier,String unit,String method,String route) { this.favoriteId = favoriteId; this.providerNo = providerNo; *************** *** 1290,1293 **** --- 1381,1387 ---- this.atcCode = atc; this.regionalIdentifier= regionalIdentifier; + this.unit = unit; + this.method = method; + this.route = route; } *************** *** 1491,1495 **** + "BN, GCN_SEQNO, customName, takemin, takemax, " + "freqcode, duration, durunit, quantity, " ! + "repeat, nosubs, prn, special,GN,ATC,regional_identifier) " + "VALUES ('" + this.getProviderNo() + "', '" + this.getFavoriteName() + "', '" + this.getBN() + "', " + this.getGCN_SEQNO() + ", '" --- 1585,1589 ---- + "BN, GCN_SEQNO, customName, takemin, takemax, " + "freqcode, duration, durunit, quantity, " ! + "repeat, nosubs, prn, special,GN,ATC,regional_identifier,unit,method,route) " + "VALUES ('" + this.getProviderNo() + "', '" + this.getFavoriteName() + "', '" + this.getBN() + "', " + this.getGCN_SEQNO() + ", '" *************** *** 1503,1507 **** + this.getGN()+"', ' " + this.getAtcCode()+"', '" ! + this.getRegionalIdentifier()+"')"; db.RunSQL(sql); --- 1597,1604 ---- + this.getGN()+"', ' " + this.getAtcCode()+"', '" ! + this.getRegionalIdentifier()+"', '" ! + this.getUnit()+"', '" ! + this.getMethod()+"', '" ! + this.getRoute()+"')"; db.RunSQL(sql); *************** *** 1539,1543 **** + "GN = '"+this.getGN()+"', '" + "ATC = '"+this.getAtcCode()+"', '" ! + "regional_identifier = '"+this.getRegionalIdentifier()+"' " + "WHERE favoriteid = " + this.getFavoriteId(); --- 1636,1643 ---- + "GN = '"+this.getGN()+"', '" + "ATC = '"+this.getAtcCode()+"', '" ! + "regional_identifier = '"+this.getRegionalIdentifier()+"', '" ! + "unit = '"+this.getUnit()+"', '" ! + "method = '"+this.getMethod()+"', " ! + "route = '"+this.getRoute()+"' " + "WHERE favoriteid = " + this.getFavoriteId(); *************** *** 1589,1592 **** --- 1689,1740 ---- } + /** + * Getter for property unit. + * @return Value of property unit. + */ + public java.lang.String getUnit() { + return unit; + } + + /** + * Setter for property unit. + * @param unit New value of property unit. + */ + public void setUnit(java.lang.String unit) { + this.unit = unit; + } + + /** + * Getter for property method. + * @return Value of property method. + */ + public java.lang.String getMethod() { + return method; + } + + /** + * Setter for property method. + * @param method New value of property method. + */ + public void setMethod(java.lang.String method) { + this.method = method; + } + + /** + * Getter for property route. + * @return Value of property route. + */ + public java.lang.String getRoute() { + return route; + } + + /** + * Setter for property route. + * @param route New value of property route. + */ + public void setRoute(java.lang.String route) { + this.route = route; + } + } } |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:27:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31314 Modified Files: RxPatientData.java Log Message: changed to handle new fields in allergy.. also has the ability to delete an allergy(hide) Index: RxPatientData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPatientData.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RxPatientData.java 18 Feb 2005 15:54:56 -0000 1.3 --- RxPatientData.java 20 Apr 2005 20:27:21 -0000 1.4 *************** *** 1,45 **** /* * ! ! * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * ! * This software is published under the GPL GNU General Public License. ! ! * This program is free software; you can redistribute it and/or ! ! * modify it under the terms of the GNU General Public License ! * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. * ! ! * This program is distributed in the hope that it will be useful, ! ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! ! * along with this program; if not, write to the Free Software ! ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! ! * ! ! * <OSCAR TEAM> ! ! * ! ! * This software was written for the ! ! * Department of Family Medicine ! ! * McMaster Unviersity ! ! * Hamilton ! ! * Ontario, Canada ! */ --- 1,24 ---- /* * ! * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. ! * This program is free software; you can redistribute it and/or ! * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * ! * This program is distributed in the hope that it will be useful, ! * but WITHOUT ANY WARRANTY; without even the implied warranty of ! * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ! * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License ! * along with this program; if not, write to the Free Software ! * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ! * ! * <OSCAR TEAM> ! * ! * This software was written for the ! * Department of Family Medicine ! * McMaster Unviersity ! * Hamilton ! * Ontario, Canada */ *************** *** 113,116 **** --- 92,96 ---- rs.getString("postal"), rs.getString("phone"), rs.getString("hin")); + System.out.println(rs.getString("first_name")); } rs.close(); *************** *** 124,127 **** --- 104,137 ---- } + + public Patient getPatient(String demographicNo) throws java.sql.SQLException { + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + ResultSet rs; + Patient p = null; + try { + rs = db.GetSQL( + "SELECT demographic_no, last_name, first_name, sex, year_of_birth, " + + "month_of_birth, date_of_birth, address, city, postal, phone,hin " + + "FROM demographic WHERE demographic_no = " + demographicNo); + + if (rs.next()) { + p = new Patient(rs.getInt("demographic_no"), rs.getString("last_name"), + rs.getString("first_name"), rs.getString("sex"), + calcDate(rs.getString("year_of_birth"), + rs.getString("month_of_birth"), + rs.getString("date_of_birth")), + rs.getString("address"), rs.getString("city"), + rs.getString("postal"), + rs.getString("phone"), rs.getString("hin")); + } + rs.close(); + db.CloseConn(); + } + catch (SQLException e) { + System.out.println(e.getMessage()); + } + + return p; + } private java.util.Date calcDate(String year, String month, String day) { int iYear = Integer.parseInt(year); *************** *** 186,197 **** } ! public String getSurname() { return this.surname; } ! public String getFirstName() { return this.firstName; } ! public String getSex() { return this.sex; --- 196,207 ---- } ! public String getSurname() { return this.surname; } ! public String getFirstName() { return this.firstName; } ! public String getSex() { return this.sex; *************** *** 234,238 **** Allergy allergy; ! rs = db.GetSQL("SELECT * FROM allergies WHERE demographic_no = '" + getDemographicNo() + "' ORDER BY DESCRIPTION"); while (rs.next()) { --- 244,248 ---- Allergy allergy; ! rs = db.GetSQL("SELECT * FROM allergies WHERE demographic_no = '" + getDemographicNo() + "' and archived = '0' ORDER BY DESCRIPTION"); while (rs.next()) { *************** *** 271,275 **** try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "DELETE FROM allergies WHERE allergyid = " + allergyId; b = db.RunSQL(sql); db.CloseConn(); --- 281,285 ---- try { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ! String sql = "update allergies set archived = '1' WHERE allergyid = '"+allergyId+"'"; b = db.RunSQL(sql); db.CloseConn(); *************** *** 377,381 **** if (this.getAllergyId() == 0) { sql = "INSERT INTO allergies (demographic_no, entry_date, " ! + "DESCRIPTION, HICL_SEQNO, HIC_SEQNO, AGCSP, AGCCS, TYPECODE,reaction,drugref_id) " + "VALUES (" + Patient.this.getDemographicNo() + ", '" + oscar.oscarRx.util.RxUtil.DateToString(this.getEntryDate()) + "', '" --- 387,391 ---- if (this.getAllergyId() == 0) { sql = "INSERT INTO allergies (demographic_no, entry_date, " ! + "DESCRIPTION, HICL_SEQNO, HIC_SEQNO, AGCSP, AGCCS, TYPECODE,reaction,drugref_id,age_of_onset,severity_of_reaction,onset_of_reaction) " + "VALUES (" + Patient.this.getDemographicNo() + ", '" + oscar.oscarRx.util.RxUtil.DateToString(this.getEntryDate()) + "', '" *************** *** 387,391 **** + this.allergy.getTYPECODE() + ", '" + this.allergy.getReaction() + "', '" ! + this.allergy.getPickID() + "')"; b = db.RunSQL(sql); --- 397,404 ---- + this.allergy.getTYPECODE() + ", '" + this.allergy.getReaction() + "', '" ! + this.allergy.getPickID() + "', '" ! + this.allergy.getAgeOfOnset() + "', '" ! + this.allergy.getSeverityOfReaction() + "', '" ! + this.allergy.getOnSetOfReaction()+"')"; b = db.RunSQL(sql); *************** *** 409,413 **** + "TYPECODE = " + allergy.getTYPECODE() + ", " + "reaction = '" + allergy.getReaction() + "', " ! + "drugref_id = '" + allergy.getPickID() + "' " + "WHERE allergyid = " + this.getAllergyId(); --- 422,429 ---- + "TYPECODE = " + allergy.getTYPECODE() + ", " + "reaction = '" + allergy.getReaction() + "', " ! + "drugref_id = '" + allergy.getPickID() + "' " ! + "age_of_onset ='"+allergy.getAgeOfOnset()+"'," ! + "severity_of_reaction = '"+allergy.getSeverityOfReaction()+"'," ! + "onset_of_reaction = '"+allergy.getOnSetOfReaction()+"' " + "WHERE allergyid = " + this.getAllergyId(); |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:16:46
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26703 Modified Files: RxCodesData.java Log Message: Class has been changed to handle fractions in the dailymin and dailymax. This is how weekly and monthly values are handled ie 1/7 is once a week Index: RxCodesData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxCodesData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxCodesData.java 5 Feb 2004 19:53:10 -0000 1.1 --- RxCodesData.java 20 Apr 2005 20:16:32 -0000 1.2 *************** *** 46,50 **** while (rs.next()) { ! lst.add(new FrequencyCode(rs.getInt("freqid"), rs.getString("freqcode"), rs.getInt("dailymin"), rs.getInt("dailymax"))); } --- 46,50 ---- while (rs.next()) { ! lst.add(new FrequencyCode(rs.getInt("freqid"), rs.getString("freqcode"), rs.getString("dailymin"), rs.getString("dailymax"))); } *************** *** 103,116 **** int freqId; String freqCode; ! int dailyMin; ! int dailyMax; public FrequencyCode(int freqId, String freqCode, int dailyMin, int dailyMax) { this.freqId=freqId; this.freqCode=freqCode; ! this.dailyMin=dailyMin; ! this.dailyMax=dailyMax; } public int getFreqId() { return this.freqId; --- 103,123 ---- int freqId; String freqCode; ! String dailyMin; ! String dailyMax; public FrequencyCode(int freqId, String freqCode, int dailyMin, int dailyMax) { this.freqId=freqId; this.freqCode=freqCode; ! this.dailyMin= Integer.toString(dailyMin); ! this.dailyMax= Integer.toString(dailyMax); } + public FrequencyCode(int freqId, String freqCode, String dailyMin, String dailyMax) { + this.freqId=freqId; + this.freqCode=freqCode; + this.dailyMin= dailyMin; + this.dailyMax= dailyMax; + } + public int getFreqId() { return this.freqId; *************** *** 121,129 **** } ! public int getDailyMin() { return this.dailyMin; } ! public int getDailyMax() { return this.dailyMax; } --- 128,136 ---- } ! public String getDailyMin() { return this.dailyMin; } ! public String getDailyMax() { return this.dailyMax; } |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:15:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26156 Modified Files: oscardata.sql Log Message: more data was added to the ctl_frequency table Index: oscardata.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** oscardata.sql 18 Nov 2004 22:01:03 -0000 1.35 --- oscardata.sql 20 Apr 2005 20:14:47 -0000 1.36 *************** *** 139,142 **** --- 139,146 ---- INSERT INTO ctl_frequency VALUES (15,'QPM',1,1); INSERT INTO ctl_frequency VALUES (16,'QHS',1,1); + INSERT INTO ctl_frequency VALUES (17,'Q1Week','1/7','1/7'); + INSERT INTO ctl_frequency VALUES (18,'Q2Week','1/14','1/14'); + INSERT INTO ctl_frequency VALUES (19,'Q1Month','1/30','1/30'); + INSERT INTO ctl_frequency VALUES (20,'Q3Month','1/90','1/90'); -- |
|
From: Jay G. <jay...@us...> - 2005-04-20 20:14:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25872 Modified Files: oscarinit.sql Log Message: new changes for OSCAR RX tables changed: ctl_frequency, favorites, drugs, allergies Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** oscarinit.sql 21 Mar 2005 19:00:00 -0000 1.75 --- oscarinit.sql 20 Apr 2005 20:13:47 -0000 1.76 *************** *** 36,39 **** --- 36,43 ---- reaction text, drugref_id varchar(100) default NULL, + archived char(1) default '0', + age_of_onset char(4) default '0', + severity_of_reaction char(1) default '0', + onset_of_reaction char(1) default '0', PRIMARY KEY (allergyid) ) TYPE=MyISAM; *************** *** 350,359 **** CREATE TABLE ctl_frequency ( freqid tinyint(4) NOT NULL auto_increment, ! freqcode char(6) NOT NULL default '', ! dailymin tinyint(4) NOT NULL default '0', ! dailymax tinyint(4) NOT NULL default '0', PRIMARY KEY (freqid) ) TYPE=MyISAM; -- -- Table structure for table `ctl_provider` --- 354,365 ---- CREATE TABLE ctl_frequency ( freqid tinyint(4) NOT NULL auto_increment, ! freqcode varchar(8) NOT NULL default '', ! dailymin varchar(5) NOT NULL default '0', ! dailymax varchar(5) NOT NULL default '0', PRIMARY KEY (freqid) ) TYPE=MyISAM; + + -- -- Table structure for table `ctl_provider` *************** *** 556,559 **** --- 562,569 ---- script_no int(10) default NULL, regional_identifier varchar(100) default NULL, + unit varchar(5) default 'tab', + method varchar(5) default 'Take', + route varchar(5) default 'PO', + create_date datetime, PRIMARY KEY (drugid) ) TYPE=MyISAM; *************** *** 747,750 **** --- 757,763 ---- ATC varchar(255) default NULL, regional_identifier varchar(100) default NULL, + unit varchar(5) default 'tab', + method varchar(5) default 'Take', + route varchar(5) default 'PO', PRIMARY KEY (favoriteid) ) TYPE=MyISAM; |
|
From: Jay G. <jay...@us...> - 2005-04-20 18:48:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13013 Modified Files: RxDrugRef.java Log Message: Changed how it sets drugref_url from using System.getProperty to the OscarProperties Class Index: RxDrugRef.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/util/RxDrugRef.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RxDrugRef.java 11 Mar 2005 19:58:02 -0000 1.2 --- RxDrugRef.java 20 Apr 2005 18:48:37 -0000 1.3 *************** *** 34,37 **** --- 34,39 ---- import org.apache.xmlrpc.*; import java.text.*; + import oscar.*; + /** * *************** *** 46,50 **** /** Creates a new instance of DrugRef */ public RxDrugRef() { ! server_url = System.getProperty("drugref_url"); } --- 48,53 ---- /** Creates a new instance of DrugRef */ public RxDrugRef() { ! server_url = OscarProperties.getInstance().getProperty("drugref_url"); ! //server_url = System.getProperty("drugref_url"); } *************** *** 310,313 **** --- 313,317 ---- Object object = null; try{ + System.out.println("server_url :"+server_url); XmlRpcClientLite server = new XmlRpcClientLite(server_url); object = (Object) server.execute(procedureName, params); |
|
From: Jay G. <jay...@us...> - 2005-04-20 18:46:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11796 Modified Files: LoginAction.java Log Message: remove call to set System Property for drugref_url. now uses OscarProperties to find that value Index: LoginAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/LoginAction.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** LoginAction.java 28 Dec 2004 18:27:20 -0000 1.13 --- LoginAction.java 20 Apr 2005 18:46:14 -0000 1.14 *************** *** 98,102 **** session.setAttribute("oscarVariables", pvar); oscar.oscarDB.DBHandler.init(pvar.getProperty("db_name"),pvar.getProperty("db_driver"),pvar.getProperty("db_uri"),pvar.getProperty("db_username"),pvar.getProperty("db_password") ) ; ! System.setProperty("drugref_url",pvar.getProperty("drugref_url")); //get View Type String viewType = LoginViewTypeHlp.getInstance().getProperty(strAuth[3].toLowerCase()); --- 98,102 ---- session.setAttribute("oscarVariables", pvar); oscar.oscarDB.DBHandler.init(pvar.getProperty("db_name"),pvar.getProperty("db_driver"),pvar.getProperty("db_uri"),pvar.getProperty("db_username"),pvar.getProperty("db_password") ) ; ! //get View Type String viewType = LoginViewTypeHlp.getInstance().getProperty(strAuth[3].toLowerCase()); |
|
From: Jay G. <jay...@us...> - 2005-04-20 18:12:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24513 Modified Files: struts-config.xml Log Message: change for action DocumentErrorReportUpload Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** struts-config.xml 14 Mar 2005 00:13:09 -0000 1.62 --- struts-config.xml 20 Apr 2005 18:12:12 -0000 1.63 *************** *** 356,360 **** <!-- OscarBilling ON start--> <form-bean name="BillingDocumentErrorReportUploadForm" ! type="oscar.oscarBilling.pageUtil.BillingDocumentErrorReportUploadForm"/> <!-- OscarBilling ON stop --> --- 356,360 ---- <!-- OscarBilling ON start--> <form-bean name="BillingDocumentErrorReportUploadForm" ! type="oscar.oscarBilling.ca.on.pageUtil.BillingDocumentErrorReportUploadForm"/> <!-- OscarBilling ON stop --> *************** *** 375,378 **** --- 375,382 ---- </form-beans> + + <!--form-bean name="AddDemographicKeyValueForm" + type="oscar.oscarDemographic.pageUtil.AddDemographicKeyValueForm"/--> + <!-- ========== Global Forward Definitions ============================== --> *************** *** 1739,1747 **** <!-- oscarBilling BC end --> <!-- oscarBilling ON start --> <action path="/oscarBilling/DocumentErrorReportUpload" ! type="oscar.oscarBilling.pageUtil.BillingDocumentErrorReportUploadAction" name="BillingDocumentErrorReportUploadForm" scope="request" --- 1743,1758 ---- + <!--action path="/demographic/AddDemographicKeyValue" + type="oscar.oscarDemographic.pageUtil.AddDemographicKeyValueAction" + name="AddDemographicKeyValueForm" + scope="request"> + <forward name="success" path="/demographic/demographicExt.jsp"/> + </action--> + <!-- oscarBilling BC end --> <!-- oscarBilling ON start --> <action path="/oscarBilling/DocumentErrorReportUpload" ! type="oscar.oscarBilling.ca.on.pageUtil.BillingDocumentErrorReportUploadAction" name="BillingDocumentErrorReportUploadForm" scope="request" *************** *** 1794,1798 **** <!-- oscarWaitingList end --> <!--PDF Label Printing --> ! <action path="/demographic/printDemoLabelAction" type="oscar.oscarDemographic.PrintDemoLabelAction" /> </action-mappings> --- 1805,1813 ---- <!-- oscarWaitingList end --> <!--PDF Label Printing --> ! <action path="/demographic/printDemoLabelAction" ! type="oscar.oscarDemographic.PrintDemoLabelAction" /> ! ! ! </action-mappings> |
|
From: joel <jl...@us...> - 2005-04-20 04:29:51
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6769/RourkeVacsMigrator Modified Files: RourkeVacsMigrator.jar Log Message: Modified query string Index: RourkeVacsMigrator.jar =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/RourkeVacsMigrator.jar,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 Binary files /tmp/cvsPiNoBE and /tmp/cvsxdmHpH differ |
|
From: Jay G. <jay...@us...> - 2005-04-20 04:28:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6126 Modified Files: oscarResources_en.properties Log Message: updated key demographic.demographiceditdemographic.btnCreatePDFLabel to PDF Label from Create PDF Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.135 retrieving revision 1.136 diff -C2 -d -r1.135 -r1.136 *** oscarResources_en.properties 18 Apr 2005 19:41:55 -0000 1.135 --- oscarResources_en.properties 20 Apr 2005 04:27:59 -0000 1.136 *************** *** 852,856 **** demographic.demographicprintdemographic.btnPrint=Print demographic.demographicprintdemographic.title=_ ! demographic.demographiceditdemographic.btnCreatePDFLabel=Create PDF global.msgSomethingWrong=OSCAR has encountered an unexpected error --- 852,856 ---- demographic.demographicprintdemographic.btnPrint=Print demographic.demographicprintdemographic.title=_ ! demographic.demographiceditdemographic.btnCreatePDFLabel=PDF Label global.msgSomethingWrong=OSCAR has encountered an unexpected error |
|
From: Jay G. <jay...@us...> - 2005-04-20 04:26:31
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5583 Modified Files: oscarResources_pt_BR.properties Log Message: add key demographic.demographiceditdemographic.btnCreatePDFLabel=PDF Label still need translation Index: oscarResources_pt_BR.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pt_BR.properties,v retrieving revision 1.98 retrieving revision 1.99 diff -C2 -d -r1.98 -r1.99 *** oscarResources_pt_BR.properties 18 Apr 2005 19:40:23 -0000 1.98 --- oscarResources_pt_BR.properties 20 Apr 2005 04:26:22 -0000 1.99 *************** *** 857,860 **** --- 857,861 ---- demographic.demographicprintdemographic.btnPrint=Imprimir demographic.demographicprintdemographic.title=_ + demographic.demographiceditdemographic.btnCreatePDFLabel=PDF Label global.msgSomethingWrong=Algo de errado aconteceu! ^=^ |
|
From: Jay G. <jay...@us...> - 2005-04-20 03:59:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25460 Modified Files: RourkeVacsMigrator.py Log Message: removed slash after database name in the jdbc:mysql string Index: RourkeVacsMigrator.py =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/RourkeVacsMigrator.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RourkeVacsMigrator.py 25 Mar 2005 23:13:23 -0000 1.3 --- RourkeVacsMigrator.py 20 Apr 2005 03:59:45 -0000 1.4 *************** *** 107,111 **** try: Class.forName(self.db_driver) ! cs = self.db_uri+"/" + self.db_name + "/?user="+self.db_username+"&password="+self.db_password print cs return DriverManager.getConnection(cs) --- 107,111 ---- try: Class.forName(self.db_driver) ! cs = self.db_uri+"/" + self.db_name + "?user="+self.db_username+"&password="+self.db_password print cs return DriverManager.getConnection(cs) |
|
From: Jay G. <jay...@us...> - 2005-04-18 19:55:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16903 Modified Files: DisplayMessages.jsp Log Message: page changed to show a limited number of messages by default thanks Justin George Index: DisplayMessages.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/DisplayMessages.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DisplayMessages.jsp 10 Nov 2004 18:36:03 -0000 1.5 --- DisplayMessages.jsp 18 Apr 2005 19:55:08 -0000 1.6 *************** *** 56,63 **** } String orderby = (String) session.getAttribute("orderby"); - - %> - <logic:notPresent name="msgSessionBean" scope="session"> --- 56,66 ---- } String orderby = (String) session.getAttribute("orderby"); + String moreMessages="false"; + if (request.getParameter("moreMessages") != null){ + moreMessages=request.getParameter("moreMessages"); + } + final int INITIAL_DISPLAY=20; + %> <logic:notPresent name="msgSessionBean" scope="session"> *************** *** 239,260 **** </th> <th align="left" bgcolor="#DDDDFF"> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=status" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgStatus"/> ! </html:link> </th> <th align="left" bgcolor="#DDDDFF"> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=from" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgFrom"/> ! </html:link> </th> <th align="left" bgcolor="#DDDDFF"> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=subject" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgSubject"/> ! </html:link> </th> <th align="left" bgcolor="#DDDDFF"> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=date" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgDate"/> ! </html:link> </th> </tr> --- 242,287 ---- </th> <th align="left" bgcolor="#DDDDFF"> ! <% if (moreMessages.equals("true")){%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=status&moreMessages=true" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgStatus"/> ! </html:link> ! <%}else{%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=status&moreMessages=false" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgStatus"/> ! </html:link> ! <%}%> </th> <th align="left" bgcolor="#DDDDFF"> ! <% if (moreMessages.equals("true")){%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=from&moreMessages=true" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgFrom"/> ! </html:link> ! <%}else{%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=from&moreMessages=false" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgFrom"/> ! </html:link> ! <%}%> </th> <th align="left" bgcolor="#DDDDFF"> ! <% if (moreMessages.equals("true")){%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=subject&moreMessages=true" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgSubject"/> ! </html:link> ! <%}else{%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=subject&moreMessages=false" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgSubject"/> ! </html:link> ! <%}%> </th> <th align="left" bgcolor="#DDDDFF"> ! <% if (moreMessages.equals("true")){%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=date&moreMessages=true" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgDate"/> ! </html:link> ! <%}else{%> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?orderby=date&moreMessages=false" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgDate"/> ! </html:link> ! <%}%> </th> </tr> *************** *** 264,268 **** case 0: // theMessages = DisplayMessagesBeanId.getMessageid(); ! theMessages2 = DisplayMessagesBeanId.estInbox(orderby); // System.out.println("normal messages"); break; --- 291,295 ---- case 0: // theMessages = DisplayMessagesBeanId.getMessageid(); ! theMessages2 = DisplayMessagesBeanId.estInbox(orderby,moreMessages,INITIAL_DISPLAY); // System.out.println("normal messages"); break; *************** *** 279,284 **** } //messageid %> ! ! <%for (int i = 0; i < theMessages2.size() ; i++) { oscar.oscarMessenger.data.MsgDisplayMessage dm; dm = (oscar.oscarMessenger.data.MsgDisplayMessage) theMessages2.get(i); --- 306,311 ---- } //messageid %> ! <!-- for loop Control Initiliation variabe changed to nextMessage --> ! <%for (int i = 0; i < theMessages2.size() ; i++) { oscar.oscarMessenger.data.MsgDisplayMessage dm; dm = (oscar.oscarMessenger.data.MsgDisplayMessage) theMessages2.get(i); *************** *** 322,331 **** </tr> <%}%> ! </table> ! <%if (pageType == 0){%> ! <input type="submit" value="<bean:message key="oscarMessenger.DisplayMessages.formDelete"/>"> ! <%}else if (pageType == 2){%> ! <input type="submit" value="<bean:message key="oscarMessenger.DisplayMessages.formUndelete"/>"> ! <%}%> </html:form> </td> --- 349,375 ---- </tr> <%}%> ! </table> ! <table width="80%"> ! <tr> ! <td> ! <%if (pageType == 0){%> ! <input type="submit" value="<bean:message key="oscarMessenger.DisplayMessages.formDelete"/>"> ! <%}else if (pageType == 2){%> ! <input type="submit" value="<bean:message key="oscarMessenger.DisplayMessages.formUndelete"/>"> ! <%}%> ! </td> ! <% ! if (moreMessages.equals("false") && pageType==0 && theMessages2.size()>=INITIAL_DISPLAY){ ! %> ! <td width="60%"></td> ! <td align="left"> ! <html:link page="/oscarMessenger/DisplayMessages.jsp?moreMessages=true" paramId="boxType" paramName="pageType"> ! <bean:message key="oscarMessenger.DisplayMessages.msgAllMessage"/> ! </html:link> ! </td> ! <%}%> ! </tr> ! </table> ! </html:form> </td> |
|
From: Jay G. <jay...@us...> - 2005-04-18 19:46:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10572 Modified Files: MsgDisplayMessagesBean.java Log Message: estInbox changed to show a limited number of messages thanks Justin George Index: MsgDisplayMessagesBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDisplayMessagesBean.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MsgDisplayMessagesBean.java 5 Apr 2005 01:35:13 -0000 1.7 --- MsgDisplayMessagesBean.java 18 Apr 2005 19:46:06 -0000 1.8 *************** *** 268,275 **** } //INBOX ! public java.util.Vector estInbox(String orderby){ String providerNo= this.getProviderNo(); java.util.Vector msg = new java.util.Vector(); --- 268,276 ---- } //INBOX ! public java.util.Vector estInbox(String orderby,String moreMessages,int initialDisplay){ String providerNo= this.getProviderNo(); java.util.Vector msg = new java.util.Vector(); + *************** *** 277,289 **** DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); java.sql.ResultSet rs; ! String sql = new String("select ml.message, ml.status, m.thesubject, m.thedate, m.attachment, m.sentby from messagelisttbl ml, messagetbl m " +" where provider_no = '"+ providerNo+"' and status not like \'del\' and remoteLocation = '"+getCurrentLocationId()+"' " ! +" and ml.message = m.messageid order by "+getOrderBy(orderby)); rs = db.GetSQL(sql); while (rs.next()) { - oscar.oscarMessenger.data.MsgDisplayMessage dm = new oscar.oscarMessenger.data.MsgDisplayMessage(); dm.status = rs.getString("status"); --- 278,293 ---- DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); java.sql.ResultSet rs; ! String messageLimit=""; ! ! if (moreMessages.equals("false")) ! {messageLimit=" Limit "+initialDisplay;} ! String sql = new String("select ml.message, ml.status, m.thesubject, m.thedate, m.attachment, m.sentby from messagelisttbl ml, messagetbl m " +" where provider_no = '"+ providerNo+"' and status not like \'del\' and remoteLocation = '"+getCurrentLocationId()+"' " ! +" and ml.message = m.messageid order by "+getOrderBy(orderby)+messageLimit); rs = db.GetSQL(sql); while (rs.next()) { oscar.oscarMessenger.data.MsgDisplayMessage dm = new oscar.oscarMessenger.data.MsgDisplayMessage(); dm.status = rs.getString("status"); *************** *** 316,319 **** --- 320,328 ---- //////////////////////////////////////////////////////////////////////////////// // + + public java.util.Vector estInbox(String orderby){ + return estInbox(null); + } + ////////////////////////////////////////////////////////////////////////////////// public java.util.Vector estDeletedInbox(){ return estDeletedInbox(null); |
|
From: Jay G. <jay...@us...> - 2005-04-18 19:42:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8285 Modified Files: oscarResources_en.properties Log Message: add key oscarMessenger.DisplayMessages.msgAllMessage=All Messages Index: oscarResources_en.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** oscarResources_en.properties 17 Mar 2005 20:07:10 -0000 1.134 --- oscarResources_en.properties 18 Apr 2005 19:41:55 -0000 1.135 *************** *** 2301,2304 **** --- 2301,2307 ---- oscarMessenger.DisplayMessages.formDelete=delete oscarMessenger.DisplayMessages.formUndelete=undelete + oscarMessenger.DisplayMessages.msgNextMessage=Next Messages + oscarMessenger.DisplayMessages.msgAllMessage=All Messages + oscarMessenger.CreateMessage.title=createMessage |
|
From: Jay G. <jay...@us...> - 2005-04-18 19:40:32
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7071 Modified Files: oscarResources_pt_BR.properties Log Message: add key oscarMessenger.DisplayMessages.msgAllMessage=All Messages still needs translation Index: oscarResources_pt_BR.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pt_BR.properties,v retrieving revision 1.97 retrieving revision 1.98 diff -C2 -d -r1.97 -r1.98 *** oscarResources_pt_BR.properties 17 Mar 2005 20:09:15 -0000 1.97 --- oscarResources_pt_BR.properties 18 Apr 2005 19:40:23 -0000 1.98 *************** *** 2293,2296 **** --- 2293,2298 ---- oscarMessenger.DisplayMessages.formDelete=Remover oscarMessenger.DisplayMessages.formUndelete=Recuperar + oscarMessenger.DisplayMessages.msgNextMessage=Next Messages + oscarMessenger.DisplayMessages.msgAllMessage=All Messages oscarMessenger.CreateMessage.title=Compor Mensagem |
|
From: Yi Li <yi...@us...> - 2005-04-17 05:04:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29166/form Modified Files: formGrowthChartPrint.jsp Log Message: update Index: formGrowthChartPrint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formGrowthChartPrint.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** formGrowthChartPrint.jsp 13 Apr 2005 15:02:30 -0000 1.1 --- formGrowthChartPrint.jsp 17 Apr 2005 05:04:28 -0000 1.2 *************** *** 68,92 **** <form id="growth" name="growth" action="../form/createpdf" method="post"> <% for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) { String temp = e.nextElement().toString(); if("submit".equals(temp) || "__cfgGraphicFile".equals(temp) ) continue; - String tempName = temp; if(temp.matches("date_\\d+|age_\\d+|stature_\\d+|weight_\\d+|comment_\\d+|bmi_\\d+") ) { ! //System.out.println(temp); ! String[] str = temp.split("date_|age_|stature_|weight_|comment_|bmi_"); ! for(int i=0; i<str.length; i++) { ! //System.out.println(temp + " : " + str[i]); ! } ! int nC = Integer.parseInt(str[1]); ! if(nC<nS || nC>nE) continue; ! else { ! // set tempName = 1 - 7 ! nC = nC - ((n-1)*(nE-nS+1)); ! tempName = temp.substring(0, temp.indexOf("_")+1) + nC; ! System.out.println(temp + " : " + tempName); ! } } %> ! <input type="hidden" name="<%= tempName %>" value="<%=StringEscapeUtils.escapeHtml(request.getParameter(temp))%>" /> <% } --- 68,108 ---- <form id="growth" name="growth" action="../form/createpdf" method="post"> <% + Properties prop = new Properties(); for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) { String temp = e.nextElement().toString(); if("submit".equals(temp) || "__cfgGraphicFile".equals(temp) ) continue; if(temp.matches("date_\\d+|age_\\d+|stature_\\d+|weight_\\d+|comment_\\d+|bmi_\\d+") ) { ! prop.setProperty(temp, request.getParameter(temp)); ! continue; } %> ! <input type="hidden" name="<%= temp %>" value="<%=StringEscapeUtils.escapeHtml(request.getParameter(temp))%>" /> ! <% ! } ! %> ! <% ! for (Enumeration e = prop.propertyNames() ; e.hasMoreElements() ;) { ! String temp = e.nextElement().toString(); ! //System.out.println(temp); ! String[] str = temp.split("date_|age_|stature_|weight_|comment_|bmi_"); ! int nC = Integer.parseInt(str[1]); ! if(nC>=nS && nC<=nE) { ! // swap: set tempName = 1 - 7 ! nC = nC - ((n-1)*(nE-nS+1)); ! String newName = temp.substring(0, temp.indexOf("_")+1) + nC; ! String newValue = prop.getProperty(temp, ""); ! // 1-7 change to nS-nE ! String baseName = temp; ! String baseValue = prop.getProperty(newName, ""); ! prop.setProperty(newName,newValue); ! prop.setProperty(baseName,baseValue); ! //System.out.println(temp + " : " + tempName); ! } ! } ! ! for (Enumeration e = prop.propertyNames() ; e.hasMoreElements() ;) { ! String temp = e.nextElement().toString(); ! %> ! <input type="hidden" name="<%= temp %>" value="<%=StringEscapeUtils.escapeHtml(prop.getProperty(temp, ""))%>" /> <% } |
|
From: Yi Li <yi...@us...> - 2005-04-17 05:04:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28951/WEB-INF/classes/src/oscar/form/prop Modified Files: growthChartGirlGraphic2.txt growthChartBoyGraphic.txt growthChartBoyGraphic2.txt growthChartGirlGraphic.txt growthChartBoyGraphicBMI.txt growthChartGirlGraphicBMI.txt Log Message: update Index: growthChartBoyGraphic2.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/growthChartBoyGraphic2.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** growthChartBoyGraphic2.txt 3 Apr 2005 06:16:37 -0000 1.1 --- growthChartBoyGraphic2.txt 17 Apr 2005 05:03:53 -0000 1.2 *************** *** 6,18 **** age_6 : weight_6 age_7 : weight_7 __origX : 110 __origY : 721 __nMaxPixX : 386 ! __nMaxPixY : 400 __fStartX : 2 __fEndX : 20 __fStartY : 6 ! __fEndY : 105 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart \ No newline at end of file --- 6,53 ---- age_6 : weight_6 age_7 : weight_7 + age_8 : weight_8 + age_9 : weight_9 + age_10 : weight_10 + age_11 : weight_11 + age_12 : weight_12 + age_13 : weight_13 + age_14 : weight_14 + age_15 : weight_15 + age_16 : weight_16 + age_17 : weight_17 + age_18 : weight_18 + age_19 : weight_19 + age_20 : weight_20 + age_21 : weight_21 + age_22 : weight_22 + age_23 : weight_23 + age_24 : weight_24 + age_25 : weight_25 + age_26 : weight_26 + age_27 : weight_27 + age_28 : weight_28 + age_29 : weight_29 + age_30 : weight_30 + age_31 : weight_31 + age_32 : weight_32 + age_33 : weight_33 + age_34 : weight_34 + age_35 : weight_35 + age_36 : weight_36 + age_37 : weight_37 + age_38 : weight_38 + age_39 : weight_39 + age_40 : weight_40 + age_41 : weight_41 + age_42 : weight_42 __origX : 110 __origY : 721 __nMaxPixX : 386 ! __nMaxPixY : 582 __fStartX : 2 __fEndX : 20 __fStartY : 6 ! __fEndY : 150 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart \ No newline at end of file Index: growthChartBoyGraphic.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/growthChartBoyGraphic.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** growthChartBoyGraphic.txt 3 Apr 2005 06:16:37 -0000 1.1 --- growthChartBoyGraphic.txt 17 Apr 2005 05:03:53 -0000 1.2 *************** *** 6,9 **** --- 6,44 ---- age_6 : stature_6 age_7 : stature_7 + age_8 : stature_8 + age_9 : stature_9 + age_10 : stature_10 + age_11 : stature_11 + age_12 : stature_12 + age_13 : stature_13 + age_14 : stature_14 + age_15 : stature_15 + age_16 : stature_16 + age_17 : stature_17 + age_18 : stature_18 + age_19 : stature_19 + age_20 : stature_20 + age_21 : stature_21 + age_22 : stature_22 + age_23 : stature_23 + age_24 : stature_24 + age_25 : stature_25 + age_26 : stature_26 + age_27 : stature_27 + age_28 : stature_28 + age_29 : stature_29 + age_30 : stature_30 + age_31 : stature_31 + age_32 : stature_32 + age_33 : stature_33 + age_34 : stature_34 + age_35 : stature_35 + age_36 : stature_36 + age_37 : stature_37 + age_38 : stature_38 + age_39 : stature_39 + age_40 : stature_40 + age_41 : stature_41 + age_42 : stature_42 __origX : 110 Index: growthChartGirlGraphicBMI.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/growthChartGirlGraphicBMI.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** growthChartGirlGraphicBMI.txt 3 Apr 2005 06:16:37 -0000 1.1 --- growthChartGirlGraphicBMI.txt 17 Apr 2005 05:03:53 -0000 1.2 *************** *** 6,9 **** --- 6,44 ---- age_6 : bmi_6 age_7 : bmi_7 + age_8 : bmi_8 + age_9 : bmi_9 + age_10 : bmi_10 + age_11 : bmi_11 + age_12 : bmi_12 + age_13 : bmi_13 + age_14 : bmi_14 + age_15 : bmi_15 + age_16 : bmi_16 + age_17 : bmi_17 + age_18 : bmi_18 + age_19 : bmi_19 + age_20 : bmi_20 + age_21 : bmi_21 + age_22 : bmi_22 + age_23 : bmi_23 + age_24 : bmi_24 + age_25 : bmi_25 + age_26 : bmi_26 + age_27 : bmi_27 + age_28 : bmi_28 + age_29 : bmi_29 + age_30 : bmi_30 + age_31 : bmi_31 + age_32 : bmi_32 + age_33 : bmi_33 + age_34 : bmi_34 + age_35 : bmi_35 + age_36 : bmi_36 + age_37 : bmi_37 + age_38 : bmi_38 + age_39 : bmi_39 + age_40 : bmi_40 + age_41 : bmi_41 + age_42 : bmi_42 __origX : 82 Index: growthChartGirlGraphic.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/growthChartGirlGraphic.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** growthChartGirlGraphic.txt 3 Apr 2005 06:16:37 -0000 1.1 --- growthChartGirlGraphic.txt 17 Apr 2005 05:03:53 -0000 1.2 *************** *** 6,9 **** --- 6,44 ---- age_6 : stature_6 age_7 : stature_7 + age_8 : stature_8 + age_9 : stature_9 + age_10 : stature_10 + age_11 : stature_11 + age_12 : stature_12 + age_13 : stature_13 + age_14 : stature_14 + age_15 : stature_15 + age_16 : stature_16 + age_17 : stature_17 + age_18 : stature_18 + age_19 : stature_19 + age_20 : stature_20 + age_21 : stature_21 + age_22 : stature_22 + age_23 : stature_23 + age_24 : stature_24 + age_25 : stature_25 + age_26 : stature_26 + age_27 : stature_27 + age_28 : stature_28 + age_29 : stature_29 + age_30 : stature_30 + age_31 : stature_31 + age_32 : stature_32 + age_33 : stature_33 + age_34 : stature_34 + age_35 : stature_35 + age_36 : stature_36 + age_37 : stature_37 + age_38 : stature_38 + age_39 : stature_39 + age_40 : stature_40 + age_41 : stature_41 + age_42 : stature_42 __origX : 110 Index: growthChartGirlGraphic2.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/growthChartGirlGraphic2.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** growthChartGirlGraphic2.txt 3 Apr 2005 06:16:37 -0000 1.1 --- growthChartGirlGraphic2.txt 17 Apr 2005 05:03:53 -0000 1.2 *************** *** 6,18 **** age_6 : weight_6 age_7 : weight_7 __origX : 110 __origY : 721 __nMaxPixX : 386 ! __nMaxPixY : 400 __fStartX : 2 __fEndX : 20 __fStartY : 6 ! __fEndY : 105 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart \ No newline at end of file --- 6,53 ---- age_6 : weight_6 age_7 : weight_7 + age_8 : weight_8 + age_9 : weight_9 + age_10 : weight_10 + age_11 : weight_11 + age_12 : weight_12 + age_13 : weight_13 + age_14 : weight_14 + age_15 : weight_15 + age_16 : weight_16 + age_17 : weight_17 + age_18 : weight_18 + age_19 : weight_19 + age_20 : weight_20 + age_21 : weight_21 + age_22 : weight_22 + age_23 : weight_23 + age_24 : weight_24 + age_25 : weight_25 + age_26 : weight_26 + age_27 : weight_27 + age_28 : weight_28 + age_29 : weight_29 + age_30 : weight_30 + age_31 : weight_31 + age_32 : weight_32 + age_33 : weight_33 + age_34 : weight_34 + age_35 : weight_35 + age_36 : weight_36 + age_37 : weight_37 + age_38 : weight_38 + age_39 : weight_39 + age_40 : weight_40 + age_41 : weight_41 + age_42 : weight_42 __origX : 110 __origY : 721 __nMaxPixX : 386 ! __nMaxPixY : 582 __fStartX : 2 __fEndX : 20 __fStartY : 6 ! __fEndY : 150 __className : oscar.form.graphic.FrmPdfGraphicGrowthChart \ No newline at end of file Index: growthChartBoyGraphicBMI.txt =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/growthChartBoyGraphicBMI.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** growthChartBoyGraphicBMI.txt 3 Apr 2005 06:16:37 -0000 1.1 --- growthChartBoyGraphicBMI.txt 17 Apr 2005 05:03:53 -0000 1.2 *************** *** 6,9 **** --- 6,44 ---- age_6 : bmi_6 age_7 : bmi_7 + age_8 : bmi_8 + age_9 : bmi_9 + age_10 : bmi_10 + age_11 : bmi_11 + age_12 : bmi_12 + age_13 : bmi_13 + age_14 : bmi_14 + age_15 : bmi_15 + age_16 : bmi_16 + age_17 : bmi_17 + age_18 : bmi_18 + age_19 : bmi_19 + age_20 : bmi_20 + age_21 : bmi_21 + age_22 : bmi_22 + age_23 : bmi_23 + age_24 : bmi_24 + age_25 : bmi_25 + age_26 : bmi_26 + age_27 : bmi_27 + age_28 : bmi_28 + age_29 : bmi_29 + age_30 : bmi_30 + age_31 : bmi_31 + age_32 : bmi_32 + age_33 : bmi_33 + age_34 : bmi_34 + age_35 : bmi_35 + age_36 : bmi_36 + age_37 : bmi_37 + age_38 : bmi_38 + age_39 : bmi_39 + age_40 : bmi_40 + age_41 : bmi_41 + age_42 : bmi_42 __origX : 82 |
