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-02-01 23:24:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11462 Modified Files: WriteScript.jsp Log Message: Added processing for 1/2 and 1/4 tabs in frequency Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WriteScript.jsp 5 Feb 2004 19:26:42 -0000 1.1 --- WriteScript.jsp 1 Feb 2005 23:24:29 -0000 1.2 *************** *** 80,84 **** frm.takeOther.style.display = ''; } ! var sTake = frm.takeOther.value; var s = sTake.split('-'); --- 80,92 ---- frm.takeOther.style.display = ''; } ! ! ! if (frm.take.value == '1/2'){ ! frm.takeOther.value = 0.5; ! } ! ! if (frm.take.value == '1/4'){ ! frm.takeOther.value = 0.25; ! } var sTake = frm.takeOther.value; var s = sTake.split('-'); *************** *** 93,97 **** sMax = s[1]; } ! if(isNaN(parseFloat(sMin))){ sMin = ''; --- 101,105 ---- sMax = s[1]; } ! if(isNaN(parseFloat(sMin))){ sMin = ''; *************** *** 586,589 **** --- 594,599 ---- <td colspan=2> <select name="take" style="width:72px" onChange="javascript:takeChg();"> + <option value="1/4">1/4</option> + <option value="1/2">1/2</option> <option value="1">1</option> <option value="1-2">1-2</option> *************** *** 616,619 **** --- 626,630 ---- var frm = document.forms.RxWriteScriptForm; + if(frm.takeMin.value == frm.takeMax.value){ frm.takeOther.value = frm.takeMin.value; *************** *** 621,626 **** frm.takeOther.value = (frm.takeMin.value + '-' + frm.takeMax.value); } ! ! frm.take.value = frm.takeOther.value; if(frm.take.value != frm.takeOther.value){ frm.take.value = 'Other'; --- 632,644 ---- frm.takeOther.value = (frm.takeMin.value + '-' + frm.takeMax.value); } ! ! if(frm.takeOther.value == '0.5'){ ! frm.takeOther.value = '1/2'; ! } ! ! if(frm.takeOther.value == '0.25'){ ! frm.takeOther.value == '1/4'; ! } ! frm.take.value = frm.takeOther.value; if(frm.take.value != frm.takeOther.value){ frm.take.value = 'Other'; *************** *** 777,781 **** <br> ! <!-- peice Went Here --> <script language=javascript> function submitPending(stashId, action){ --- 795,806 ---- <br> ! <!-- peice Went Here ! <div style="background-color:yellow;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ! ACETAMINOPHEN inhibits BENZODIAZEPINE, long acting SIGNIFICANCE = MINOR EVIDENCE = POOR ! </div> ! <div style="background-color:red;margin-right:100px;margin-left:20px;margin-top:1px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ! ACETAMINOPHEN inhibits BENZODIAZEPINE, long acting SIGNIFICANCE = MINOR EVIDENCE = POOR ! </div> ! --> <script language=javascript> function submitPending(stashId, action){ |
|
From: Jay G. <jay...@us...> - 2005-02-01 00:08:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10337 Modified Files: PrintDrugProfile.jsp Log Message: Changed current drugs to appear in bold font-weight Index: PrintDrugProfile.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/PrintDrugProfile.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** PrintDrugProfile.jsp 27 Oct 2004 14:41:04 -0000 1.1 --- PrintDrugProfile.jsp 1 Feb 2005 00:08:01 -0000 1.2 *************** *** 145,149 **** styleColor="style=\"color:red;text-decoration: line-through;\""; }else if (drug.isCurrent() && !drug.isArchived()) { ! styleColor="style=\"color:red;\""; }else if (!drug.isCurrent() && drug.isArchived()){ styleColor="style=\"text-decoration: line-through;\""; --- 145,149 ---- styleColor="style=\"color:red;text-decoration: line-through;\""; }else if (drug.isCurrent() && !drug.isArchived()) { ! styleColor="style=\"color:red;font-weight:bold;\""; }else if (!drug.isCurrent() && drug.isArchived()){ styleColor="style=\"text-decoration: line-through;\""; |
|
From: Ivy C. <ic...@us...> - 2005-01-31 21:37:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2067 Modified Files: oscarinit.sql Log Message: updated formVTForm: removed CAD and seperated them into MI, Angina, ACS and revascularization Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.69 retrieving revision 1.70 diff -C2 -d -r1.69 -r1.70 *** oscarinit.sql 30 Jan 2005 01:51:07 -0000 1.69 --- oscarinit.sql 31 Jan 2005 21:36:49 -0000 1.70 *************** *** 4802,4806 **** HTNValue varchar(10), HchlValue varchar(10), ! CADValue varchar(10), CVDValue varchar(10), PVDValue varchar(10), --- 4802,4809 ---- HTNValue varchar(10), HchlValue varchar(10), ! MIValue varchar(10), ! AngValue varchar(10), ! ACSValue varchar(10), ! RVTNValue varchar(10), CVDValue varchar(10), PVDValue varchar(10), *************** *** 4816,4819 **** --- 4819,4824 ---- ) TYPE=MyISAM; + + -- -- Table structure for table `groupMembers_tbl` |
|
From: Ivy C. <ic...@us...> - 2005-01-31 21:34:24
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1395 Modified Files: FrmFormAction.java Log Message: updated to not to set any empty check box to "no" value Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** FrmFormAction.java 28 Jan 2005 18:18:21 -0000 1.26 --- FrmFormAction.java 31 Jan 2005 21:34:10 -0000 1.27 *************** *** 191,200 **** comments = org.apache.commons.lang.StringEscapeUtils.escapeSql(comments); ! //parse the checkbox value inputValue = parseCheckBoxValue(inputValue, validation.getName()); //Write to Measurement Table ! System.out.println("write2Measurement type: " + type + " inputValue: " + inputValue); if(inputValue!=null){ if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) //System.out.println("write to measurement table: " + mt.getType()); --- 191,200 ---- comments = org.apache.commons.lang.StringEscapeUtils.escapeSql(comments); ! System.out.println("type: " + type + " inputValue: " + inputValue); //parse the checkbox value inputValue = parseCheckBoxValue(inputValue, validation.getName()); //Write to Measurement Table ! //System.out.println("write2Measurement type: " + type + " inputValue: " + inputValue); if(inputValue!=null){ if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) //System.out.println("write to measurement table: " + mt.getType()); *************** *** 441,450 **** //System.out.println("validationName: " + validationName); if(validationName.equalsIgnoreCase("Yes/No")){ ! if(inputValue==null) inputValue="no"; ! else if (inputValue.equalsIgnoreCase("on")) ! inputValue="yes"; ! else if (inputValue.equalsIgnoreCase("off")) ! inputValue="no"; } return inputValue; --- 441,453 ---- //System.out.println("validationName: " + validationName); if(validationName.equalsIgnoreCase("Yes/No")){ ! /*if(inputValue==null) inputValue="no"; ! else*/ ! if(inputValue!=null){ ! if (inputValue.equalsIgnoreCase("on")) ! inputValue="yes"; ! else if (inputValue.equalsIgnoreCase("off")) ! inputValue="no"; ! } } return inputValue; |
|
From: Ivy C. <ic...@us...> - 2005-01-31 21:32:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv904 Modified Files: formVTForm.jsp Log Message: updated the form to disable EyeExam when DM is not true removed CAD and seperated them into MI, Angina, ACS and revascularization Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** formVTForm.jsp 30 Jan 2005 01:44:37 -0000 1.27 --- formVTForm.jsp 31 Jan 2005 21:32:04 -0000 1.28 *************** *** 173,180 **** var eyeExDate, eyeHypDate, eyeDiaDate, eyeOthDate, eyeRefDate; var MIValue, AngValue, ACSValue, RVTNValue, CADValue, DMValue, PVDValue; var HbA1Value, HbA1Date, HbA1Cmt; var DMCValue, DMCDate, DMCCmt; ! ! function onPrint() { --- 173,180 ---- var eyeExDate, eyeHypDate, eyeDiaDate, eyeOthDate, eyeRefDate; var MIValue, AngValue, ACSValue, RVTNValue, CADValue, DMValue, PVDValue; + var HTNValue, HchlValue, CVDValue; var HbA1Value, HbA1Date, HbA1Cmt; var DMCValue, DMCDate, DMCCmt; ! function onPrint() { *************** *** 439,442 **** --- 439,446 ---- case 'value(PVDValue)': PVDValue = i; break; + case 'value(HTNValue)': HTNValue = i; break; + case 'value(HchlValue)': HchlValue = i; break; + case 'value(CVDValue)': CVDValue = i; break; + case 'value(HbA1Value)': HbA1Value = i; break; case 'value(HbA1Date)': HbA1Date = i; break; *************** *** 450,457 **** } ! if(document.forms[0].elements[MIValue].value=="yes"||document.forms[0].elements[AngValue].value=="yes"||document.forms[0].elements[ACSValue].value=="yes"){ document.forms[0].elements[CADValue].value="yes"; ! } ! DMCheck(); PVDCheck(); --- 454,461 ---- } ! /*if(document.forms[0].elements[MIValue].value=="yes"||document.forms[0].elements[AngValue].value=="yes"||document.forms[0].elements[ACSValue].value=="yes"){ document.forms[0].elements[CADValue].value="yes"; ! }*/ ! DMCheck(); PVDCheck(); *************** *** 476,479 **** --- 480,497 ---- } + function disableEyeExam(control){ + document.forms[0].elements[eyeExId-1].disabled= control; + document.forms[0].elements[eyeHypId-1].disabled= control; + document.forms[0].elements[eyeDiaId-1].disabled= control; + document.forms[0].elements[eyeOthId-1].disabled= control; + document.forms[0].elements[eyeRefId-1].disabled= control; + + document.forms[0].elements[eyeExId].disabled= control; + document.forms[0].elements[eyeHypId].disabled= control; + document.forms[0].elements[eyeDiaId].disabled= control; + document.forms[0].elements[eyeOthId].disabled= control; + document.forms[0].elements[eyeRefId].disabled= control; + } + function DMCheck(){ if(document.forms[0].elements[DMValue].checked==false && document.forms[0].elements[PVDValue].checked==false){ *************** *** 484,487 **** --- 502,506 ---- } if(document.forms[0].elements[DMValue].checked==false){ + disableEyeExam(true); document.forms[0].elements[HbA1Value].disabled= true; document.forms[0].elements[HbA1Date].disabled= true; *************** *** 492,495 **** --- 511,515 ---- } else{ + disableEyeExam(false); document.forms[0].elements[HbA1Value].disabled= false; document.forms[0].elements[HbA1Date].disabled= false; *************** *** 510,513 **** --- 530,538 ---- } + function setCheckboxValue(id){ + if(document.forms[0].elements[id].checked==false){ + document.forms[0].elements[id].value="no"; + } + } function clearAll(yRadio, nRadio){ document.forms[0].elements[yRadio].checked=false; *************** *** 553,570 **** <table width="95%"> <tr> ! <td width="32%"> <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present> </td> ! <html:hidden property="value(MIValue)"/> ! <html:hidden property="value(AngValue)"/> ! <html:hidden property="value(ACSValue)"/> ! <html:hidden property="value(RVTNValue)"/> ! <td width="5%" class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/> DM</td> ! <td width="5%" class="sixtyPercent"><html:checkbox property="value(HTNValue)"/> HTN</td> ! <td width="5%" class="sixtyPercent"><html:checkbox property="value(HchlValue)"/> Hyperlipidemia</td> ! <td width="5%" class="sixtyPercent"><html:checkbox property="value(CADValue)"/> CAD</td> ! <td width="5%" class="sixtyPercent"><html:checkbox property="value(CVDValue)"/> CVD</td> ! <td width="5%" class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/> PVD</td> ! <td align="right">FP Visit Date (YYYY-MM-DD) <html:text size="8" property="value(visitCod)"/></td> </tr> </table> --- 578,621 ---- <table width="95%"> <tr> ! <td width="30%"> <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present> </td> ! <td> ! <table width="60%"> ! <tr> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(HTNValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(HchlValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(MIValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(AngValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(ACSValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(RVTNValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(CVDValue)"/></td> ! <td align="left" class="sixtyPercent"><html:checkbox property="value(PVDValue)" onclick="javascript: PVDCheck();"/></td> ! </tr> ! <tr> ! <td align="center" class="sixtyPercent"> DM</td> ! <td align="center" class="sixtyPercent"> HTN</td> ! <td align="center" class="sixtyPercent"> Hyperlipidemia</td> ! <td align="center" class="sixtyPercent"> MI</td> ! <td align="center" class="sixtyPercent"> Angina</td> ! <td align="center" class="sixtyPercent"> ACS</td> ! <td align="center" class="sixtyPercent"> Revascularization</td> ! <td align="center" class="sixtyPercent"> CVD</td> ! <td align="center" class="sixtyPercent"> PVD</td> ! </tr> ! </table> ! </td> ! <td align="right"> ! <table> ! <tr> ! <td>FP Visit Date</td> ! <td rowspan="2"> <html:text size="8" property="value(visitCod)"/></td> ! </tr> ! <tr> ! <td>(YYYY-MM-DD)</td> ! </tr> ! </table> ! </td> </tr> </table> |
|
From: Ivy C. <ic...@us...> - 2005-01-31 21:30:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv354 Modified Files: VTForm2Osdsf.properties Log Message: updated agnValue to angValue (angina) Index: VTForm2Osdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm2Osdsf.properties,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** VTForm2Osdsf.properties 27 Jan 2005 17:13:27 -0000 1.5 --- VTForm2Osdsf.properties 31 Jan 2005 21:29:48 -0000 1.6 *************** *** 97,101 **** ACSValue=BACS ! AgnValue=BAngina RVTNValue=BRevascularization --- 97,101 ---- ACSValue=BACS ! AngValue=BAngina RVTNValue=BRevascularization |
|
From: Jay G. <jay...@us...> - 2005-01-31 10:47:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv484 Modified Files: RxPharmacyData.java Log Message: changed so pharmacy list is now in alphabetical order Index: RxPharmacyData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPharmacyData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** RxPharmacyData.java 2 Oct 2004 15:30:10 -0000 1.1 --- RxPharmacyData.java 31 Jan 2005 10:47:06 -0000 1.2 *************** *** 225,229 **** DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs; ! String sql = "select max(recordID) as maxrec from pharmacyInfo where status = 1 group by ID"; rs = db.GetSQL(sql); while ( rs.next()){ --- 225,229 ---- DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); ResultSet rs; ! String sql = "select max(recordID) as maxrec from pharmacyInfo where status = 1 group by ID order by name"; rs = db.GetSQL(sql); while ( rs.next()){ |
|
From: Ivy C. <ic...@us...> - 2005-01-30 01:51:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5239 Modified Files: oscarinit.sql Log Message: updated formVTForm Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** oscarinit.sql 16 Jan 2005 21:17:00 -0000 1.68 --- oscarinit.sql 30 Jan 2005 01:51:07 -0000 1.69 *************** *** 4653,4659 **** ) TYPE=MyISAM; ! -- ! -- Table structure for table `formVTForm` ! -- CREATE TABLE formVTForm( ID int(10) NOT NULL auto_increment , --- 4653,4660 ---- ) TYPE=MyISAM; ! # Connection: root@localhost:mysql.sock ! # Host: localhost ! # Saved: 2004-06-15 15:47:55 ! # CREATE TABLE formVTForm( ID int(10) NOT NULL auto_increment , *************** *** 4661,4891 **** provider_no int(10), formCreated date, ! formEdited timestamp NOT NULL, ! visitCod varchar(10), HTValue varchar(10), HTDate varchar(10), HTComments varchar(255), - HTLastData varchar(10), - HTLastDataEnteredDate varchar(10), WTValue varchar(10), WTDate varchar(10), WTComments varchar(255), - WTLastData varchar(10), - WTLastDataEnteredDate varchar(10), WHRValue varchar(10), WHRDate varchar(10), WHRComments varchar(255), - WHRLastData varchar(10), - WHRLastDataEnteredDate varchar(10), WCValue varchar(10), WCDate varchar(10), WCComments varchar(255), - WCLastData varchar(10), - WCLastDataEnteredDate varchar(10), HCValue varchar(10), HCDate varchar(10), HCComments varchar(255), - HCLastData varchar(10), - HCLastDataEnteredDate varchar(10), BPValue varchar(10), BPDate varchar(10), BPComments varchar(255), - BPLastData varchar(10), - BPLastDataEnteredDate varchar(10), HRValue varchar(10), HRDate varchar(10), HRComments varchar(255), - HRLastData varchar(10), - HRLastDataEnteredDate varchar(10), HbA1Value varchar(10), HbA1Date varchar(10), HbA1Comments varchar(255), - HbA1LastData varchar(10), - HbA1LastDataEnteredDate varchar(10), BGValue varchar(10), BGDate varchar(10), BGComments varchar(255), - BGLastData varchar(10), - BGLastDataEnteredDate varchar(10), LDLValue varchar(10), LDLDate varchar(10), LDLComments varchar(255), - LDLLastData varchar(10), - LDLLastDataEnteredDate varchar(10), HDLValue varchar(10), HDLDate varchar(10), HDLComments varchar(255), - HDLLastData varchar(10), - HDLLastDataEnteredDate varchar(10), TCHLValue varchar(10), TCHLDate varchar(10), TCHLComments varchar(255), - THCLLastData varchar(10), - THCLLastDataEnteredDate varchar(10), TRIGValue varchar(10), TRIGDate varchar(10), TRIGComments varchar(255), - TRIGLastData varchar(10), - TRIGLastDataEnteredDate varchar(10), UALBValue varchar(10), UALBDate varchar(10), UALBComments varchar(255), - UALBLastData varchar(10), - UALBLastDataEnteredDate varchar(10), 24UAValue varchar(10), 24UADate varchar(10), ! 24UAComments varchar(255), ! 24UALastData varchar(10), ! 24UALastDataEnteredDate varchar(10), ! FTNoValue varchar(10), ! FTNoDate varchar(10), ! FTNoComments varchar(255), ! FTNoLastData varchar(10), ! FTNoLastDataEnteredDate varchar(10), FTNeValue varchar(10), FTNeDate varchar(10), ! FTNeComments varchar(255), ! FTNeLastData varchar(10), ! FTNeLastDataEnteredDate varchar(10), FTIsValue varchar(10), FTIsDate varchar(10), ! FTIsComments varchar(255), ! FTIsLastData varchar(10), ! FTIsLastDataEnteredDate varchar(10), FTUlValue varchar(10), FTUlDate varchar(10), ! FTUlComments varchar(255), ! FTUlLastData varchar(10), ! FTUlLastDataEnteredDate varchar(10), FTInValue varchar(10), FTInDate varchar(10), ! FTInComments varchar(255), ! FTInLastData varchar(10), ! FTInLastDataEnteredDate varchar(10), FTOtValue varchar(10), FTOtDate varchar(10), ! FTOtComments varchar(255), ! FTOtLastData varchar(10), ! FTOtLastDataEnteredDate varchar(10), FTReValue varchar(10), FTReDate varchar(10), ! FTReComments varchar(255), ! FTReLastData varchar(10), ! FTReLastDataEnteredDate varchar(10), ! iNoValue varchar(10), ! iNoDate varchar(10), ! iNoComments varchar(255), ! iNoLastData varchar(10), ! iNoLastDataEnteredDate varchar(10), iDiaValue varchar(10), iDiaDate varchar(10), ! iDiaComments varchar(255), ! iDiaLastData varchar(10), ! iDiaLastDataEnteredDate varchar(10), iHypValue varchar(10), iHypDate varchar(10), ! iHypComments varchar(255), ! iHypLastData varchar(10), ! iHypLastDataEnteredDate varchar(10), iOthValue varchar(10), iOthDate varchar(10), ! iOthComments varchar(255), ! iOthLastData varchar(10), ! iOthLastDataEnteredDate varchar(10), iRefValue varchar(10), iRefDate varchar(10), ! iRefComments varchar(255), ! iRefLastData varchar(10), ! iRefLastDataEnteredDate varchar(10), SmkSValue varchar(10), SmkSDate varchar(10), ! SmkSComments varchar(255), ! SmkSLastData varchar(10), ! SmkSLastDataEnteredDate varchar(10), SmkHValue varchar(10), SmkHDate varchar(10), ! SmkHComments varchar(255), ! SmkHLastData varchar(10), ! SmkHLastDataEnteredDate varchar(10), SmkCValue varchar(10), SmkCDate varchar(10), ! SmkCComments varchar(255), ! SmkCLastData varchar(10), ! SmkCLastDataEnteredDate varchar(10), ExerValue varchar(10), ExerDate varchar(10), ! ExerComments varchar(255), ! ExerLastData varchar(10), ! ExerLastDataEnteredDate varchar(10), DietValue varchar(10), DietDate varchar(10), ! DietComments varchar(255), ! DietLastData varchar(10), ! DietLastDataEnteredDate varchar(10), DpScValue varchar(10), DpScDate varchar(10), ! DpScComments varchar(255), ! DpScLastData varchar(10), ! DpScLastDataEnteredDate varchar(10), StScValue varchar(10), StScDate varchar(10), ! StScComments varchar(255), ! StScLastData varchar(10), ! StScLastDataEnteredDate varchar(10), LcCtValue varchar(10), LcCtDate varchar(10), ! LcCtComments varchar(255), ! LcCtLastData varchar(10), ! LcCtLastDataEnteredDate varchar(10), MedGValue varchar(10), MedGDate varchar(10), ! MedGComments varchar(255), ! MedGLastData varchar(10), ! MedGLastDataEnteredDate varchar(10), MedNValue varchar(10), MedNDate varchar(10), ! MedNComments varchar(255), ! MedNLastData varchar(10), ! MedNLastDataEnteredDate varchar(10), MedRValue varchar(10), MedRDate varchar(10), ! MedRComments varchar(255), ! MedRLastData varchar(10), ! MedRLastDataEnteredDate varchar(10), MedAValue varchar(10), MedADate varchar(10), ! MedAComments varchar(255), ! MedALastData varchar(10), ! MedALastDataEnteredDate varchar(10), NtrCValue varchar(10), NtrCDate varchar(10), ! NtrCComments varchar(255), ! NtrCLastData varchar(10), ! NtrCLastDataEnteredDate varchar(10), ExeCValue varchar(10), ExeCDate varchar(10), ! ExeCComments varchar(255), ! ExeCLastData varchar(10), ! ExeCLastDataEnteredDate varchar(10), SmCCValue varchar(10), SmCCDate varchar(10), ! SmCCComments varchar(255), ! SmCCLastData varchar(10), ! SmCCLastDataEnteredDate varchar(10), DiaCValue varchar(10), DiaCDate varchar(10), ! DiaCComments varchar(255), ! DiaCLastData varchar(10), ! DiaCLastDataEnteredDate varchar(10), PsyCValue varchar(10), PsyCDate varchar(10), ! PsyCComments varchar(255), ! PsyCLastData varchar(10), ! PsyCLastDataEnteredDate varchar(10), OthCValue varchar(10), OthCDate varchar(10), ! OthCComments varchar(255), ! OthCLastData varchar(10), ! OthCLastDataEnteredDate varchar(10), DMValue varchar(10), HTNValue varchar(10), --- 4662,4802 ---- provider_no int(10), formCreated date, ! formEdited timestamp NOT NULL, ! visitCod varchar(10), HTValue varchar(10), HTDate varchar(10), HTComments varchar(255), WTValue varchar(10), WTDate varchar(10), WTComments varchar(255), WHRValue varchar(10), WHRDate varchar(10), WHRComments varchar(255), WCValue varchar(10), WCDate varchar(10), WCComments varchar(255), HCValue varchar(10), HCDate varchar(10), HCComments varchar(255), BPValue varchar(10), BPDate varchar(10), BPComments varchar(255), HRValue varchar(10), HRDate varchar(10), HRComments varchar(255), HbA1Value varchar(10), HbA1Date varchar(10), HbA1Comments varchar(255), BGValue varchar(10), BGDate varchar(10), BGComments varchar(255), LDLValue varchar(10), LDLDate varchar(10), LDLComments varchar(255), HDLValue varchar(10), HDLDate varchar(10), HDLComments varchar(255), TCHLValue varchar(10), TCHLDate varchar(10), TCHLComments varchar(255), TRIGValue varchar(10), TRIGDate varchar(10), TRIGComments varchar(255), UALBValue varchar(10), UALBDate varchar(10), UALBComments varchar(255), 24UAValue varchar(10), 24UADate varchar(10), ! 24UAComments varchar(255), ! FTExValue varchar(10), ! FTExDate varchar(10), ! FTExComments varchar(255), FTNeValue varchar(10), FTNeDate varchar(10), ! FTNeComments varchar(255), FTIsValue varchar(10), FTIsDate varchar(10), ! FTIsComments varchar(255), FTUlValue varchar(10), FTUlDate varchar(10), ! FTUlComments varchar(255), FTInValue varchar(10), FTInDate varchar(10), ! FTInComments varchar(255), FTOtValue varchar(10), FTOtDate varchar(10), ! FTOtComments varchar(255), FTReValue varchar(10), FTReDate varchar(10), ! FTReComments varchar(255), ! iExValue varchar(10), ! iExDate varchar(10), ! iExComments varchar(255), iDiaValue varchar(10), iDiaDate varchar(10), ! iDiaComments varchar(255), iHypValue varchar(10), iHypDate varchar(10), ! iHypComments varchar(255), iOthValue varchar(10), iOthDate varchar(10), ! iOthComments varchar(255), iRefValue varchar(10), iRefDate varchar(10), ! iRefComments varchar(255), SmkSValue varchar(10), SmkSDate varchar(10), ! SmkSComments varchar(255), SmkHValue varchar(10), SmkHDate varchar(10), ! SmkHComments varchar(255), SmkCValue varchar(10), SmkCDate varchar(10), ! SmkCComments varchar(255), ExerValue varchar(10), ExerDate varchar(10), ! ExerComments varchar(255), DietValue varchar(10), DietDate varchar(10), ! DietComments varchar(255), DpScValue varchar(10), DpScDate varchar(10), ! DpScComments varchar(255), StScValue varchar(10), StScDate varchar(10), ! StScComments varchar(255), LcCtValue varchar(10), LcCtDate varchar(10), ! LcCtComments varchar(255), MedGValue varchar(10), MedGDate varchar(10), ! MedGComments varchar(255), MedNValue varchar(10), MedNDate varchar(10), ! MedNComments varchar(255), MedRValue varchar(10), MedRDate varchar(10), ! MedRComments varchar(255), MedAValue varchar(10), MedADate varchar(10), ! MedAComments varchar(255), NtrCValue varchar(10), NtrCDate varchar(10), ! NtrCComments varchar(255), ExeCValue varchar(10), ExeCDate varchar(10), ! ExeCComments varchar(255), SmCCValue varchar(10), SmCCDate varchar(10), ! SmCCComments varchar(255), DiaCValue varchar(10), DiaCDate varchar(10), ! DiaCComments varchar(255), PsyCValue varchar(10), PsyCDate varchar(10), ! PsyCComments varchar(255), OthCValue varchar(10), OthCDate varchar(10), ! OthCComments varchar(255), DMValue varchar(10), HTNValue varchar(10), *************** *** 4905,4911 **** ) TYPE=MyISAM; - - - -- -- Table structure for table `groupMembers_tbl` --- 4816,4819 ---- |
|
From: Ivy C. <ic...@us...> - 2005-01-30 01:46:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4335 Modified Files: VTForm.xml Log Message: renamed iNo to iEx and FTNo to FTEx updated "No significan pathology" to "significan pathology" Index: VTForm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** VTForm.xml 28 Jan 2005 22:22:37 -0000 1.7 --- VTForm.xml 30 Jan 2005 01:46:28 -0000 1.8 *************** *** 197,203 **** </measurement> <measurement> ! <type>FTNo</type> ! <typeDesc>No Significan Pathology</typeDesc> ! <typeDisplayName>Foot Exam: No Significant Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 197,203 ---- </measurement> <measurement> ! <type>FTEx</type> ! <typeDesc>Significan Pathology</typeDesc> ! <typeDisplayName>Foot Exam: Significant Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> *************** *** 267,273 **** </measurement> <measurement> ! <type>iNo</type> ! <typeDesc>No Significant Pathology</typeDesc> ! <typeDisplayName>Eye Exam: No Significant Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> --- 267,273 ---- </measurement> <measurement> ! <type>iEx</type> ! <typeDesc>Significant Pathology</typeDesc> ! <typeDisplayName>Eye Exam: Significant Pathology</typeDisplayName> <measuringInstrc>Yes/No</measuringInstrc> <validationRule> |
|
From: Ivy C. <ic...@us...> - 2005-01-30 01:44:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3943 Modified Files: formVTForm.jsp Log Message: added clear radio button selection javascript updated Foot exam no significan pathology to significan pathology, same thing for EyeExam updated font size of each type description Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** formVTForm.jsp 16 Jan 2005 20:41:05 -0000 1.26 --- formVTForm.jsp 30 Jan 2005 01:44:37 -0000 1.27 *************** *** 147,151 **** border-collapse: collapse; empty-cells: show; ! font-size:7pt; } --- 147,155 ---- border-collapse: collapse; empty-cells: show; ! font-size:80%; ! } ! .clearButton{ ! text-decoration: underline; ! color: blue; } *************** *** 162,171 **** var smkSDate, smkHDate, smkCDate; var smkSCmt, smkHCmt, smkCCmt; ! var ftNoId, ftNeId, ftIsId, ftInId, ftUlId, ftOtId, ftReId; ! var ftNoDate, ftNeDate, ftIsDate, ftInDate, ftUlDate, ftOtDate, ftReDate; ! var ftNoCmt, ftNeCmt, ftIsCmt, ftInCmt, ftUlCmt, ftOtCmt, ftReCmt; ! var eyeNoId, eyeHypId, eyeDiaId, eyeOthId, eyeRefId; ! var eyeNoCmt, eyeHypCmt, eyeDiaCmt, eyeOthCmt, eyeRefCmt; ! var eyeNoDate, eyeHypDate, eyeDiaDate, eyeOthDate, eyeRefDate; var MIValue, AngValue, ACSValue, RVTNValue, CADValue, DMValue, PVDValue; var HbA1Value, HbA1Date, HbA1Cmt; --- 166,175 ---- var smkSDate, smkHDate, smkCDate; var smkSCmt, smkHCmt, smkCCmt; ! var FTExId, ftNeId, ftIsId, ftInId, ftUlId, ftOtId, ftReId; ! var FTExDate, ftNeDate, ftIsDate, ftInDate, ftUlDate, ftOtDate, ftReDate; ! var FTExCmt, ftNeCmt, ftIsCmt, ftInCmt, ftUlCmt, ftOtCmt, ftReCmt; ! var eyeExId, eyeHypId, eyeDiaId, eyeOthId, eyeRefId; ! var eyeExCmt, eyeHypCmt, eyeDiaCmt, eyeOthCmt, eyeRefCmt; ! var eyeExDate, eyeHypDate, eyeDiaDate, eyeOthDate, eyeRefDate; var MIValue, AngValue, ACSValue, RVTNValue, CADValue, DMValue, PVDValue; var HbA1Value, HbA1Date, HbA1Cmt; *************** *** 262,266 **** function storeFTExamSupportData(){ ! document.forms[0].elements[ftNoDate].value = document.getElementById('FTDate').value; document.forms[0].elements[ftNeDate].value = document.getElementById('FTDate').value; document.forms[0].elements[ftIsDate].value = document.getElementById('FTDate').value; --- 266,270 ---- function storeFTExamSupportData(){ ! document.forms[0].elements[FTExDate].value = document.getElementById('FTDate').value; document.forms[0].elements[ftNeDate].value = document.getElementById('FTDate').value; document.forms[0].elements[ftIsDate].value = document.getElementById('FTDate').value; *************** *** 270,274 **** document.forms[0].elements[ftReDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[ftNoCmt].value = document.forms[0].FTComments.value; document.forms[0].elements[ftNeCmt].value = document.forms[0].FTComments.value; document.forms[0].elements[ftIsCmt].value = document.forms[0].FTComments.value; --- 274,278 ---- document.forms[0].elements[ftReDate].value = document.getElementById('FTDate').value; ! document.forms[0].elements[FTExCmt].value = document.forms[0].FTComments.value; document.forms[0].elements[ftNeCmt].value = document.forms[0].FTComments.value; document.forms[0].elements[ftIsCmt].value = document.forms[0].FTComments.value; *************** *** 281,285 **** function controlFTExam(){ ! if(document.forms[0].elements[ftNoId-1].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); --- 285,289 ---- function controlFTExam(){ ! if(document.forms[0].elements[FTExId].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); *************** *** 320,324 **** function storeEyeExamSupportData(){ ! document.forms[0].elements[eyeNoDate].value = document.forms[0].iDate.value; document.forms[0].elements[eyeHypDate].value = document.forms[0].iDate.value; document.forms[0].elements[eyeDiaDate].value = document.forms[0].iDate.value; --- 324,328 ---- function storeEyeExamSupportData(){ ! document.forms[0].elements[eyeExDate].value = document.forms[0].iDate.value; document.forms[0].elements[eyeHypDate].value = document.forms[0].iDate.value; document.forms[0].elements[eyeDiaDate].value = document.forms[0].iDate.value; *************** *** 326,330 **** document.forms[0].elements[eyeRefDate].value = document.forms[0].iDate.value; ! document.forms[0].elements[eyeNoCmt].value = document.forms[0].iComments.value; document.forms[0].elements[eyeHypCmt].value = document.forms[0].iComments.value; document.forms[0].elements[eyeDiaCmt].value = document.forms[0].iComments.value; --- 330,334 ---- document.forms[0].elements[eyeRefDate].value = document.forms[0].iDate.value; ! document.forms[0].elements[eyeExCmt].value = document.forms[0].iComments.value; document.forms[0].elements[eyeHypCmt].value = document.forms[0].iComments.value; document.forms[0].elements[eyeDiaCmt].value = document.forms[0].iComments.value; *************** *** 336,340 **** function controlEyeExam(){ ! if(document.forms[0].elements[eyeNoId-1].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); --- 340,344 ---- function controlEyeExam(){ ! if(document.forms[0].elements[eyeExId].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); *************** *** 348,352 **** //document.forms[0].elements[eyeRefId].disabled= false; } ! else if(document.forms[0].elements[eyeNoId-1].checked == true){ //uncheck and disable all foot exam checkbox //alert("uncheck all foot exam checkboxes"); --- 352,356 ---- //document.forms[0].elements[eyeRefId].disabled= false; } ! else if(document.forms[0].elements[eyeExId].checked == true){ //uncheck and disable all foot exam checkbox //alert("uncheck all foot exam checkboxes"); *************** *** 384,388 **** case 'value(SmkCComments)': smkCCmt = i; break; ! case 'value(FTNoValue)': ftNoId = i; break; case 'value(FTNeValue)': ftNeId = i; break; case 'value(FTIsValue)': ftIsId = i; break; --- 388,392 ---- case 'value(SmkCComments)': smkCCmt = i; break; ! case 'value(FTExValue)': FTExId = i; break; case 'value(FTNeValue)': ftNeId = i; break; case 'value(FTIsValue)': ftIsId = i; break; *************** *** 392,396 **** case 'value(FTReValue)': ftReId = i; break; ! case 'value(FTNoDate)': ftNoDate = i; break; case 'value(FTNeDate)': ftNeDate = i; break; case 'value(FTIsDate)': ftIsDate = i; break; --- 396,400 ---- case 'value(FTReValue)': ftReId = i; break; ! case 'value(FTExDate)': FTExDate = i; break; case 'value(FTNeDate)': ftNeDate = i; break; case 'value(FTIsDate)': ftIsDate = i; break; *************** *** 400,404 **** case 'value(FTReDate)': ftReDate = i; break; ! case 'value(FTNoComments)': ftNoCmt = i; break; case 'value(FTNeComments)': ftNeCmt = i; break; case 'value(FTIsComments)': ftIsCmt = i; break; --- 404,408 ---- case 'value(FTReDate)': ftReDate = i; break; ! case 'value(FTExComments)': FTExCmt = i; break; case 'value(FTNeComments)': ftNeCmt = i; break; case 'value(FTIsComments)': ftIsCmt = i; break; *************** *** 408,412 **** case 'value(FTReComments)': ftReCmt = i; break; ! case 'value(iNoDate)': eyeNoDate = i; break; case 'value(iHypDate)': eyeHypDate = i; break; case 'value(iDiaDate)': eyeDiaDate = i; break; --- 412,416 ---- case 'value(FTReComments)': ftReCmt = i; break; ! case 'value(iExDate)': eyeExDate = i; break; case 'value(iHypDate)': eyeHypDate = i; break; case 'value(iDiaDate)': eyeDiaDate = i; break; *************** *** 414,418 **** case 'value(iRefDate)': eyeRefDate = i; break; ! case 'value(iNoComments)': eyeNoCmt = i; break; case 'value(iHypComments)': eyeHypCmt = i; break; case 'value(iDiaComments)': eyeDiaCmt = i; break; --- 418,422 ---- case 'value(iRefDate)': eyeRefDate = i; break; ! case 'value(iExComments)': eyeExCmt = i; break; case 'value(iHypComments)': eyeHypCmt = i; break; case 'value(iDiaComments)': eyeDiaCmt = i; break; *************** *** 420,424 **** case 'value(iRefComments)': eyeRefCmt = i; break; ! case 'value(iNoValue)': eyeNoId = i ; break; case 'value(iHypValue)': eyeHypId = i; break; case 'value(iDiaValue)': eyeDiaId = i; break; --- 424,428 ---- case 'value(iRefComments)': eyeRefCmt = i; break; ! case 'value(iExValue)': eyeExId = i ; break; case 'value(iHypValue)': eyeHypId = i; break; case 'value(iDiaValue)': eyeDiaId = i; break; *************** *** 455,459 **** function disableFTExam(control){ ! document.forms[0].elements[ftNoId-1].disabled= control; document.forms[0].elements[ftNeId-1].disabled= control; document.forms[0].elements[ftIsId-1].disabled= control; --- 459,463 ---- function disableFTExam(control){ ! document.forms[0].elements[FTExId-1].disabled= control; document.forms[0].elements[ftNeId-1].disabled= control; document.forms[0].elements[ftIsId-1].disabled= control; *************** *** 463,467 **** document.forms[0].elements[ftReId-1].disabled= control; ! document.forms[0].elements[ftNoId].disabled= control; document.forms[0].elements[ftNeId].disabled= control; document.forms[0].elements[ftIsId].disabled= control; --- 467,471 ---- document.forms[0].elements[ftReId-1].disabled= control; ! document.forms[0].elements[FTExId].disabled= control; document.forms[0].elements[ftNeId].disabled= control; document.forms[0].elements[ftIsId].disabled= control; *************** *** 505,508 **** --- 509,517 ---- } } + + function clearAll(yRadio, nRadio){ + document.forms[0].elements[yRadio].checked=false; + document.forms[0].elements[nRadio].checked=false; + } </script> <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(680,760); popupDecisionSupport(); initialize();"> *************** *** 616,620 **** </td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable">Last Data</td> <td class="dataEntryTable"><font style="font-size:80%"> --- 625,629 ---- </td> </tr> ! <tr> <td class="dataEntryTable">Last Data</td> <td class="dataEntryTable"><font style="font-size:80%"> *************** *** 637,641 **** <td class="dataEntryTable"> </td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable">New Data</td> <td class="dataEntryTable" align="center"><html:text property="value(SmkSValue)" size="8%" /></td> --- 646,650 ---- <td class="dataEntryTable"> </td> </tr> ! <tr> <td class="dataEntryTable">New Data</td> <td class="dataEntryTable" align="center"><html:text property="value(SmkSValue)" size="8%" /></td> *************** *** 944,948 **** <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("WTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WTMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> --- 953,957 ---- <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("WTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WTMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> *************** *** 950,958 **** <table cellpadding='0' cellspacing='0'> <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WTLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WTLastData")%></td></tr> ! </table> ! </logic:present> ! </td> <td class="dataEntryTable" align="center"><html:text property="value(WTValue)" size="5%" /></td> --- 959,965 ---- <table cellpadding='0' cellspacing='0'> <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WTLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WTLastData")%></td></tr> </table> ! </logic:present> </td> <td class="dataEntryTable" align="center"><html:text property="value(WTValue)" size="5%" /></td> *************** *** 960,964 **** <td class="dataEntryTable" align="center"><html:text property="value(WTComments)" size="30%" tabindex="9999"/></td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("HTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HTMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> --- 967,971 ---- <td class="dataEntryTable" align="center"><html:text property="value(WTComments)" size="30%" tabindex="9999"/></td> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("HTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HTMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> *************** *** 998,1007 **** <td><table style="display:none" cellpadding='1' cellspacing='0' id="examination"> <tr> ! <td class="subTitle" width="30%"> </td> <td class="subTitle" width="17%"> Last Data<br>Entered on </td> ! <td class="subTitle" width="20%"> New Data </td> --- 1005,1014 ---- <td><table style="display:none" cellpadding='1' cellspacing='0' id="examination"> <tr> ! <td class="subTitle" width="28%"> </td> <td class="subTitle" width="17%"> Last Data<br>Entered on </td> ! <td class="subTitle" width="22%"> New Data </td> *************** *** 1009,1041 **** Ob. Date<br> (yyyy-MM-dd) </td> ! <td class="subTitle" width="24%"> <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/> </td> </tr> ! <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Foot Exam</th> <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<%=request.getAttribute("FTNeDate")%>" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="FTComments" wrap="hard" cols="24" style="height:180" tabindex="9999"><logic:present name="FTNoComments"><%=request.getAttribute("FTNoComments")%></logic:present></textarea> </td> </tr> ! <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("FTNoDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><%=request.getAttribute("FTNoLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("FTNoLastData")%></td></tr> </table> </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(FTNoValue)" onclick="javascript:controlFTExam();" value="yes" />Yes ! <html:radio property="value(FTNoValue)" onclick="javascript:controlFTExam();" value="no"/>No </td> <td class="dataEntryTable" rowspan="7" valign="top" align="center"> </td> ! <html:hidden property="value(FTNoDate)"/> ! <html:hidden property="value(FTNoComments)"/> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("FTNeDesc")%></td> <td class="dataEntryTable" align="center"> --- 1016,1049 ---- Ob. Date<br> (yyyy-MM-dd) </td> ! <td class="subTitle" width="23%"> <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/> </td> </tr> ! <tr> <th class="dataEntryTable" colspan="3">Foot Exam</th> <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<%=request.getAttribute("FTNeDate")%>" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="FTComments" wrap="hard" cols="24" style="height:180" tabindex="9999"><logic:present name="FTExComments"><%=request.getAttribute("FTExComments")%></logic:present></textarea> </td> </tr> ! <tr> ! <td class="dataEntryTable"><%=request.getAttribute("FTExDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><%=request.getAttribute("FTExLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("FTExLastData")%></td></tr> </table> </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(FTExValue)" onclick="javascript:controlFTExam();" value="yes" />Yes ! <html:radio property="value(FTExValue)" onclick="javascript:controlFTExam();" value="no"/>No ! <a title="clear all" href="javascript:clearAll(FTExId, FTExId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <td class="dataEntryTable" rowspan="7" valign="top" align="center"> </td> ! <html:hidden property="value(FTExDate)"/> ! <html:hidden property="value(FTExComments)"/> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("FTNeDesc")%></td> <td class="dataEntryTable" align="center"> *************** *** 1049,1052 **** --- 1057,1061 ---- <html:radio property="value(FTNeValue)" value="yes" />Yes <html:radio property="value(FTNeValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(ftNeId, ftNeId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(FTNeDate)" /> *************** *** 1065,1068 **** --- 1074,1078 ---- <html:radio property="value(FTIsValue)" value="yes" />Yes <html:radio property="value(FTIsValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(ftIsId, ftIsId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(FTIsDate)" /> *************** *** 1081,1084 **** --- 1091,1095 ---- <html:radio property="value(FTUlValue)" value="yes" />Yes <html:radio property="value(FTUlValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(ftUlId, ftUlId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(FTUlDate)" /> *************** *** 1097,1100 **** --- 1108,1112 ---- <html:radio property="value(FTInValue)" value="yes" />Yes <html:radio property="value(FTInValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(ftInId, ftInId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(FTInDate)" /> *************** *** 1113,1116 **** --- 1125,1129 ---- <html:radio property="value(FTOtValue)" value="yes" />Yes <html:radio property="value(FTOtValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(ftOtId, ftOtId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(FTOtDate)" /> *************** *** 1129,1161 **** <html:radio property="value(FTReValue)" value="yes" />Yes <html:radio property="value(FTReValue)" value="no" />No </td> <html:hidden property="value(FTReDate)" /> <html:hidden property="value(FTReComments)" /> </tr> ! <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Eye Exam</th> <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<%=request.getAttribute("iDiaDate")%>" size="10%"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="iComments" wrap="hard" cols="24" style="height:180"><logic:present name="iNoComments"><%=request.getAttribute("iNoComments")%></logic:present></textarea> </td> </tr> ! <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("iNoDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iNoLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iNoLastData")%></td></tr> </table> </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(iNoValue)" onclick="javascript:controlEyeExam();" value="yes"/>Yes ! <html:radio property="value(iNoValue)" onclick="javascript:controlEyeExam();" value="no"/>No </td> <td class="dataEntryTable" rowspan="7" valign="top" align="center"> </td> ! <html:hidden property="value(iNoDate)" /> ! <html:hidden property="value(iNoComments)" /> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("iHypDesc")%></td> <td class="dataEntryTable" align="center"> --- 1142,1176 ---- <html:radio property="value(FTReValue)" value="yes" />Yes <html:radio property="value(FTReValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(ftReId, ftReId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(FTReDate)" /> <html:hidden property="value(FTReComments)" /> </tr> ! <tr> <th class="dataEntryTable" colspan="3">Eye Exam</th> <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<%=request.getAttribute("iDiaDate")%>" size="10%"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="iComments" wrap="hard" cols="24" style="height:180"><logic:present name="iExComments"><%=request.getAttribute("iExComments")%></logic:present></textarea> </td> </tr> ! <tr> ! <td class="dataEntryTable"><%=request.getAttribute("iExDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iExLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iExLastData")%></td></tr> </table> </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(iExValue)" onclick="javascript:controlEyeExam();" value="yes"/>Yes ! <html:radio property="value(iExValue)" onclick="javascript:controlEyeExam();" value="no"/>No ! <a title="clear all" href="javascript:clearAll(eyeExId, eyeExId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <td class="dataEntryTable" rowspan="7" valign="top" align="center"> </td> ! <html:hidden property="value(iExDate)" /> ! <html:hidden property="value(iExComments)" /> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("iHypDesc")%></td> <td class="dataEntryTable" align="center"> *************** *** 1169,1172 **** --- 1184,1188 ---- <html:radio property="value(iHypValue)" value="yes" />Yes <html:radio property="value(iHypValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(eyeHypId, eyeHypId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(iHypDate)" /> *************** *** 1185,1188 **** --- 1201,1205 ---- <html:radio property="value(iDiaValue)" value="yes" />Yes <html:radio property="value(iDiaValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(eyeDiaId, eyeDiaId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(iDiaDate)"/> *************** *** 1201,1204 **** --- 1218,1222 ---- <html:radio property="value(iOthValue)" value="yes" />Yes <html:radio property="value(iOthValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(eyeOthId, eyeOthId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(iOthDate)"/> *************** *** 1217,1220 **** --- 1235,1239 ---- <html:radio property="value(iRefValue)" value="yes" />Yes <html:radio property="value(iRefValue)" value="no" />No + <a title="clear all" href="javascript:clearAll(eyeRefId, eyeRefId-1)">  <font style="text-decoration:underline; color:blue;">clr</font> </a> </td> <html:hidden property="value(iRefDate)"/> *************** *** 1248,1252 **** </td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("HbA1Desc")%><br><font class="eightyPercent"><%=request.getAttribute("HbA1MeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> --- 1267,1271 ---- </td> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("HbA1Desc")%><br><font class="eightyPercent"><%=request.getAttribute("HbA1MeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> *************** *** 1261,1265 **** <td class="dataEntryTable" align="center"><html:text property="value(HbA1Comments)" size="30%" tabindex="9999"/></td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("BGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("BGMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> --- 1280,1284 ---- <td class="dataEntryTable" align="center"><html:text property="value(HbA1Comments)" size="30%" tabindex="9999"/></td> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("BGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("BGMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> *************** *** 1410,1414 **** <th></th> <th class="title" width="98%"> ! <a href="javascript: showHideItem('medicationAllergies');">Medication Allergies>> </a> </th> </tr> --- 1429,1433 ---- <th></th> <th class="title" width="98%"> ! <a href="javascript: showHideItem('medicationAllergies');">Medication Allergies >> </a> </th> </tr> *************** *** 1452,1456 **** </td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("NtrCDesc")%></td> <td class="dataEntryTable" align="center"> --- 1471,1475 ---- </td> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("NtrCDesc")%></td> <td class="dataEntryTable" align="center"> *************** *** 1465,1469 **** <td class="dataEntryTable" align="center"><html:text property="value(NtrCComments)" size="45" tabindex="9999"/></td> </tr> ! <tr class="dataEntryTable"> <td class="dataEntryTable"><%=request.getAttribute("ExeCDesc")%></td> <td class="dataEntryTable" align="center"> --- 1484,1488 ---- <td class="dataEntryTable" align="center"><html:text property="value(NtrCComments)" size="45" tabindex="9999"/></td> </tr> ! <tr> <td class="dataEntryTable"><%=request.getAttribute("ExeCDesc")%></td> <td class="dataEntryTable" align="center"> |
|
From: Ivy C. <ic...@us...> - 2005-01-29 20:57:46
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9121 Modified Files: FrmSetupFormAction.java Log Message: updated last data query to display last entered data instead of the fisrt Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FrmSetupFormAction.java 28 Jan 2005 22:21:06 -0000 1.18 --- FrmSetupFormAction.java 29 Jan 2005 20:57:35 -0000 1.19 *************** *** 383,387 **** //get last value and its observation date String sqlData = "SELECT dataField, dateEntered FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered limit 1"; ResultSet rs = db.GetSQL(sqlData); --- 383,387 ---- //get last value and its observation date String sqlData = "SELECT dataField, dateEntered FROM measurements WHERE demographicNo='"+ demo + "' AND type ='" + mt.getType() ! + "' AND measuringInstruction='" + mt.getMeasuringInstrc() + "' ORDER BY dateEntered DESC limit 1"; ResultSet rs = db.GetSQL(sqlData); |
|
From: Ivy C. <ic...@us...> - 2005-01-28 22:23:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9213 Modified Files: EctFindMeasurementTypeUtil.java Log Message: added canPrefill data type Index: EctFindMeasurementTypeUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/util/EctFindMeasurementTypeUtil.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** EctFindMeasurementTypeUtil.java 3 Dec 2004 16:08:22 -0000 1.4 --- EctFindMeasurementTypeUtil.java 28 Jan 2005 22:23:17 -0000 1.5 *************** *** 50,53 **** --- 50,54 ---- digester.addBeanPropertySetter("formProp/measurement/typeDisplayName", "typeDisplayName"); digester.addBeanPropertySetter("formProp/measurement/measuringInstrc", "measuringInstrc"); + digester.addBeanPropertySetter("formProp/measurement/canPrefill", "canPrefill"); digester.addObjectCreate("formProp/measurement/validationRule", EctValidationsBean.class); |
|
From: Ivy C. <ic...@us...> - 2005-01-28 22:22:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9066 Modified Files: VTForm.xml Log Message: added canPrefill to all the lab data type Index: VTForm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** VTForm.xml 6 Jan 2005 21:40:43 -0000 1.6 --- VTForm.xml 28 Jan 2005 22:22:37 -0000 1.7 *************** *** 103,106 **** --- 103,107 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 115,118 **** --- 116,120 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 127,130 **** --- 129,133 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 139,142 **** --- 142,146 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 151,154 **** --- 155,159 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 163,166 **** --- 168,172 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 175,178 **** --- 181,185 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 187,190 **** --- 194,198 ---- <isNumeric>1</isNumeric> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 505,508 **** --- 513,517 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 515,518 **** --- 524,528 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 525,528 **** --- 535,539 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 535,538 **** --- 546,550 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 545,548 **** --- 557,561 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 555,558 **** --- 568,572 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 565,568 **** --- 579,583 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 575,578 **** --- 590,594 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> <measurement> *************** *** 585,588 **** --- 601,605 ---- <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp> </validationRule> + <canPrefill>true</canPrefill> </measurement> </formProp> |
|
From: Ivy C. <ic...@us...> - 2005-01-28 22:22:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8905 Modified Files: EctMeasurementTypesBean.java Log Message: added canPrefill member Index: EctMeasurementTypesBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarMeasurements/bean/EctMeasurementTypesBean.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** EctMeasurementTypesBean.java 3 Dec 2004 19:41:57 -0000 1.6 --- EctMeasurementTypesBean.java 28 Jan 2005 22:21:53 -0000 1.7 *************** *** 47,50 **** --- 47,53 ---- String lastDateEntered = null; Vector validationRules = new Vector(); + + //for forms connecting to miles, determine whether to prefill the data or not when a new form is opened + boolean canPrefill = false; public EctMeasurementTypesBean(){} *************** *** 188,190 **** --- 191,201 ---- this.lastDateEntered = lastDateEntered; } + + public boolean getCanPrefill(){ + return canPrefill; + } + + public void setCanPrefill(boolean canPrefill){ + this.canPrefill = canPrefill; + } } |
|
From: Ivy C. <ic...@us...> - 2005-01-28 22:21:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8716 Modified Files: FrmSetupFormAction.java Log Message: updated the data prefill feature Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FrmSetupFormAction.java 13 Jan 2005 21:03:58 -0000 1.17 --- FrmSetupFormAction.java 28 Jan 2005 22:21:06 -0000 1.18 *************** *** 163,234 **** request.setAttribute(mt.getType()+"Comments", currentRec.getProperty(mt.getType()+"Comments", "")); } ! else{ ! ! frm.setValue(mt.getType() + "Date", today); ! request.setAttribute(mt.getType() + "Date", today); ! //prefill data from Miles if its dataentered date is > than the one in measurements ! String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); ! //System.out.println("key: " + mt.getType()+"Value value: " + valueMethodCall); ! if(mt.getType().equalsIgnoreCase("BP")){ ! valueMethodCall = (String) nameProps.get("SBPValue"); ! String valueMethodCall2 =(String) nameProps.get("DBPValue"); ! if (vtData!=null && vtDataC!=null && valueMethodCall != null){ ! Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); ! String sbp = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! vtGetMethods = vtDataC.getMethod("get"+valueMethodCall2, new Class[] {}); ! String dbp = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! if(sbp!=null && dbp!=null){ ! frm.setValue(mt.getType()+"Value", sbp + "/" + dbp); ! String dateMethodCall = (String) nameProps.get(mt.getType()+"Date"); ! ! if (dateMethodCall != null){ ! vtGetMethods = vtDataC.getMethod("get"+dateMethodCall, new Class[] {}); ! String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value); ! request.setAttribute(mt.getType() + "Date", value); ! } ! } ! } ! } ! else{ ! ! if (vtData!=null && vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); ! String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! ! vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); ! //System.out.println("data date " + (String) vtGetMethods.invoke(vtData, new Object[]{})); ! String dMiles = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! String dMeas = mt.getLastDateEntered(); ! if(value!=null){ ! value = translate(value, valueMethodCall); ! frm.setValue(mt.getType()+"Value", value); ! //System.out.println("prefill " + mt.getType() + ": " + value); ! ! if(dMiles!=null&&dMeas!=null){ ! if(dMiles.compareTo(dMeas)>0){ ! String dateMethodCall = (String) nameProps.get(mt.getType()+"Date"); ! if (dateMethodCall != null){ ! vtGetMethods = vtDataC.getMethod("get"+dateMethodCall, new Class[] {}); ! value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value); ! request.setAttribute(mt.getType() + "Date", value); } - else{ - - frm.setValue(mt.getType() + "Date", dMiles==null?"":dMiles.substring(0,10)); - request.setAttribute(mt.getType() + "Date", dMiles); - } } ! ! } ! } ! ! } ! request.setAttribute(mt.getType() + "Comments", ""); } --- 163,217 ---- request.setAttribute(mt.getType()+"Comments", currentRec.getProperty(mt.getType()+"Comments", "")); } ! else{ ! //prefill data from Miles if its dataentered date is > than the one in measurements ! if(mt.getCanPrefill()){ ! String value=""; ! String date=today; ! String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); ! String dateMethodCall = (String) nameProps.get(mt.getType()+"Date"); ! ! if (vtData!=null && vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); ! value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! if(value!=null){ ! vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); ! String dMiles = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! date = dMiles; ! ! if(dateMethodCall!=null){ ! vtGetMethods = vtDataC.getMethod("get"+dateMethodCall, new Class[] {}); ! date = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! date = date.equalsIgnoreCase("")?"0001-01-01":date; ! ! String dObsMeas = mt.getLastDateObserved()==null?"0001-01-01":mt.getLastDateObserved(); ! System.out.println(mt.getType() + " Miles: " + date + " Measurements: " + dObsMeas); ! Date milesDate = UtilDateUtilities.StringToDate(date, _dateFormat); ! Date obsMeasDate = UtilDateUtilities.StringToDate(dObsMeas, _dateFormat); ! ! if(mt.getLastData()!=null){ ! if(obsMeasDate.compareTo(milesDate)>=0){ ! String dMeas = mt.getLastDateEntered()==null?"0001-01-01":mt.getLastDateEntered(); ! ! Date dateMiles = UtilDateUtilities.StringToDate(dMiles, _dateFormat); ! Date dateMeas = UtilDateUtilities.StringToDate(dMeas, _dateFormat); ! if(dateMeas.compareTo(dateMiles)>0){ ! value = mt.getLastData(); ! date = dObsMeas; ! } } } ! } } ! } ! frm.setValue(mt.getType()+"Value", value); ! frm.setValue(mt.getType()+"Date", date); ! request.setAttribute(mt.getType() + "Comments", ""); ! } ! else{ ! frm.setValue(mt.getType() + "Date", today); ! request.setAttribute(mt.getType() + "Date", today); request.setAttribute(mt.getType() + "Comments", ""); } |
|
From: Ivy C. <ic...@us...> - 2005-01-28 18:19:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17303 Modified Files: FrmFormAction.java Log Message: updated to set inputValue to "no" when a checkbox is unchecked Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** FrmFormAction.java 27 Jan 2005 17:12:25 -0000 1.25 --- FrmFormAction.java 28 Jan 2005 18:18:21 -0000 1.26 *************** *** 442,448 **** if(validationName.equalsIgnoreCase("Yes/No")){ if(inputValue==null) ! inputValue=""; else if (inputValue.equalsIgnoreCase("on")) inputValue="yes"; } return inputValue; --- 442,450 ---- if(validationName.equalsIgnoreCase("Yes/No")){ if(inputValue==null) ! inputValue="no"; else if (inputValue.equalsIgnoreCase("on")) inputValue="yes"; + else if (inputValue.equalsIgnoreCase("off")) + inputValue="no"; } return inputValue; |
|
From: Ivy C. <ic...@us...> - 2005-01-27 17:40:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3940 Modified Files: FrmToXMLUtil.java Log Message: Updated the male and female value Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FrmToXMLUtil.java 27 Jan 2005 17:12:11 -0000 1.9 --- FrmToXMLUtil.java 27 Jan 2005 17:40:39 -0000 1.10 *************** *** 321,325 **** return "true"; } ! else return "false"; } --- 321,325 ---- return "true"; } ! else if(input.equalsIgnoreCase("no")) return "false"; } *************** *** 328,334 **** return "Present"; } ! else{ return "Absent"; ! } } return input; --- 328,340 ---- return "Present"; } ! else if(input.equalsIgnoreCase("no")){ return "Absent"; ! } ! else if(input.equalsIgnoreCase("F")){ ! return "Female"; ! } ! else if(input.equalsIgnoreCase("M")){ ! return "Male"; ! } } return input; |
|
From: Ivy C. <ic...@us...> - 2005-01-27 17:13:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30350 Modified Files: VTForm2Osdsf.properties Log Message: added gender, dob, patient first and last name Index: VTForm2Osdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm2Osdsf.properties,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VTForm2Osdsf.properties 6 Jan 2005 21:40:43 -0000 1.4 --- VTForm2Osdsf.properties 27 Jan 2005 17:13:27 -0000 1.5 *************** *** 2,5 **** --- 2,13 ---- demographic_no=PatientCod + surname=TxtSurname + + givenName=TxtGivenName + + gender=SelGender + + dob=DatBirthDate + visitDate =VisitCod |
|
From: Ivy C. <ic...@us...> - 2005-01-27 17:12:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29822 Modified Files: FrmToXMLUtil.java Log Message: added gender, dob, patient first and last name to the xml file Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrmToXMLUtil.java 25 Jan 2005 18:24:36 -0000 1.8 --- FrmToXMLUtil.java 27 Jan 2005 17:12:11 -0000 1.9 *************** *** 75,79 **** visit.setPatientCod(dataProps.getProperty("demographic_no")); ! visit.setVisitCod(dataProps.getProperty("visitCod")); EctMeasurementTypesBean mt; --- 75,105 ---- visit.setPatientCod(dataProps.getProperty("demographic_no")); ! visit.setVisitCod(dataProps.getProperty("visitCod")); ! ! Class cls = visit.getClass(); ! // Add dob ! Method addNewMethod = cls.getMethod("addNewDatBirthDate", new Class[] {}); ! Object obj = addNewMethod.invoke(visit,new Object[]{}); ! String value = dataProps.getProperty("dob"); ! value = translate(value, "DatBirthDate"); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! //Add Surname ! addNewMethod = cls.getMethod("addNewTxtSurname", new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty("surname"); ! value = translate(value, "TxtSurname"); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! //Add givien Name ! addNewMethod = cls.getMethod("addNewTxtGivenNames", new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty("givenName"); ! value = translate(value, "TxtGivenNames"); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! //Add Gender ! addNewMethod = cls.getMethod("addNewSelGender", new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty("gender"); ! value = translate(value, "SelGender"); ! setWhoWhatWhereWhen(obj,how,who,when,value); EctMeasurementTypesBean mt; *************** *** 88,98 **** methodCall = (String) nameProps.get("SBPValue"); if (methodCall != null){ ! Class cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! Object obj = addNewMethod.invoke(visit,new Object[]{}); ! String value = dataProps.getProperty("SBPValue"); //System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); --- 114,124 ---- methodCall = (String) nameProps.get("SBPValue"); if (methodCall != null){ ! cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty("SBPValue"); //System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); *************** *** 100,110 **** methodCall = (String) nameProps.get("DBPValue"); if (methodCall != null){ ! Class cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! Object obj = addNewMethod.invoke(visit,new Object[]{}); ! String value = dataProps.getProperty("DBPValue"); //System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); --- 126,136 ---- methodCall = (String) nameProps.get("DBPValue"); if (methodCall != null){ ! cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty("DBPValue"); //System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); *************** *** 114,124 **** if (methodCall != null){ ! Class cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! Object obj = addNewMethod.invoke(visit,new Object[]{}); ! String value = dataProps.getProperty(itemName+"Date"); //System.out.println(itemName + "Date: who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); --- 140,150 ---- if (methodCall != null){ ! cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty(itemName+"Date"); //System.out.println(itemName + "Date: who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); *************** *** 129,139 **** else if (methodCall != null && !gValidator.isBlankOrNull(dataProps.getProperty(itemName+"Value"))){ ! Class cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! Method addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! Object obj = addNewMethod.invoke(visit,new Object[]{}); ! String value = dataProps.getProperty(itemName+"Value"); value = translate(value, methodCall); System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); --- 155,165 ---- else if (methodCall != null && !gValidator.isBlankOrNull(dataProps.getProperty(itemName+"Value"))){ ! cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); ! addNewMethod = cls.getMethod("addNew"+methodCall, new Class[] {}); ! obj = addNewMethod.invoke(visit,new Object[]{}); ! value = dataProps.getProperty(itemName+"Value"); value = translate(value, methodCall); System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); |
|
From: Ivy C. <ic...@us...> - 2005-01-27 17:12:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29953 Modified Files: FrmFormAction.java Log Message: added gender, dob, patient first and last name to the xml file Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** FrmFormAction.java 13 Jan 2005 21:02:36 -0000 1.24 --- FrmFormAction.java 27 Jan 2005 17:12:25 -0000 1.25 *************** *** 42,45 **** --- 42,46 ---- import oscar.form.util.*; import oscar.oscarDB.DBHandler; + import oscar.oscarDemographic.data.DemographicData; import oscar.oscarMessenger.util.MsgStringQuote; import oscar.oscarEncounter.data.EctFormData; *************** *** 142,145 **** --- 143,148 ---- if(valid){ + DemographicData demoData = new DemographicData(); + DemographicData.Demographic demo = demoData.getDemographic(demographicNo); System.out.println("is valid, procede write to table"); //Store form information as properties for saving to form table *************** *** 147,150 **** --- 150,158 ---- props.setProperty("provider_no", providerNo); props.setProperty("visitCod", (String) frm.getValue("visitCod")); + props.setProperty("dob", demo.getDob("-")); + props.setProperty("gender", demo.getSex()); + props.setProperty("surname", demo.getLastName()); + props.setProperty("givenName", demo.getFirstName()); + String diagnosisVT = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) frm.getValue("diagnosisVT")); //System.out.println("diagnosisVT >"+diagnosisVT+"< form val >"+frm.getValue("diagnosisVT")); |
|
From: Ivy C. <ic...@us...> - 2005-01-25 22:28:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19712 Modified Files: admin.jsp Log Message: added rehab study report Index: admin.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admin.jsp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** admin.jsp 11 Jan 2005 22:41:45 -0000 1.31 --- admin.jsp 25 Jan 2005 22:28:00 -0000 1.32 *************** *** 274,278 **** <a HREF="#" ONCLICK ="popupPage(600,750,'../report/reportactivepatientlist.jsp')" ><bean:message key="report.reportindex.btnActivePList"/></a><br/> <% } %> ! <a href="#" onclick="popupPage(600,900,'../oscarSurveillance/ReportSurveillance.jsp')"><bean:message key="admin.admin.report.SurveillanceReport"/></a> </td> </tr> --- 274,279 ---- <a HREF="#" ONCLICK ="popupPage(600,750,'../report/reportactivepatientlist.jsp')" ><bean:message key="report.reportindex.btnActivePList"/></a><br/> <% } %> ! <a href="#" onclick="popupPage(600,900,'../oscarSurveillance/ReportSurveillance.jsp')"><bean:message key="admin.admin.report.SurveillanceReport"/></a><br/> ! <a href="#" onclick="popupPage(600,900,'../oscarReport/oscarReportRehabStudy.jsp')">Rehab Study</a> </td> </tr> |
|
From: Ivy C. <ic...@us...> - 2005-01-25 22:21:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18188 Added Files: oscarReportRehabStudy.jsp Log Message: initial commit --- NEW FILE: oscarReportRehabStudy.jsp --- <!-- /* * * 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 */ --> <% if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> <%@ page language="java" %> <%@ page import="java.util.*,oscar.oscarReport.data.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <link rel="stylesheet" type="text/css" href="../oscarEncounter/encounterStyles.css"> <html:html locale="true"> <script language="JavaScript" type="text/JavaScript"> <!-- function reloadPage(init) { //reloads the window if Nav4 resized if (init==true) with (navigator) {if ((appName=="Netscape")&&(parseInt(appVersion)==4)) { document.pgW=innerWidth; document.pgH=innerHeight; onresize=reloadPage; }} else if (innerWidth!=document.pgW || innerHeight!=document.pgH) location.reload(); } reloadPage(true); function findObj(n, d) { //v4.01 var p,i,x; if(!d) d=document; if((p=n.indexOf("?"))>0&&parent.frames.length) { d=parent.frames[n.substring(p+1)].document; n=n.substring(0,p);} if(!(x=d[n])&&d.all) x=d.all[n]; for (i=0;!x&&i<d.forms.length;i++) x=d.forms[i][n]; for(i=0;!x&&d.layers&&i<d.layers.length;i++) x=findObj(n,d.layers[i].document); if(!x && d.getElementById) x=d.getElementById(n); return x; } function showHideLayers() { //v6.0 var i,p,v,obj,args=showHideLayers.arguments; for (i=0; i<(args.length-2); i+=3) if ((obj=findObj(args[i]))!=null) { v=args[i+2]; if (obj.style) { obj=obj.style; v=(v=='show')?'visible':(v=='hide')?'hidden':v; } obj.visibility=v; } } //--> </script> <head> <title> <bean:message key="oscarReport.RptByExample.MsgQueryByExamples"/> </title> <style type="text/css"> td.nameBox { border-bottom: 1pt solid #888888; font-family: tahoma, helvetica; ; font-size: 12pt; } td.sideLine { border-right: 1pt solid #888888; } td.fieldBox { font-family: tahoma, helvetica; } th.headerColor{ font-family: tahoma, helvetica ; font-size:12pt; font-weight: bold; background-color: #C3D4E5 } tr.rowColor1 { font-family: tahoma, helvetica ; font-size:10pt; background-color: #FFFFFF } tr.rowColor2 { font-family: tahoma, helvetica ; font-size:10pt; background-color: #EEEEFF } </style> <style type="text/css" media="print"> .header { display:none; } .header INPUT { display:none; } .header A { display:none; } </style> <script type="text/javascript"> function generateResult(formName){ document.forms[0].formName.value=formName; document.forms[0].submit(); } </script> </head> <body vlink="#0000FF" class="BodyStyle" > <div id="Layer1" style="position:absolute; left:5px; top:200px; width:800px; height:600px; z-index:1; visibility: hidden;"> <table width="100%" border="1" cellpadding="0" cellspacing="0" bgcolor="#D6D5C5"> <tr> <td><font size="2" face="Tahoma"> <logic:present name="resultText"> <pre><bean:write name="resultText" filter="false"/></pre> </logic:present> </font></td> </tr> </table> </div> <table class="MainTable" id="scrollNumber1" name="encounterTable"> <html:form action="/oscarReport/RptRehabStudy.do"> <tr class="MainTableTopRow"> <td class="MainTableTopRowLeftColumn"> <bean:message key="oscarReport.CDMReport.msgReport"/> </td> <td class="MainTableTopRowRightColumn"> <table class="TopStatusBar" > <tr> <td> <logic:present name="formName"> <bean:write name="formName"/> </logic:present> </td> </tr> </table> </td> </tr> <tr> <td class="MainTableLeftColumn" valign="top"> <html:hidden property="formName" value=""/> <table> <tr> <td nowrap><a href="#" onClick="generateResult('form2MinWalk');">2 Minutes Walk</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formCESD');">CESD</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formCaregiver');">Caregiver</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formCostQuestionnaire');">Cost Questionnaire</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formFalls');">Falls History</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formGripStrength');">Grip Strength</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formHomeFalls');">Home Fast</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formIntakeInfo');">Intake</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formLateLifeFDIDisability');">Late Life FDI Disability</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formLateLifeFDIFunction');">Late Life FDI Function</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formSF36');">SF36</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formSF36Caregiver');">SF36 Caregiver</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formSelfAdministered');">Self Administered</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formSelfEfficacy');">Self Efficacy</a></td> </tr> <tr> <td nowrap><a href="#" onClick="generateResult('formSelfManagement');">Self Management</a></td> </tr> </table> </td> <td class="MainTableRightColumn" valign="top"> <logic:present name="results"> <bean:write name="results" filter="false"/> </logic:present> </td> </tr> <tr> <td class="MainTableBottomRowLeftColumn"> </td> <td class="MainTableBottomRowRightColumn"> </td> </tr> </table> </html:form> </body> </html:html> |
|
From: Ivy C. <ic...@us...> - 2005-01-25 22:19:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17870 Added Files: RptRehabStudyAction.java RptRehabStudyForm.java Log Message: initial commit --- NEW FILE: RptRehabStudyAction.java --- /* * * 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 */ package oscar.oscarReport.pageUtil; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.PrintStream; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.Properties; import java.util.Collection; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.*; import org.apache.struts.action.*; import org.apache.commons.lang.StringEscapeUtils; import oscar.oscarReport.data.*; import oscar.oscarReport.bean.*; import oscar.oscarDB.DBHandler; import oscar.oscarEncounter.pageUtil.EctSessionBean; public class RptRehabStudyAction extends Action { public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { RptRehabStudyForm frm = (RptRehabStudyForm) form; if(request.getSession().getAttribute("user") == null) response.sendRedirect("../logout.htm"); String formName = frm.getFormName(); String results = "<table>"; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "select * from " + formName + " limit 1"; ResultSet rs = db.GetSQL(sql); if(rs.next()) results = results + getHeadingStructure(rs); rs.close(); sql = "select max(formEdited) as formEdited, demographic_no from " + formName + " group by demographic_no"; rs = db.GetSQL(sql); while(rs.next()){ String sqlDemo = "SELECT * FROM " + formName + " where demographic_no='" + rs.getString("demographic_no") + "' AND formEdited='" + rs.getString("formEdited") + "'"; System.out.println("sqlDemo:" + sqlDemo); ResultSet rsDemo = db.GetSQL(sqlDemo); //if(rsDemo.next()) //System.out.println(getStructure(rsDemo)); results = results + getStructure(rsDemo); rsDemo.close(); } rs.close(); db.CloseConn(); } catch(SQLException e){ System.out.println(e.getMessage()); } results = results + "</table>"; request.setAttribute("results", results); request.setAttribute("formName", formName); return mapping.findForward("success"); } public String getHeadingStructure(ResultSet rs) throws SQLException { // assuming multiple rows in rs StringBuffer sb = new StringBuffer(); ResultSetMetaData rsmd = rs.getMetaData(); int columns = rsmd.getColumnCount(); String[] columnNames = new String[columns]; //sb.append("<table>"); for (int i=0; i<columns; i++) { // for each column in result set columnNames[i] = rsmd.getColumnName(i+1); // put names in array // use i+1 or else you're going to get an exception // insert headings for table sb.append("<th class='headerColor'>"); sb.append(columnNames[i]); sb.append("</th>"); } return sb.toString(); } public String getStructure(ResultSet rs) throws SQLException { // assuming multiple rows in rs StringBuffer sb = new StringBuffer(); ResultSetMetaData rsmd = rs.getMetaData(); int columns = rsmd.getColumnCount(); //String rowColor="rowColor1"; String[] columnNames = new String[columns]; System.out.println("number of columns: " + Integer.toString(columns)); while (rs.next()) { sb.append("<tr>"); for(int j=0; j<columns; j++) { System.out.println("columns " + Integer.toString(j)); sb.append("<td>"); sb.append(rs.getString(j+1)); sb.append("</td>"); } //rowColor = rowColor.compareTo("rowColor1")==0?"rowColor2":"rowColor1"; sb.append("</tr>"); } return sb.toString(); } } --- NEW FILE: RptRehabStudyForm.java --- /* * * 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 */ package oscar.oscarReport.pageUtil; import java.io.PrintStream; import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.*; public final class RptRehabStudyForm extends ActionForm { String formName; public String getFormName(){ return formName; } public void setFormName(String formName){ this.formName = formName; } } |
|
From: Ivy C. <ic...@us...> - 2005-01-25 20:07:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18321 Modified Files: struts-config.xml Log Message: added RptRehabStudyAction and RptRehabStudyForm Index: struts-config.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/struts-config.xml,v retrieving revision 1.59 retrieving revision 1.60 diff -C2 -d -r1.59 -r1.60 *** struts-config.xml 7 Jan 2005 21:01:24 -0000 1.59 --- struts-config.xml 25 Jan 2005 20:07:16 -0000 1.60 *************** *** 288,292 **** <form-bean name="RptInitializeFrequencyOfRelevantTestsCDMReportForm" type="oscar.oscarReport.oscarMeasurements.pageUtil.RptInitializeFrequencyOfRelevantTestsCDMReportForm"/> ! <!-- OscarMaintenance start --> <form-bean name="MaintenanceForm" --- 288,293 ---- <form-bean name="RptInitializeFrequencyOfRelevantTestsCDMReportForm" type="oscar.oscarReport.oscarMeasurements.pageUtil.RptInitializeFrequencyOfRelevantTestsCDMReportForm"/> ! <form-bean name="RptRehabStudyForm" ! type="oscar.oscarReport.pageUtil.RptRehabStudyForm"/> <!-- OscarMaintenance start --> <form-bean name="MaintenanceForm" *************** *** 1394,1397 **** --- 1395,1404 ---- <forward name="success" path="/oscarReport/oscarMeasurements/CDMReport.jsp"/> </action> + <action path="/oscarReport/RptRehabStudy" + type="oscar.oscarReport.pageUtil.RptRehabStudyAction" + name="RptRehabStudyForm" + scope="request"> + <forward name="success" path="/oscarReport/oscarReportRehabStudy.jsp"/> + </action> <!-- oscarReport End --> |
|
From: Ivy C. <ic...@us...> - 2005-01-25 18:24:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25915 Modified Files: FrmToXMLUtil.java Log Message: updated present/absent to Present/Absent Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FrmToXMLUtil.java 9 Dec 2004 04:03:09 -0000 1.7 --- FrmToXMLUtil.java 25 Jan 2005 18:24:36 -0000 1.8 *************** *** 300,307 **** else if (xmlName.startsWith("Sel")){ if(input.equalsIgnoreCase("yes")){ ! return "present"; } else{ ! return "absent"; } } --- 300,307 ---- else if (xmlName.startsWith("Sel")){ if(input.equalsIgnoreCase("yes")){ ! return "Present"; } else{ ! return "Absent"; } } |
