Menu
▾
▴
oscarmcmaster-cvscommit
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: Ivy C. <ic...@us...> - 2004-12-07 04:05:21
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14788 Modified Files: FrmFormAction.java Log Message: added translate function for checkbox and radio button value Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FrmFormAction.java 6 Dec 2004 07:10:40 -0000 1.11 --- FrmFormAction.java 7 Dec 2004 04:05:04 -0000 1.12 *************** *** 157,165 **** if(lastDataEnteredDate!=null) props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); if(!gValidator.isBlankOrNull(inputValue)){ props.setProperty(type+"Value", inputValue); ! props.setProperty(type+"Date", observationDate); ! props.setProperty(type+"Comments", comments); if(type.equalsIgnoreCase("BP")){ //extract SBP and DBP for blood pressure --- 157,168 ---- if(lastDataEnteredDate!=null) props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); + System.out.println("type: " + type + " input: " + inputValue); org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); + props.setProperty(type+"Date", observationDate); + props.setProperty(type+"Comments", comments); + if(!gValidator.isBlankOrNull(inputValue)){ props.setProperty(type+"Value", inputValue); ! if(type.equalsIgnoreCase("BP")){ //extract SBP and DBP for blood pressure *************** *** 270,274 **** valid = false; } ! if(!ectValidation.isValidBloodPressure(regExp, inputValue)){ errors.add(inputValueName, new ActionError("error.bloodPressure")); --- 273,277 ---- valid = false; } ! if(mt.getType().equalsIgnoreCase("BP")&&!ectValidation.isValidBloodPressure(regExp, inputValue)){ errors.add(inputValueName, new ActionError("error.bloodPressure")); |
|
From: Ivy C. <ic...@us...> - 2004-12-07 04:04:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14657 Modified Files: VTForm2Osdsf.properties VTFormFromOsdsf.properties Log Message: added datatypes Index: VTFormFromOsdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTFormFromOsdsf.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VTFormFromOsdsf.properties 6 Dec 2004 07:14:54 -0000 1.2 --- VTFormFromOsdsf.properties 7 Dec 2004 04:04:37 -0000 1.3 *************** *** 47,48 **** --- 47,79 ---- 24UADate=Dat_UrineAlbumin + FTNoDate = Dat_FootExam + FTNeValue = Sel_FootExam_Neuropathy + FTIsValue = Sel_FootExam_Ischemia + FTUlValue = Sel_FootExam_Ulcer + FTInValue = Sel_FootExam_Infection + FTOtValue = Sel_FootExam_OtherAbnormality + FTReValue = B_Referred_FootExam + iNoDate = Dat_EyeExam + iDiaValue = Sel_EyeExam_DiabeticRetinopathy + iHypValue = Sel_EyeExam_HypertensiveRetinopathy + iOthValue = Sel_EyeExam_OtherAbnormality + iRefValue = B_Referred_EyeExam + SmkSValue = Int_SmokingAverage_CigsPerDay + SmkSDate = Dat_SmokingAverage + SmkHValue = Int_SmokingCumulative_PackYears + SmkCValue = Dat_SmokingCeased + ExerValue = Int_ExerciseAverage_MinutesPerWeek + DietValue = Int_FruitsAndVegetablesAverage_ServingsPerDay + DpScValue = Sel_Depression_category + StScValue = Sel_Stress_category + LcCtValue = Sel_LocusOfControl_category + MedGValue = Sel_MedicationAdherence_genprob + MedNValue = Sel_MedicationAdherence_beliefs + MedRValue = Sel_MedicationAdherence_recall + MedAValue = Sel_MedicationAdherence_access + NtrCValue = B_Counseled_Diet + ExeCValue = B_Counseled_Exercise + SmCCValue = B_Counseled_SmokingCessation + DiaCValue = B_Counseled_Diabetes + PsyCValue = B_Counseled_Psychosocial + OthCValue = B_Counseled_Other Index: VTForm2Osdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm2Osdsf.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VTForm2Osdsf.properties 3 Dec 2004 16:15:00 -0000 1.1 --- VTForm2Osdsf.properties 7 Dec 2004 04:04:36 -0000 1.2 *************** *** 51,52 **** --- 51,85 ---- 24UADate=DatUrineAlbumin + + FTNoDate = DatFootExam + FTNeValue = SelFootExamNeuropathy + FTIsValue = SelFootExamIschemia + FTUlValue = SelFootExamUlcer + FTInValue = SelFootExamInfection + FTOtValue = SelFootExamOtherAbnormality + FTReValue = BReferredFootExam + iNoDate = DatEyeExam + iDiaValue = SelEyeExamDiabeticRetinopathy + iHypValue = SelEyeExamHypertensiveRetinopathy + iOthValue = SelEyeExamOtherAbnormality + iRefValue = BReferredEyeExam + SmkSValue = IntSmokingAverageCigsPerDay + SmkSDate = DatSmokingAverage + SmkHValue = IntSmokingCumulativePackYears + SmkCValue = DatSmokingCeased + ExerValue = IntExerciseAverageMinutesPerWeek + DietValue = IntFruitsAndVegetablesAverageServingsPerDay + DpScValue = SelDepressionCategory + StScValue = SelStressCategory + LcCtValue = SelLocusOfControlCategory + MedGValue = SelMedicationAdherenceGenprob + MedNValue = SelMedicationAdherenceBeliefs + MedRValue = SelMedicationAdherenceRecall + MedAValue = SelMedicationAdherenceAccess + NtrCValue = BCounseledDiet + ExeCValue = BCounseledExercise + SmCCValue = BCounseledSmokingCessation + DiaCValue = BCounseledDiabetes + PsyCValue = BCounseledPsychosocial + OthCValue = BCounseledOther + |
|
From: Ivy C. <ic...@us...> - 2004-12-07 03:52:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12273 Modified Files: VTForm.xml Log Message: updated exercise validation Index: VTForm.xml =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** VTForm.xml 3 Dec 2004 15:57:07 -0000 1.4 --- VTForm.xml 7 Dec 2004 03:52:38 -0000 1.5 *************** *** 348,354 **** <measuringInstrc>[min/week 0-1200]</measuringInstrc> <validationRule> ! <name>Numeric Value: 0 to 6720</name> <minValue>0</minValue> ! <maxValue>6720</maxValue> <isNumeric>1</isNumeric> </validationRule> --- 348,354 ---- <measuringInstrc>[min/week 0-1200]</measuringInstrc> <validationRule> ! <name>Numeric Value: 0 to 1200</name> <minValue>0</minValue> ! <maxValue>1200</maxValue> <isNumeric>1</isNumeric> </validationRule> |
|
From: Ivy C. <ic...@us...> - 2004-12-06 14:51:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv446 Modified Files: formVTForm.jsp Log Message: removed onSave confirmation dialogue box Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** formVTForm.jsp 6 Dec 2004 14:19:52 -0000 1.11 --- formVTForm.jsp 6 Dec 2004 14:51:24 -0000 1.12 *************** *** 168,175 **** storeSMKSupportData(); storeFTExamSupportData(); ! storeEyeExamSupportData(); ! var ret = confirm("Are you sure you want to update Vascular Tracker?"); ! ! return ret; } function onExit() { --- 168,172 ---- storeSMKSupportData(); storeFTExamSupportData(); ! storeEyeExamSupportData(); } function onExit() { *************** *** 452,456 **** <tr> <td align="left"> ! <input type="submit" value="Update VT" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> --- 449,453 ---- <tr> <td align="left"> ! <input type="submit" value="Update VT" onclick="javascript:onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> *************** *** 1443,1447 **** <td align="left"> <input type="hidden" name="submit" value=""/> ! <input type="submit" value="Update VT" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> --- 1440,1444 ---- <td align="left"> <input type="hidden" name="submit" value=""/> ! <input type="submit" value="Update VT" onclick="javascript:onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> |
|
From: Ivy C. <ic...@us...> - 2004-12-06 14:20:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26008 Modified Files: formVTForm.jsp Log Message: added javascript: updateWaistHipRatio() Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** formVTForm.jsp 6 Dec 2004 07:21:17 -0000 1.10 --- formVTForm.jsp 6 Dec 2004 14:19:52 -0000 1.11 *************** *** 201,204 **** --- 201,207 ---- popup.focus(); } + else{ + alert("Vascular Tracker Decision Support Page not found!"); + } } *************** *** 212,215 **** --- 215,240 ---- } + function updateWaistHipRatio(){ + var e = document.forms[0].elements; + var waist, hip, ratio; + for(i=50; i<70; i++){ + switch(e[i].name){ + case 'value(WHRValue)': ratio = i; break; + case 'value(WCValue)': waist = i; break; + case 'value(HCValue)': hip = i; break; + } + } + if (document.forms[0].elements[waist].value=="" || document.forms[0].elements[hip].value==""){ + document.forms[0].elements[ratio].readOnly = false; + } + else{ + var r = document.forms[0].elements[ratio].value; + var w = document.forms[0].elements[waist].value; + var h = document.forms[0].elements[hip].value; + document.forms[0].elements[ratio].value = parseInt(w) / parseInt(h); + document.forms[0].elements[ratio].readOnly = true; + } + } + function storeSMKSupportData(){ //getElementbyId function doesn't work on these elements *************** *** 799,803 **** </td> ! <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td> --- 824,828 ---- </td> ! <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onfocus="javascript: updateWaistHipRatio();"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td> *************** *** 815,819 **** </td> ! <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td> --- 840,844 ---- </td> ! <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%" onchange="javascript: updateWaistHipRatio();"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td> *************** *** 831,835 **** </td> ! <td class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td> --- 856,860 ---- </td> ! <td class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%" onchange="javascript: updateWaistHipRatio();"/></td> <td class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td> |
|
From: Ivy C. <ic...@us...> - 2004-12-06 07:21:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3180 Modified Files: formVTForm.jsp Log Message: enlarged the window size Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** formVTForm.jsp 4 Dec 2004 15:56:37 -0000 1.9 --- formVTForm.jsp 6 Dec 2004 07:21:17 -0000 1.10 *************** *** 192,201 **** function popupDecisionSupport(){ var varpage = "<%=request.getAttribute("decisionSupportURL")%>"; ! var vheight = 500; var vwidth = 400; var posX = 400; var posY = 0; if(varpage!="null"){ ! windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=600"; var popup=window.open(varpage, "Decision Support", windowprops); popup.focus(); --- 192,201 ---- function popupDecisionSupport(){ var varpage = "<%=request.getAttribute("decisionSupportURL")%>"; ! var vheight = 760; var vwidth = 400; var posX = 400; var posY = 0; if(varpage!="null"){ ! windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=680"; var popup=window.open(varpage, "Decision Support", windowprops); popup.focus(); *************** *** 204,207 **** --- 204,208 ---- } + function showHideItem(id){ if(document.getElementById(id).style.display == 'none') *************** *** 415,419 **** } </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(670,710); popupDecisionSupport();"> <!-- --> --- 416,420 ---- } </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(680,760); popupDecisionSupport();"> <!-- --> |
|
From: Ivy C. <ic...@us...> - 2004-12-06 07:15:13
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2162 Modified Files: VTFormFromOsdsf.properties Log Message: updated all the HbA1c to HbA1C Index: VTFormFromOsdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTFormFromOsdsf.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** VTFormFromOsdsf.properties 3 Dec 2004 16:15:00 -0000 1.1 --- VTFormFromOsdsf.properties 6 Dec 2004 07:14:54 -0000 1.2 *************** *** 16,22 **** HRValue=Int_Pulse_bpm ! HbA1Value=Dbl_HbA1c ! HbA1Date=Dat_HbA1c BGValue=Dbl_Glucose_mM --- 16,22 ---- HRValue=Int_Pulse_bpm ! HbA1Value=Dbl_HbA1C ! HbA1Date=Dat_HbA1C BGValue=Dbl_Glucose_mM |
|
From: Ivy C. <ic...@us...> - 2004-12-06 07:13:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1928 Modified Files: FrmSetupFormAction.java Log Message: added prefill BP Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FrmSetupFormAction.java 6 Dec 2004 00:50:34 -0000 1.10 --- FrmSetupFormAction.java 6 Dec 2004 07:13:24 -0000 1.11 *************** *** 148,190 **** } else{ ! ! //prefill data from Miles if its dataentered date is > than the one in measurements ! String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); ! if (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(dMiles!=null && dMeas!=null){ ! if(dMiles.compareTo(dMeas)>0){ ! frm.setValue(mt.getType()+"Value", value); 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?"":value.replaceAll("/", "-")); - request.setAttribute(mt.getType() + "Date", dMiles); - } - } - else{ - frm.setValue(mt.getType() + "Date", today); - request.setAttribute(mt.getType() + "Date", today); } } } else{ ! frm.setValue(mt.getType() + "Date", today); ! request.setAttribute(mt.getType() + "Date", today); } - request.setAttribute(mt.getType() + "Comments", ""); } --- 148,219 ---- } 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 (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 (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){ ! 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", ""); } } |
|
From: Ivy C. <ic...@us...> - 2004-12-06 07:12:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1723 Modified Files: FrmVTData.java Log Message: updated all the HbA1c to HbA1C Index: FrmVTData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/data/FrmVTData.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FrmVTData.java 3 Dec 2004 16:13:56 -0000 1.1 --- FrmVTData.java 6 Dec 2004 07:12:08 -0000 1.2 *************** *** 172,184 **** String dat_EyeExam$signed_how; ! String dbl_HbA1c; ! String dbl_HbA1c$signed_when; ! String dbl_HbA1c$signed_who; ! String dbl_HbA1c$signed_how; ! String dat_HbA1c; ! String dat_HbA1c$signed_when; ! String dat_HbA1c$signed_who; ! String dat_HbA1c$signed_how; String dbl_Glucose_mM; --- 172,184 ---- String dat_EyeExam$signed_how; ! String dbl_HbA1C; ! String dbl_HbA1C$signed_when; ! String dbl_HbA1C$signed_who; ! String dbl_HbA1C$signed_how; ! String dat_HbA1C; ! String dat_HbA1C$signed_when; ! String dat_HbA1C$signed_who; ! String dat_HbA1C$signed_how; String dbl_Glucose_mM; *************** *** 1289,1315 **** this.dat_Glucose$signed_who = dat_Glucose$signed_who; } ! public String getDat_HbA1c() { ! return dat_HbA1c; } ! public void setDat_HbA1c(String dat_HbA1c) { ! this.dat_HbA1c = dat_HbA1c; } ! public String getDat_HbA1c$signed_how() { ! return dat_HbA1c$signed_how; } ! public void setDat_HbA1c$signed_how(String dat_HbA1c$signed_how) { ! this.dat_HbA1c$signed_how = dat_HbA1c$signed_how; } ! public String getDat_HbA1c$signed_when() { ! return dat_HbA1c$signed_when; } ! public void setDat_HbA1c$signed_when(String dat_HbA1c$signed_when) { ! this.dat_HbA1c$signed_when = dat_HbA1c$signed_when; } ! public String getDat_HbA1c$signed_who() { ! return dat_HbA1c$signed_who; } ! public void setDat_HbA1c$signed_who(String dat_HbA1c$signed_who) { ! this.dat_HbA1c$signed_who = dat_HbA1c$signed_who; } public String getDat_HDL() { --- 1289,1315 ---- this.dat_Glucose$signed_who = dat_Glucose$signed_who; } ! public String getDat_HbA1C() { ! return dat_HbA1C; } ! public void setDat_HbA1C(String dat_HbA1C) { ! this.dat_HbA1C = dat_HbA1C; } ! public String getDat_HbA1C$signed_how() { ! return dat_HbA1C$signed_how; } ! public void setDat_HbA1C$signed_how(String dat_HbA1C$signed_how) { ! this.dat_HbA1C$signed_how = dat_HbA1C$signed_how; } ! public String getdat_HbA1C$signed_when() { ! return dat_HbA1C$signed_when; } ! public void setdat_HbA1C$signed_when(String dat_HbA1C$signed_when) { ! this.dat_HbA1C$signed_when = dat_HbA1C$signed_when; } ! public String getdat_HbA1C$signed_who() { ! return dat_HbA1C$signed_who; } ! public void setdat_HbA1C$signed_who(String dat_HbA1C$signed_who) { ! this.dat_HbA1C$signed_who = dat_HbA1C$signed_who; } public String getDat_HDL() { *************** *** 1481,1507 **** this.dbl_Glucose_mM$signed_who = dbl_Glucose_mM$signed_who; } ! public String getDbl_HbA1c() { ! return dbl_HbA1c; } ! public void setDbl_HbA1c(String dbl_HbA1c) { ! this.dbl_HbA1c = dbl_HbA1c; } ! public String getDbl_HbA1c$signed_how() { ! return dbl_HbA1c$signed_how; } ! public void setDbl_HbA1c$signed_how(String dbl_HbA1c$signed_how) { ! this.dbl_HbA1c$signed_how = dbl_HbA1c$signed_how; } ! public String getDbl_HbA1c$signed_when() { ! return dbl_HbA1c$signed_when; } ! public void setDbl_HbA1c$signed_when(String dbl_HbA1c$signed_when) { ! this.dbl_HbA1c$signed_when = dbl_HbA1c$signed_when; } ! public String getDbl_HbA1c$signed_who() { ! return dbl_HbA1c$signed_who; } ! public void setDbl_HbA1c$signed_who(String dbl_HbA1c$signed_who) { ! this.dbl_HbA1c$signed_who = dbl_HbA1c$signed_who; } public String getDbl_HDL_mM() { --- 1481,1507 ---- this.dbl_Glucose_mM$signed_who = dbl_Glucose_mM$signed_who; } ! public String getDbl_HbA1C() { ! return dbl_HbA1C; } ! public void setDbl_HbA1C(String dbl_HbA1C) { ! this.dbl_HbA1C = dbl_HbA1C; } ! public String getDbl_HbA1C$signed_how() { ! return dbl_HbA1C$signed_how; } ! public void setDbl_HbA1C$signed_how(String dbl_HbA1C$signed_how) { ! this.dbl_HbA1C$signed_how = dbl_HbA1C$signed_how; } ! public String getDbl_HbA1C$signed_when() { ! return dbl_HbA1C$signed_when; } ! public void setDbl_HbA1C$signed_when(String dbl_HbA1C$signed_when) { ! this.dbl_HbA1C$signed_when = dbl_HbA1C$signed_when; } ! public String getDbl_HbA1C$signed_who() { ! return dbl_HbA1C$signed_who; } ! public void setDbl_HbA1C$signed_who(String dbl_HbA1C$signed_who) { ! this.dbl_HbA1C$signed_who = dbl_HbA1C$signed_who; } public String getDbl_HDL_mM() { |
|
From: Ivy C. <ic...@us...> - 2004-12-06 07:10:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1458 Modified Files: FrmFormAction.java Log Message: only set non blank and non null inputvalue Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** FrmFormAction.java 6 Dec 2004 05:25:37 -0000 1.10 --- FrmFormAction.java 6 Dec 2004 07:10:40 -0000 1.11 *************** *** 157,173 **** if(lastDataEnteredDate!=null) props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); ! props.setProperty(type+"Value", inputValue); ! props.setProperty(type+"Date", observationDate); ! props.setProperty(type+"Comments", comments); ! if(type.equalsIgnoreCase("BP")){ ! //extract SBP and DBP for blood pressure ! String bp = inputValue; ! if(bp!=null){ ! int sbpIndex = bp.indexOf("/"); ! if(sbpIndex>=0){ ! String sbp = bp.substring(0,sbpIndex); ! String dbp = bp.substring(sbpIndex+1); ! props.setProperty("SBPValue", sbp); ! props.setProperty("DBPValue", dbp); } } --- 157,176 ---- if(lastDataEnteredDate!=null) props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); ! org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); ! if(!gValidator.isBlankOrNull(inputValue)){ ! props.setProperty(type+"Value", inputValue); ! props.setProperty(type+"Date", observationDate); ! props.setProperty(type+"Comments", comments); ! if(type.equalsIgnoreCase("BP")){ ! //extract SBP and DBP for blood pressure ! String bp = inputValue; ! if(bp!=null){ ! int sbpIndex = bp.indexOf("/"); ! if(sbpIndex>=0){ ! String sbp = bp.substring(0,sbpIndex); ! String dbp = bp.substring(sbpIndex+1); ! props.setProperty("SBPValue", sbp); ! props.setProperty("DBPValue", dbp); ! } } } |
|
From: Ivy C. <ic...@us...> - 2004-12-06 07:09:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1205 Modified Files: FrmToXMLUtil.java Log Message: updated to include all the filled data in the xml Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** FrmToXMLUtil.java 6 Dec 2004 05:17:28 -0000 1.4 --- FrmToXMLUtil.java 6 Dec 2004 07:09:12 -0000 1.5 *************** *** 78,117 **** String methodCall = (String) nameProps.get(itemName+"Value"); //System.out.println("method "+methodCall); ! if(!dataProps.getProperty(itemName+"Value").equalsIgnoreCase("")||dataProps.getProperty(itemName+"Value")!=null){ ! if(mt.getType().equalsIgnoreCase("BP")){ ! 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); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! 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); ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! } ! ! else if (methodCall != null){ Class cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); --- 78,101 ---- String methodCall = (String) nameProps.get(itemName+"Value"); //System.out.println("method "+methodCall); ! org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); ! ! if(mt.getType().equalsIgnoreCase("BP") && !gValidator.isBlankOrNull(dataProps.getProperty("SBPValue"))){ ! 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); + //String date = dataProps.getProperty(itemName+"Date"); + //setWhoWhatWhereWhen(obj,how,who,when,date); + } + methodCall = (String) nameProps.get("DBPValue"); + if (methodCall != null){ Class cls = visit.getClass(); //System.out.println("calling addNew"+methodCall); *************** *** 120,125 **** Object obj = addNewMethod.invoke(visit,new Object[]{}); ! String value = dataProps.getProperty(itemName+"Value"); ! System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); --- 104,109 ---- 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); *************** *** 127,131 **** //setWhoWhatWhereWhen(obj,how,who,when,date); } ! methodCall = (String) nameProps.get(itemName+"Date"); //System.out.println("method "+methodCall); if (methodCall != null){ --- 111,115 ---- //setWhoWhatWhereWhen(obj,how,who,when,date); } ! methodCall = (String) nameProps.get("BPDate"); //System.out.println("method "+methodCall); if (methodCall != null){ *************** *** 138,142 **** 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); --- 122,161 ---- 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); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! ! } ! ! 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"); ! //System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! ! methodCall = (String) nameProps.get(itemName+"Date"); ! //System.out.println("method "+methodCall); ! 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); *************** *** 145,148 **** --- 164,168 ---- } } + } *************** *** 176,180 **** xmlOptions.setSavePrettyPrint(); xmlOptions.setSavePrettyPrintIndent(3); ! String xmlStr = visitDocument.xmlText(xmlOptions); System.out.println(xmlStr); return xmlStr; --- 196,203 ---- xmlOptions.setSavePrettyPrint(); xmlOptions.setSavePrettyPrintIndent(3); ! String xmlStr = visitDocument.xmlText(xmlOptions); ! System.out.println("*********************************************************************************"); ! System.out.println("************************** XML GENERATED BY OSCAR *******************************"); ! System.out.println("*********************************************************************************"); System.out.println(xmlStr); return xmlStr; |
|
From: Ivy C. <ic...@us...> - 2004-12-06 05:25:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16528 Modified Files: FrmFormAction.java Log Message: updated xml-rpc name Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FrmFormAction.java 4 Dec 2004 15:47:40 -0000 1.9 --- FrmFormAction.java 6 Dec 2004 05:25:37 -0000 1.10 *************** *** 328,337 **** private String connect2OSDSF(String xmlResult){ Vector data2OSDSF = new Vector(); data2OSDSF.add(xmlResult); ! data2OSDSF.add("dummy"); //send to osdsf thru XMLRPC try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.saveAndGetRlt", data2OSDSF); System.out.println("Reverse result: " + result); return result; --- 328,338 ---- private String connect2OSDSF(String xmlResult){ Vector data2OSDSF = new Vector(); + data2OSDSF.add("xml"); data2OSDSF.add(xmlResult); ! //data2OSDSF.add("dummy"); //send to osdsf thru XMLRPC try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.getAndSaveRlt", data2OSDSF); System.out.println("Reverse result: " + result); return result; |
|
From: Ivy C. <ic...@us...> - 2004-12-06 05:25:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16398 Modified Files: formSaveAndExit.jsp Log Message: added close popup javascript function Index: formSaveAndExit.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formSaveAndExit.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** formSaveAndExit.jsp 4 Dec 2004 04:06:59 -0000 1.3 --- formSaveAndExit.jsp 6 Dec 2004 05:25:02 -0000 1.4 *************** *** 51,54 **** --- 51,55 ---- function write2Parent(text){ + self.window.close(); opener.document.encForm.enTextarea.value = opener.document.encForm.enTextarea.value + "\n" + text; *************** *** 57,66 **** } ! </script> <link rel="stylesheet" type="text/css" href="../styles.css"> ! <body topmargin="0" leftmargin="0" vlink="#0000FF"> <table> <tr> --- 58,72 ---- } ! function closePopup(){ ! if(self.window && self.open.window && !self.closed){ ! self.open.window.close(); ! self.close(); ! } ! } </script> <link rel="stylesheet" type="text/css" href="../styles.css"> ! <body topmargin="0" leftmargin="0" vlink="#0000FF" onunload="javascript: closePopup()"> <table> <tr> |
|
From: Ivy C. <ic...@us...> - 2004-12-06 05:17:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15125 Modified Files: FrmToXMLUtil.java Log Message: added dateType in setDateTypeValue added setSBP and DBP Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FrmToXMLUtil.java 4 Dec 2004 15:48:44 -0000 1.3 --- FrmToXMLUtil.java 6 Dec 2004 05:17:28 -0000 1.4 *************** *** 26,30 **** --- 26,32 ---- import java.io.*; import java.lang.reflect.*; + import java.text.*; import org.apache.xmlbeans.*; + import org.apache.xmlbeans.XmlCalendar; import oscar.oscarEncounter.oscarMeasurements.bean.*; import oscar.oscarRx.data.*; *************** *** 76,111 **** String methodCall = (String) nameProps.get(itemName+"Value"); //System.out.println("method "+methodCall); ! 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+"Value"); ! //System.out.println("who "+who+" how "+how+ " when "+when+ " value "+value); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! methodCall = (String) nameProps.get(itemName+"Date"); ! //System.out.println("method "+methodCall); ! 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("who "+who+" how "+how+ " when "+when+ " value "+value); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } } --- 78,148 ---- String methodCall = (String) nameProps.get(itemName+"Value"); //System.out.println("method "+methodCall); ! if(!dataProps.getProperty(itemName+"Value").equalsIgnoreCase("")||dataProps.getProperty(itemName+"Value")!=null){ ! if(mt.getType().equalsIgnoreCase("BP")){ ! 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); ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! 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); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! } ! ! else 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+"Value"); ! System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); ! setWhoWhatWhereWhen(obj,how,who,when,value); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! methodCall = (String) nameProps.get(itemName+"Date"); ! //System.out.println("method "+methodCall); ! 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); ! ! //String date = dataProps.getProperty(itemName+"Date"); ! //setWhoWhatWhereWhen(obj,how,who,when,date); ! } ! } } *************** *** 116,120 **** for(int i=0; i<prescribedDrugs.length; i++){ SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug(); ! drug.setDrugCod("ATC_"+prescribedDrugs[i].getAtcCode()); SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName(); drugName.setSignedHow(how); --- 153,157 ---- for(int i=0; i<prescribedDrugs.length; i++){ SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug(); ! drug.setDrugCod("ATC_"+prescribedDrugs[i].getAtcCode().trim()); SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName(); drugName.setSignedHow(how); *************** *** 167,174 **** i = 1; }catch (NoSuchMethodException noSuchMethod1){} try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {boolean.class}); ! i = 2; Boolean bool = new Boolean(value); setValueMethod.invoke(obj, new Object[] {bool}); --- 204,229 ---- i = 1; }catch (NoSuchMethodException noSuchMethod1){} + + try{ + Method setValueMethod = cls.getMethod("setValue",new Class[] {int.class}); + if(value.equalsIgnoreCase("")) + value="0"; + Integer integer = new Integer(value); + setValueMethod.invoke(obj, new Object[] {integer}); + i = 2; + }catch (NoSuchMethodException noSuchMethod1){} + + try{ + Method setValueMethod = cls.getMethod("setValue",new Class[] {double.class}); + if(value.equalsIgnoreCase("")) + value="0"; + Double dbl = new Double(value); + setValueMethod.invoke(obj, new Object[] {dbl}); + i = 3; + }catch (NoSuchMethodException noSuchMethod1){} try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {boolean.class}); ! i = 4; Boolean bool = new Boolean(value); setValueMethod.invoke(obj, new Object[] {bool}); *************** *** 177,184 **** try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {Calendar.class}); ! i = 3; ! Calendar c = Calendar.getInstance(); //TODO need way to change String Date into a Calendar instance }catch (NoSuchMethodException noSuchMethod3){} return i; } --- 232,256 ---- try{ Method setValueMethod = cls.getMethod("setValue",new Class[] {Calendar.class}); ! i = 5; ! if(value!=null){ ! //DateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); ! //Date date = (Date)formatter.parse(value); ! Calendar c = new XmlCalendar(value); ! //c.setTime(date); ! setValueMethod.invoke(obj, new Object[] {c}); ! } ! //TODO need way to change String Date into a Calendar instance }catch (NoSuchMethodException noSuchMethod3){} + + try{ + Method setValueMethod = cls.getMethod("setValue",new Class[] {Date.class}); + i = 5; + if(value!=null){ + Date date = new Date(value); + setValueMethod.invoke(obj, new Object[] {date}); + } + + }catch (NoSuchMethodException noSuchMethod3){} return i; } |
|
From: Ivy C. <ic...@us...> - 2004-12-06 00:50:44
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26271 Modified Files: FrmSetupFormAction.java Log Message: updated xml-rpc for getPatientRlt Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FrmSetupFormAction.java 3 Dec 2004 21:41:26 -0000 1.9 --- FrmSetupFormAction.java 6 Dec 2004 00:50:34 -0000 1.10 *************** *** 92,95 **** --- 92,96 ---- String formName = (String) request.getParameter("formName"); String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); + List drugLists = getDrugList(demo); *************** *** 114,119 **** props.setProperty("demographic_no", demo); props.setProperty("provider_no", providerNo); ! String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); ! String decisionSupportURL = connect2OSDSF(xmlData); System.out.println("decisionSupportURL" + decisionSupportURL); request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml(decisionSupportURL)); --- 115,120 ---- props.setProperty("demographic_no", demo); props.setProperty("provider_no", providerNo); ! //String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); ! String decisionSupportURL = getPatientRlt(demo); System.out.println("decisionSupportURL" + decisionSupportURL); request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml(decisionSupportURL)); *************** *** 148,174 **** else{ ! String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); ! //System.out.println("method "+methodCall); if (vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType()+"Value", value); ! //System.out.println(mt.getType()+"value from miles: " + value); ! ! String dateMethodCall = (String) nameProps.get(mt.getType()+"Date"); ! //System.out.println("method "+methodCall); ! 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); ! //System.out.println(mt.getType()+"date from miles: " + value); } - else{ - vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); - value = (String) vtGetMethods.invoke(vtData, new Object[]{}); - frm.setValue(mt.getType() + "Date", value==null?"":value.replaceAll("/", "-")); - request.setAttribute(mt.getType() + "Date", value); - } } else{ --- 149,184 ---- else{ ! //prefill data from Miles if its dataentered date is > than the one in measurements ! String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); if (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(dMiles!=null && dMeas!=null){ ! if(dMiles.compareTo(dMeas)>0){ ! frm.setValue(mt.getType()+"Value", value); ! 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?"":value.replaceAll("/", "-")); ! request.setAttribute(mt.getType() + "Date", dMiles); ! } ! } ! else{ ! frm.setValue(mt.getType() + "Date", today); ! request.setAttribute(mt.getType() + "Date", today); ! } } } else{ *************** *** 247,258 **** } ! private String connect2OSDSF(String xmlResult){ Vector data2OSDSF = new Vector(); ! data2OSDSF.add(xmlResult); ! data2OSDSF.add("dummy"); //send to osdsf thru XMLRPC try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.saveAndGetRlt", data2OSDSF); System.out.println("Reverse result: " + result); return result; --- 257,268 ---- } ! private String getPatientRlt(String demographicNo){ Vector data2OSDSF = new Vector(); ! data2OSDSF.add("patientCod"); ! data2OSDSF.add(demographicNo); //send to osdsf thru XMLRPC try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.getPatientRlt", data2OSDSF); System.out.println("Reverse result: " + result); return result; *************** *** 271,275 **** private String getMostRecentRecord(String demographicNo){ Vector ret = new Vector(); ! ret.addElement("getMostRecentRecord"); ret.addElement(demographicNo); //send to osdsf thru XMLRPC --- 281,285 ---- private String getMostRecentRecord(String demographicNo){ Vector ret = new Vector(); ! ret.addElement("patientCod"); ret.addElement(demographicNo); //send to osdsf thru XMLRPC |
|
From: Ivy C. <ic...@us...> - 2004-12-04 15:56:48
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12968 Modified Files: formVTForm.jsp Log Message: updated updateVT confirmation dialogue Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** formVTForm.jsp 4 Dec 2004 15:45:52 -0000 1.8 --- formVTForm.jsp 4 Dec 2004 15:56:37 -0000 1.9 *************** *** 169,173 **** storeFTExamSupportData(); storeEyeExamSupportData(); ! var ret = confirm("Are you sure you want to save this form?"); return ret; --- 169,173 ---- storeFTExamSupportData(); storeEyeExamSupportData(); ! var ret = confirm("Are you sure you want to update Vascular Tracker?"); return ret; |
|
From: Ivy C. <ic...@us...> - 2004-12-04 15:48:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11104 Modified Files: FrmToXMLUtil.java Log Message: updated _dateFormat Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrmToXMLUtil.java 3 Dec 2004 15:58:07 -0000 1.2 --- FrmToXMLUtil.java 4 Dec 2004 15:48:44 -0000 1.3 *************** *** 47,51 **** public static String convertToXml(Vector measurementTypes, Properties nameProps, Properties dataProps){ // TODO code application logic here ! String _dateFormat = "yyyy/MM/dd"; String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); --- 47,51 ---- public static String convertToXml(Vector measurementTypes, Properties nameProps, Properties dataProps){ // TODO code application logic here ! String _dateFormat = "yyyy-MM-dd hh:mm:ss"; String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); |
|
From: Ivy C. <ic...@us...> - 2004-12-04 15:47:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10918 Modified Files: FrmFormAction.java Log Message: updated xml-rpc Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrmFormAction.java 3 Dec 2004 21:48:54 -0000 1.8 --- FrmFormAction.java 4 Dec 2004 15:47:40 -0000 1.9 *************** *** 333,337 **** try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.vtXMLRtn", data2OSDSF); System.out.println("Reverse result: " + result); return result; --- 333,337 ---- try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.saveAndGetRlt", data2OSDSF); System.out.println("Reverse result: " + result); return result; |
|
From: Ivy C. <ic...@us...> - 2004-12-04 15:46:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10540 Modified Files: formVTForm.jsp Log Message: added controlEyeExam and controlFTExam javascript function Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** formVTForm.jsp 4 Dec 2004 05:38:47 -0000 1.7 --- formVTForm.jsp 4 Dec 2004 15:45:52 -0000 1.8 *************** *** 300,330 **** } ! if(document.forms[0].elements[ftNoId].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); ! document.forms[0].elements[ftNeId].disabled= false; ! document.forms[0].elements[ftIsId].disabled= false; ! document.forms[0].elements[ftUlId].disabled= false; ! document.forms[0].elements[ftInId].disabled= false; ! document.forms[0].elements[ftOtId].disabled= false; ! document.forms[0].elements[ftReId].disabled= false; } else{ //uncheck and disable all foot exam checkbox //alert("uncheck all foot exam checkboxes"); ! document.forms[0].elements[ftNeId].checked= false; ! document.forms[0].elements[ftIsId].checked= false; ! document.forms[0].elements[ftUlId].checked= false; ! document.forms[0].elements[ftInId].checked= false; ! document.forms[0].elements[ftOtId].checked= false; ! document.forms[0].elements[ftReId].checked= false; //alert("disable all foot exam checkboxes"); ! document.forms[0].elements[ftNeId].disabled= true; ! document.forms[0].elements[ftIsId].disabled= true; ! document.forms[0].elements[ftUlId].disabled= true; ! document.forms[0].elements[ftInId].disabled= true; ! document.forms[0].elements[ftOtId].disabled= true; ! document.forms[0].elements[ftReId].disabled= true; } } --- 300,330 ---- } ! if(document.forms[0].elements[ftNoId-1].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); ! document.forms[0].elements[ftNeId-1].disabled= false; ! document.forms[0].elements[ftIsId-1].disabled= false; ! document.forms[0].elements[ftUlId-1].disabled= false; ! document.forms[0].elements[ftInId-1].disabled= false; ! document.forms[0].elements[ftOtId-1].disabled= false; ! document.forms[0].elements[ftReId-1].disabled= false; } else{ //uncheck and disable all foot exam checkbox //alert("uncheck all foot exam checkboxes"); ! document.forms[0].elements[ftNeId-1].checked= false; ! document.forms[0].elements[ftIsId-1].checked= false; ! document.forms[0].elements[ftUlId-1].checked= false; ! document.forms[0].elements[ftInId-1].checked= false; ! document.forms[0].elements[ftOtId-1].checked= false; ! document.forms[0].elements[ftReId-1].checked= false; //alert("disable all foot exam checkboxes"); ! document.forms[0].elements[ftNeId-1].disabled= true; ! document.forms[0].elements[ftIsId-1].disabled= true; ! document.forms[0].elements[ftUlId-1].disabled= true; ! document.forms[0].elements[ftInId-1].disabled= true; ! document.forms[0].elements[ftOtId-1].disabled= true; ! document.forms[0].elements[ftReId-1].disabled= true; } } *************** *** 372,378 **** var e = document.forms[0].elements; var eyeNoId, eyeHypId, eyeDiaId, eyeOthId, eyeRefId; ! for(i=50; i< e.length; i++){ switch(e[i].name){ ! case 'value(iNoValue)': eyeNoId = i; break; case 'value(iHypValue)': eyeHypId = i; break; case 'value(iDiaValue)': eyeDiaId = i; break; --- 372,379 ---- var e = document.forms[0].elements; var eyeNoId, eyeHypId, eyeDiaId, eyeOthId, eyeRefId; ! ! for(i=50; i< e.length; i++){ switch(e[i].name){ ! case 'value(iNoValue)': eyeNoId = i ; break; case 'value(iHypValue)': eyeHypId = i; break; case 'value(iDiaValue)': eyeDiaId = i; break; *************** *** 382,414 **** } ! if(document.forms[0].elements[eyeNoId][0].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); ! document.forms[0].elements[eyeHypId][0].disabled= false; ! document.forms[0].elements[eyeDiaId][0].disabled= false; ! document.forms[0].elements[eyeOthId][0].disabled= false; ! document.forms[0].elements[eyeRefId][0].disabled= false; ! document.forms[0].elements[eyeHypId][1].disabled= false; ! document.forms[0].elements[eyeDiaId][1].disabled= false; ! document.forms[0].elements[eyeOthId][1].disabled= false; ! document.forms[0].elements[eyeRefId][1].disabled= false; } ! else if(document.forms[0].elements[eyeNoId][0].checked == true){ //uncheck and disable all foot exam checkbox //alert("uncheck all foot exam checkboxes"); ! document.forms[0].elements[eyeHypId][0].checked= false; ! document.forms[0].elements[eyeDiaId][0].checked= false; ! document.forms[0].elements[eyeOthId][0].checked= false; ! document.forms[0].elements[eyeRefId][0].checked= false; ! document.forms[0].elements[eyeHypId][1].checked= true; ! document.forms[0].elements[eyeDiaId][1].checked= true; ! document.forms[0].elements[eyeOthId][1].checked= true; ! document.forms[0].elements[eyeRefId][1].checked= true; //alert("disable all foot exam checkboxes"); ! document.forms[0].elements[eyeHypId][0].disabled= true; ! document.forms[0].elements[eyeDiaId][0].disabled= true; ! document.forms[0].elements[eyeOthId][0].disabled= true; ! document.forms[0].elements[eyeRefId][0].disabled= true; } } --- 383,415 ---- } ! if(document.forms[0].elements[eyeNoId-1].checked == false){ //enable all foot exam checkbox //alert("enable all foot exam checkboxes"); ! document.forms[0].elements[eyeHypId-1].disabled= false; ! document.forms[0].elements[eyeDiaId-1].disabled= false; ! document.forms[0].elements[eyeOthId-1].disabled= false; ! document.forms[0].elements[eyeRefId-1].disabled= false; ! //document.forms[0].elements[eyeHypId].disabled= false; ! //document.forms[0].elements[eyeDiaId].disabled= false; ! //document.forms[0].elements[eyeOthId].disabled= false; ! //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"); ! document.forms[0].elements[eyeHypId-1].checked= false; ! document.forms[0].elements[eyeDiaId-1].checked= false; ! document.forms[0].elements[eyeOthId-1].checked= false; ! document.forms[0].elements[eyeRefId-1].checked= false; ! //document.forms[0].elements[eyeHypId].checked= true; ! //document.forms[0].elements[eyeDiaId].checked= true; ! //document.forms[0].elements[eyeOthId].checked= true; ! //document.forms[0].elements[eyeRefId].checked= true; //alert("disable all foot exam checkboxes"); ! document.forms[0].elements[eyeHypId-1].disabled= true; ! document.forms[0].elements[eyeDiaId-1].disabled= true; ! document.forms[0].elements[eyeOthId-1].disabled= true; ! document.forms[0].elements[eyeRefId-1].disabled= true; } } *************** *** 468,474 **** <table cellpadding='1' cellspacing='0'width="100%"> <tr> ! <th class="subTitle" style="text-align:left"> On Going Concern ! </th> </tr> <tr> --- 469,475 ---- <table cellpadding='1' cellspacing='0'width="100%"> <tr> ! <td class="subTitle" style="text-align:left"> On Going Concern ! </td> </tr> <tr> *************** *** 919,924 **** </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(FTNoValue)" value="yes" />Yes ! <html:radio property="value(FTNoValue)" value="no"/>No </td> <td class="dataEntryTable" rowspan="7" valign="top" align="center"> </td> --- 920,925 ---- </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> *************** *** 1039,1044 **** </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(iNoValue)" value="yes"/>Yes ! <html:radio property="value(iNoValue)" value="no"/>No </td> <td class="dataEntryTable" rowspan="7" valign="top" align="center"> </td> --- 1040,1045 ---- </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> *************** *** 1259,1263 **** <tr> <td> ! <html:textarea property="value(diagnosisVT)" cols="80" style="height:80"></html:textarea> </td> </tr> --- 1260,1264 ---- <tr> <td> ! <html:textarea property="value(diagnosisVT)" cols="78" style="height:80"></html:textarea> </td> </tr> |
|
From: Ivy C. <ic...@us...> - 2004-12-04 05:38:58
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv369 Modified Files: formVTForm.jsp Log Message: resized vital and labs comment boxes Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** formVTForm.jsp 3 Dec 2004 21:51:01 -0000 1.6 --- formVTForm.jsp 4 Dec 2004 05:38:47 -0000 1.7 *************** *** 783,787 **** <td class="dataEntryTable" align="center"><html:text property="value(BPValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(BPDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(BPComments)" size="34%" tabindex="9999"/></td> </tr> <tr> --- 783,787 ---- <td class="dataEntryTable" align="center"><html:text property="value(BPValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(BPDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(BPComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 799,803 **** <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="34%" tabindex="9999"/></td> </tr> <tr> --- 799,803 ---- <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 815,819 **** <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="34%" tabindex="9999"/></td> </tr> <tr> --- 815,819 ---- <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 831,835 **** <td class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="34%" tabindex="9999"/></td> </tr> <tr class="dataEntryTable"> --- 831,835 ---- <td class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"/></td> <td class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td> </tr> <tr class="dataEntryTable"> *************** *** 847,851 **** <td class="dataEntryTable" align="center"><html:text property="value(WTValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(WTDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(WTComments)" size="34%" tabindex="9999"/></td> </tr> <tr class="dataEntryTable"> --- 847,851 ---- <td class="dataEntryTable" align="center"><html:text property="value(WTValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(WTDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(WTComments)" size="30%" tabindex="9999"/></td> </tr> <tr class="dataEntryTable"> *************** *** 860,864 **** <td class="dataEntryTable" align="center"><html:text property="value(HTValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HTDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HTComments)" size="34%" tabindex="9999"/></td> </tr> <tr> --- 860,864 ---- <td class="dataEntryTable" align="center"><html:text property="value(HTValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HTDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HTComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 873,877 **** <td class="dataEntryTable" align="center"><html:text property="value(HRValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HRDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HRComments)" size="34%" tabindex="9999"/></td> </tr> </table></td> --- 873,877 ---- <td class="dataEntryTable" align="center"><html:text property="value(HRValue)" size="5%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HRDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HRComments)" size="30%" tabindex="9999"/></td> </tr> </table></td> *************** *** 1148,1152 **** <td class="dataEntryTable" align="center"><html:text property="value(HbA1Value)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HbA1Date)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HbA1Comments)" size="35%" tabindex="9999"/></td> </tr> <tr class="dataEntryTable"> --- 1148,1152 ---- <td class="dataEntryTable" align="center"><html:text property="value(HbA1Value)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HbA1Date)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HbA1Comments)" size="30%" tabindex="9999"/></td> </tr> <tr class="dataEntryTable"> *************** *** 1161,1165 **** <td class="dataEntryTable" align="center"><html:text property="value(BGValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(BGDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(BGComments)" size="35%" tabindex="9999"/></td> </tr> <tr> --- 1161,1165 ---- <td class="dataEntryTable" align="center"><html:text property="value(BGValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(BGDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(BGComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 1174,1178 **** <td class="dataEntryTable" align="center"><html:text property="value(LDLValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(LDLDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(LDLComments)" size="35%" tabindex="9999"/></td> </tr> <tr> --- 1174,1178 ---- <td class="dataEntryTable" align="center"><html:text property="value(LDLValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(LDLDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(LDLComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 1187,1191 **** <td class="dataEntryTable" align="center"><html:text property="value(HDLValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HDLDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HDLComments)" size="35%" tabindex="9999"/></td> </tr> <tr> --- 1187,1191 ---- <td class="dataEntryTable" align="center"><html:text property="value(HDLValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(HDLDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(HDLComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 1200,1204 **** <td class="dataEntryTable" align="center"><html:text property="value(TCHLValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(TCHLDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(TCHLComments)" size="35%" tabindex="9999"/></td> </tr> <tr> --- 1200,1204 ---- <td class="dataEntryTable" align="center"><html:text property="value(TCHLValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(TCHLDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(TCHLComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 1213,1217 **** <td class="dataEntryTable" align="center"><html:text property="value(TRIGValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(TRIGDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(TRIGComments)" size="35%" tabindex="9999"/></td> </tr> <tr> --- 1213,1217 ---- <td class="dataEntryTable" align="center"><html:text property="value(TRIGValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(TRIGDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(TRIGComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 1226,1230 **** <td class="dataEntryTable" align="center"><html:text property="value(UALBValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(UALBDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(UALBComments)" size="35%" tabindex="9999"/></td> </tr> <tr> --- 1226,1230 ---- <td class="dataEntryTable" align="center"><html:text property="value(UALBValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(UALBDate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(UALBComments)" size="30%" tabindex="9999"/></td> </tr> <tr> *************** *** 1239,1243 **** <td class="dataEntryTable" align="center"><html:text property="value(24UAValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(24UADate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(24UAComments)" size="35%" tabindex="9999"/></td> </tr> </table></td> --- 1239,1243 ---- <td class="dataEntryTable" align="center"><html:text property="value(24UAValue)" size="4%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(24UADate)" size="10%" tabindex="9999"/></td> ! <td class="dataEntryTable" align="center"><html:text property="value(24UAComments)" size="30%" tabindex="9999"/></td> </tr> </table></td> |
|
From: Ivy C. <ic...@us...> - 2004-12-04 04:07:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17972 Modified Files: formSaveAndExit.jsp Log Message: removed package oscar.oscarWaitingList.util.* Index: formSaveAndExit.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formSaveAndExit.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** formSaveAndExit.jsp 3 Dec 2004 21:42:50 -0000 1.2 --- formSaveAndExit.jsp 4 Dec 2004 04:06:59 -0000 1.3 *************** *** 27,31 **** if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> ! <%@ page import="java.sql.*, java.util.*, oscar.oscarWaitingList.util.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 27,31 ---- if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> ! <%@ page import="java.sql.*, java.util.*"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> |
|
From: Ivy C. <ic...@us...> - 2004-12-03 21:51:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6492 Modified Files: formVTForm.jsp Log Message: updated the "save" button to "Update VT" Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** formVTForm.jsp 3 Dec 2004 19:37:26 -0000 1.5 --- formVTForm.jsp 3 Dec 2004 21:51:01 -0000 1.6 *************** *** 190,202 **** } ! function popupDecisiontSupport(){ ! var varpage = "<bean:write name="decisionSupportURL"/>"; var vheight = 500; var vwidth = 400; var posX = 400; var posY = 0; ! windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=600"; ! var popup=window.open(varpage, "Decision Support", windowprops); ! popup.focus(); } --- 190,204 ---- } ! function popupDecisionSupport(){ ! var varpage = "<%=request.getAttribute("decisionSupportURL")%>"; var vheight = 500; var vwidth = 400; var posX = 400; var posY = 0; ! if(varpage!="null"){ ! windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=600"; ! var popup=window.open(varpage, "Decision Support", windowprops); ! popup.focus(); ! } } *************** *** 412,416 **** } </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(670,710); popupDecisiontSupport();"> <!-- --> --- 414,418 ---- } </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(670,710); popupDecisionSupport();"> <!-- --> *************** *** 423,427 **** <tr> <td align="left"> ! <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> --- 425,429 ---- <tr> <td align="left"> ! <input type="submit" value="Update VT" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> *************** *** 1383,1387 **** <tr><td class="eightyPercent" align="left"><%=request.getAttribute("OthCLDDate")%></td></tr> <tr><td class="eightyPercent" align="right"><%=request.getAttribute("OthCLastData")%></td></tr> ! </table> </td> --- 1385,1390 ---- <tr><td class="eightyPercent" align="left"><%=request.getAttribute("OthCLDDate")%></td></tr> <tr><td class="eightyPercent" align="right"><%=request.getAttribute("OthCLastData")%></td></tr> ! <html:hidden property="value(OthCLDDate)"/> ! <html:hidden property="value(OthCLastData)"/> </table> </td> *************** *** 1413,1417 **** <td align="left"> <input type="hidden" name="submit" value=""/> ! <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> --- 1416,1420 ---- <td align="left"> <input type="hidden" name="submit" value=""/> ! <input type="submit" value="Update VT" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> |
|
From: Ivy C. <ic...@us...> - 2004-12-03 21:49:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5932 Modified Files: FrmFormAction.java Log Message: added set diagnosis attribute for write to eChart updated to save on to measurement only when "save and exit" button is clicked Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** FrmFormAction.java 3 Dec 2004 16:11:08 -0000 1.7 --- FrmFormAction.java 3 Dec 2004 21:48:54 -0000 1.8 *************** *** 83,86 **** --- 83,87 ---- String formId = (String) frm.getValue("formId"); String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); + String timeStamp = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyy-MM-dd hh:mm:ss"); String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd"); *************** *** 96,99 **** --- 97,102 ---- valid = true; + String submit = request.getParameter("submit"); + EctMeasurementTypesBean mt; EctValidationsBean validation; *************** *** 126,131 **** props.setProperty("visitCod", visitCod); ! //for VTForm ! props.setProperty("diagnosis", (String) frm.getValue("diagnosisVT")); startTime = System.currentTimeMillis(); --- 129,135 ---- props.setProperty("visitCod", visitCod); ! //for VTForm ! props.setProperty("diagnosis", org.apache.commons.lang.StringEscapeUtils.escapeSql((String) frm.getValue("diagnosisVT"))); ! //System.out.println("diagnosis: " + props.getProperty("diagnosis")); startTime = System.currentTimeMillis(); *************** *** 145,149 **** //Write to Measurement Table ! if(!inputValue.equalsIgnoreCase("")) write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); --- 149,153 ---- //Write to Measurement Table ! if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); *************** *** 174,177 **** --- 178,182 ---- System.out.println("Time spent on write2Measurements: " + Long.toString(delTime)); + //Store the the form table for keeping the current record try{ String sql = "SELECT * FROM form"+formName + " WHERE demographic_no='"+demographicNo + "' AND ID=0"; *************** *** 184,187 **** --- 189,193 ---- } + //Send to Mils thru xml-rpc Properties nameProps = convertName(formName); *************** *** 199,205 **** //forward to the for with updated formId ! String submit = request.getParameter("submit"); System.out.println("submit value: " + submit); if(submit.equalsIgnoreCase("exit")){ return (new ActionForward("/form/formSaveAndExit.jsp")); } --- 205,213 ---- //forward to the for with updated formId ! System.out.println("submit value: " + submit); if(submit.equalsIgnoreCase("exit")){ + String toEChart = "[" + timeStamp + ".: Vascular Tracker] \n " + (String) frm.getValue("diagnosisVT"); + request.setAttribute("diagnosisVT", org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(toEChart)); return (new ActionForward("/form/formSaveAndExit.jsp")); } |
|
From: Ivy C. <ic...@us...> - 2004-12-03 21:42:59
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4828 Modified Files: formSaveAndExit.jsp Log Message: added write2Parent Index: formSaveAndExit.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formSaveAndExit.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** formSaveAndExit.jsp 27 Nov 2004 23:47:17 -0000 1.1 --- formSaveAndExit.jsp 3 Dec 2004 21:42:50 -0000 1.2 *************** *** 48,51 **** --- 48,62 ---- <html:base/> </head> + <script language="javascript"> + + function write2Parent(text){ + self.window.close(); + opener.document.encForm.enTextarea.value = opener.document.encForm.enTextarea.value + "\n" + text; + opener.setTimeout("document.encForm.enTextarea.scrollTop=2147483647", 0); // setTimeout is needed to allow browser to realize that text field has been updated + opener.document.encForm.enTextarea.focus(); + } + + + </script> *************** *** 56,60 **** <td> <script> ! self.close(); </script> </td> --- 67,71 ---- <td> <script> ! write2Parent("<%=request.getAttribute("diagnosisVT")%>"); </script> </td> |
|
From: Ivy C. <ic...@us...> - 2004-12-03 21:41:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4359 Modified Files: FrmSetupFormAction.java Log Message: added getMostRecentRecord from miles Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** FrmSetupFormAction.java 3 Dec 2004 19:40:50 -0000 1.8 --- FrmSetupFormAction.java 3 Dec 2004 21:41:26 -0000 1.9 *************** *** 101,105 **** request.setAttribute("ongoingConcerns", chartBean.ongoingConcerns.equalsIgnoreCase("")?"None":chartBean.ongoingConcerns); if(currentRec!=null) ! frm.setValue("diagnosis", currentRec.getProperty("diagnosis", "None")); try { --- 101,105 ---- request.setAttribute("ongoingConcerns", chartBean.ongoingConcerns.equalsIgnoreCase("")?"None":chartBean.ongoingConcerns); if(currentRec!=null) ! frm.setValue("diagnosisVT", currentRec.getProperty("diagnosis", "None")); try { *************** *** 116,151 **** String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); String decisionSupportURL = connect2OSDSF(xmlData); request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml(decisionSupportURL)); ! //Get the most updated data from Miles" ! String xmlString = "<SitePatientVisit_Records>"+ ! "<SitePatientVisit Visit_cod=\"20041202\" Patient_cod=\"19\">"+ ! "<int_Height_cm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dbl_Weight_kg signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<int_WaistCircumference_cm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"1\"/>"+ ! "<int_HipCircumference_cm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_BP signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<int_Pulse_bpm signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"88\"/>"+ ! "<dbl_HbA1c signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\".17\"/>"+ ! "<dat_HbA1c signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"1999-01-01\"/>"+ ! "<dbl_Glucose_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_Glucose signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2003-01-02\"/>"+ ! "<dbl_LDL_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2\"/>"+ ! "<dat_LDL signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2004-12-31\"/>"+ ! "<dbl_HDL_mM signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2\"/>"+ ! "<dat_HDL signed_when=\"2004/12/02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"2004-12-31\"/>"+ ! "<dbl_TotalCholesterol_mM signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\" value=\"123\"/>"+ ! "<dat_TotalCholesterol signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_Triglycerides_mM signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_Triglycerides signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbuminCreatinineRatio_mgPermmol signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbuminCreatinineRatio signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dbl_UrineAlbumin_mgPerDay signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "<dat_UrineAlbumin signed_when=\"2004-12-02\" signed_who=\"999998\" signed_how=\"EMR\"/>"+ ! "</SitePatientVisit>"+ ! "</SitePatientVisit_Records>"; nameProps = convertName(formName); FrmXml2VTData xml2VTData = new FrmXml2VTData(); ! FrmVTData vtData = xml2VTData.getObjectFromXmlStr(xmlString); Class vtDataC = Class.forName("oscar.form.data.FrmVTData"); --- 116,127 ---- String xmlData = FrmToXMLUtil.convertToXml(measurementTypes, nameProps, props); String decisionSupportURL = connect2OSDSF(xmlData); + System.out.println("decisionSupportURL" + decisionSupportURL); request.setAttribute("decisionSupportURL", StringEscapeUtils.escapeHtml(decisionSupportURL)); ! //Get the most updated data from Miles" ! String xmlStr = getMostRecentRecord(demo); nameProps = convertName(formName); FrmXml2VTData xml2VTData = new FrmXml2VTData(); ! FrmVTData vtData = xml2VTData.getObjectFromXmlStr(xmlStr); Class vtDataC = Class.forName("oscar.form.data.FrmVTData"); *************** *** 174,178 **** String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); //System.out.println("method "+methodCall); ! if (valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); --- 150,154 ---- String valueMethodCall = (String) nameProps.get(mt.getType()+"Value"); //System.out.println("method "+methodCall); ! if (vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); *************** *** 192,196 **** vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value.replaceAll("/", "-")); request.setAttribute(mt.getType() + "Date", value); } --- 168,172 ---- vtGetMethods = vtDataC.getMethod("get"+valueMethodCall+"$signed_when", new Class[] {}); value = (String) vtGetMethods.invoke(vtData, new Object[]{}); ! frm.setValue(mt.getType() + "Date", value==null?"":value.replaceAll("/", "-")); request.setAttribute(mt.getType() + "Date", value); } *************** *** 278,282 **** try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.vtXMLRtn", data2OSDSF); System.out.println("Reverse result: " + result); return result; --- 254,280 ---- try{ XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.saveAndGetRlt", data2OSDSF); ! System.out.println("Reverse result: " + result); ! return result; ! } ! catch(XmlRpcException e){ ! e.printStackTrace(); ! } ! catch(IOException e){ ! e.printStackTrace(); ! } ! ! return null; ! ! } ! ! private String getMostRecentRecord(String demographicNo){ ! Vector ret = new Vector(); ! ret.addElement("getMostRecentRecord"); ! ret.addElement(demographicNo); ! //send to osdsf thru XMLRPC ! try{ ! XmlRpcClient xmlrpc = new XmlRpcClient("http://oscartest.oscarmcmaster.org:8080/osdsf/VTRpcServlet.go"); ! String result = (String) xmlrpc.execute("vt.getMostRecentRecord", ret); System.out.println("Reverse result: " + result); return result; *************** *** 293,296 **** --- 291,296 ---- } + + private Properties convertName(String formName){ Properties osdsf = new Properties(); |
38 messages has been excluded from this view by a project administrator.
