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-09 18:43:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv315 Modified Files: FrmSetupFormAction.java Log Message: updated to catch exception when Mile is not available Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FrmSetupFormAction.java 7 Dec 2004 04:05:47 -0000 1.12 --- FrmSetupFormAction.java 9 Dec 2004 18:43:43 -0000 1.13 *************** *** 124,129 **** nameProps = convertName(formName); FrmXml2VTData xml2VTData = new FrmXml2VTData(); ! FrmVTData vtData = xml2VTData.getObjectFromXmlStr(xmlStr); ! Class vtDataC = Class.forName("oscar.form.data.FrmVTData"); ResultSet rs; --- 124,133 ---- nameProps = convertName(formName); FrmXml2VTData xml2VTData = new FrmXml2VTData(); ! Class vtDataC = null; ! FrmVTData vtData = null; ! if(xmlStr!=null){ ! vtData = xml2VTData.getObjectFromXmlStr(xmlStr); ! vtDataC = Class.forName("oscar.form.data.FrmVTData"); ! } ResultSet rs; *************** *** 158,162 **** 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[]{}); --- 162,166 ---- valueMethodCall = (String) nameProps.get("SBPValue"); String valueMethodCall2 =(String) nameProps.get("DBPValue"); ! if (vtData!=null && vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); String sbp = (String) vtGetMethods.invoke(vtData, new Object[]{}); *************** *** 178,182 **** else{ ! if (vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); --- 182,186 ---- else{ ! if (vtData!=null && vtDataC!=null && valueMethodCall != null){ Method vtGetMethods = vtDataC.getMethod("get"+valueMethodCall, new Class[] {}); String value = (String) vtGetMethods.invoke(vtData, new Object[]{}); *************** *** 300,310 **** catch(XmlRpcException e){ e.printStackTrace(); } catch(IOException e){ e.printStackTrace(); ! } ! ! return null; ! } --- 304,313 ---- catch(XmlRpcException e){ e.printStackTrace(); + return null; } catch(IOException e){ e.printStackTrace(); ! return null; ! } } *************** *** 322,332 **** catch(XmlRpcException e){ e.printStackTrace(); } catch(IOException e){ e.printStackTrace(); ! } ! ! return null; ! } --- 325,334 ---- catch(XmlRpcException e){ e.printStackTrace(); + return null; } catch(IOException e){ e.printStackTrace(); ! return null; ! } } |
|
From: Ivy C. <ic...@us...> - 2004-12-09 18:43:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32677 Modified Files: FrmFormAction.java Log Message: updated to catch exception when Mile is not available Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** FrmFormAction.java 7 Dec 2004 04:05:04 -0000 1.12 --- FrmFormAction.java 9 Dec 2004 18:43:21 -0000 1.13 *************** *** 346,357 **** catch(XmlRpcException e){ e.printStackTrace(); } catch(IOException e){ e.printStackTrace(); } /*catch(MalformedURLException e){ e.printStackTrace(); ! }*/ ! return null; } --- 346,358 ---- catch(XmlRpcException e){ e.printStackTrace(); + return null; } catch(IOException e){ e.printStackTrace(); + return null; } /*catch(MalformedURLException e){ e.printStackTrace(); ! }*/ } |
|
From: Ivy C. <ic...@us...> - 2004-12-09 18:43:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32414 Added Files: WLWaitingListUtil.java Log Message: init commit --- NEW FILE: WLWaitingListUtil.java --- // ----------------------------------------------------------------------------------------------------------------------- // * // * // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * // * This software is published under the GPL GNU General Public License. // * This program is free software; you can redistribute it and/or // * modify it under the terms of the GNU General Public License // * as published by the Free Software Foundation; either version 2 // * of the License, or (at your option) any later version. * // * This program is distributed in the hope that it will be useful, // * but WITHOUT ANY WARRANTY; without even the implied warranty of // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License // * along with this program; if not, write to the Free Software // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * // * // * <OSCAR TEAM> // * Date Implemented By Company Comments // * 29-09-2004 Ivy Chan iConcept Technologies initial version // * This software was written for the // * Department of Family Medicine // * McMaster Unviersity // * Hamilton // * Ontario, Canada // * // ----------------------------------------------------------------------------------------------------------------------- package oscar.oscarWaitingList.util; import java.io.*; import java.util.*; import java.lang.*; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Collection; import javax.servlet.ServletException; import javax.servlet.ServletRequest; import javax.servlet.http.*; import org.apache.struts.action.*; import org.apache.commons.lang.StringEscapeUtils; import oscar.oscarDB.DBHandler; import oscar.OscarProperties; import oscar.oscarWaitingList.bean.*; import oscar.oscarProvider.bean.*; import oscar.util.*; public class WLWaitingListUtil { static public void removeFromWaitingList(String waitingListID, String demographicNo) { System.out.println("update waiting list: " + waitingListID + " for patient " + demographicNo); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "SELECT demographic_no FROM waitingList WHERE listID='" + waitingListID + "'"; ResultSet rs; //go thru all the patient on the list for(rs = db.GetSQL(sql); rs.next();){ //delete patient from the waitinglist //System.out.println("patient to be deleted: " + rs.getString("demographic_no")); sql = "DELETE FROM waitingList WHERE demographic_no='"+ demographicNo +"' AND listID='" + waitingListID +"'"; db.RunSQL(sql); } rs.close(); //update the list sql = "SELECT * FROM waitingList WHERE listID='" + waitingListID + "' ORDER BY onListSince"; int i=1; for(rs = db.GetSQL(sql); rs.next();){ sql = "UPDATE waitingList SET position ='"+ Integer.toString(i) + "' WHERE listID='" + waitingListID +"' AND demographic_no='" + rs.getString("demographic_no") +"'"; //System.out.println("update query from waiting list view: " + sql); db.RunSQL(sql); i++; } rs.close(); db.CloseConn(); } catch(SQLException e) { System.out.println(e.getMessage()); } } static public void add2WaitingList(String waitingListID, String waitingListNote, String demographicNo) { //String[] paramWLPosition = new String[1]; // paramWLPosition[0] = request.getParameter("list_id"); //if(paramWLPosition[0].compareTo("")!=0){ //ResultSet rsWL = apptMainBean.queryResults(paramWLPosition, "search_waitingListPosition"); /*if(rsWL.next()){ String[] paramWL = new String[4]; paramWL[0] = request.getParameter("list_id"); paramWL[1] = request.getParameter("demographic_no"); paramWL[2] = request.getParameter("waiting_list_note"); //System.out.println("max position: " + Integer.toString(rsWL.getInt("position"))); paramWL[3] = Integer.toString(rsWL.getInt("position") + 1); apptMainBean.queryExecuteUpdate(paramWL, "add2waitinglist"); } }*/ System.out.println("update waiting list: " + waitingListID + " for patient " + demographicNo); if(!waitingListID.equalsIgnoreCase("0")&&!demographicNo.equalsIgnoreCase("0")){ try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "select max(position) as position from waitingList where listID='" + waitingListID + "'"; ResultSet rs = db.GetSQL(sql); if(rs.next()){ String nxPos = Integer.toString(rs.getInt("position") + 1); waitingListNote = org.apache.commons.lang.StringEscapeUtils.escapeSql(waitingListNote); sql = "insert into waitingList values('"+ waitingListID + "','" + demographicNo + "','" + waitingListNote + "','" + nxPos + "', now())"; db.RunSQL(sql); } rs.close(); db.CloseConn(); } catch(SQLException e) { System.out.println(e.getMessage()); } } } } |
|
From: Ivy C. <ic...@us...> - 2004-12-09 18:42:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32324/util Log Message: Directory /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/util added to the repository |
|
From: Ivy C. <ic...@us...> - 2004-12-09 18:41:39
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32188 Modified Files: VTForm2Osdsf.properties VTFormFromOsdsf.properties Log Message: renamed FTNoDate and iNoDate to FTNeDate and iDiaDate respectively Index: VTFormFromOsdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTFormFromOsdsf.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** VTFormFromOsdsf.properties 7 Dec 2004 04:04:37 -0000 1.3 --- VTFormFromOsdsf.properties 9 Dec 2004 18:41:26 -0000 1.4 *************** *** 47,51 **** 24UADate=Dat_UrineAlbumin ! FTNoDate = Dat_FootExam FTNeValue = Sel_FootExam_Neuropathy FTIsValue = Sel_FootExam_Ischemia --- 47,51 ---- 24UADate=Dat_UrineAlbumin ! FTNeDate = Dat_FootExam FTNeValue = Sel_FootExam_Neuropathy FTIsValue = Sel_FootExam_Ischemia *************** *** 54,58 **** FTOtValue = Sel_FootExam_OtherAbnormality FTReValue = B_Referred_FootExam ! iNoDate = Dat_EyeExam iDiaValue = Sel_EyeExam_DiabeticRetinopathy iHypValue = Sel_EyeExam_HypertensiveRetinopathy --- 54,58 ---- FTOtValue = Sel_FootExam_OtherAbnormality FTReValue = B_Referred_FootExam ! iDiaDate = Dat_EyeExam iDiaValue = Sel_EyeExam_DiabeticRetinopathy iHypValue = Sel_EyeExam_HypertensiveRetinopathy Index: VTForm2Osdsf.properties =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm2Osdsf.properties,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** VTForm2Osdsf.properties 7 Dec 2004 04:04:36 -0000 1.2 --- VTForm2Osdsf.properties 9 Dec 2004 18:41:26 -0000 1.3 *************** *** 52,56 **** 24UADate=DatUrineAlbumin ! FTNoDate = DatFootExam FTNeValue = SelFootExamNeuropathy FTIsValue = SelFootExamIschemia --- 52,56 ---- 24UADate=DatUrineAlbumin ! FTNeDate = DatFootExam FTNeValue = SelFootExamNeuropathy FTIsValue = SelFootExamIschemia *************** *** 59,63 **** FTOtValue = SelFootExamOtherAbnormality FTReValue = BReferredFootExam ! iNoDate = DatEyeExam iDiaValue = SelEyeExamDiabeticRetinopathy iHypValue = SelEyeExamHypertensiveRetinopathy --- 59,63 ---- FTOtValue = SelFootExamOtherAbnormality FTReValue = BReferredFootExam ! iDiaDate = DatEyeExam iDiaValue = SelEyeExamDiabeticRetinopathy iHypValue = SelEyeExamHypertensiveRetinopathy |
|
From: Ivy C. <ic...@us...> - 2004-12-09 18:39:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31763 Modified Files: formVTForm.jsp Log Message: replaced bean:write tag with request.getAttribute Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** formVTForm.jsp 7 Dec 2004 04:11:59 -0000 1.14 --- formVTForm.jsp 9 Dec 2004 18:39:42 -0000 1.15 *************** *** 199,203 **** } else{ ! alert("Vascular Tracker Decision Support Page not found!"); } --- 199,203 ---- } else{ ! alert("Miles server is not avaiable!"); } *************** *** 466,470 **** <tr> <td class="subject"> ! VASCULAR TRACKER </td> </tr> --- 466,470 ---- <tr> <td class="subject"> ! Vascular Data Entry Template </td> </tr> *************** *** 504,508 **** </tr> <tr> ! <td><bean:write name="ongoingConcerns"/></td> </tr> </table> --- 504,508 ---- </tr> <tr> ! <td><%=request.getAttribute("ongoingConcerns")%></td> </tr> </table> *************** *** 561,566 **** <td class="dataEntryTable" align="center"><html:text property="value(SmkHValue)" size="8%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(SmkCValue)" size="8%" /></td> ! <td class="dataEntryTable" align="center"><input type="text" id="SmkDate" name="SmkDate" value="<bean:write name="SmkSDate"/>" size="8%" /></td> ! <td class="dataEntryTable" align="center"><input type="text" id="SmkComments" name="SmkComments" value="<bean:write name="SmkSComments"/>" size="25%" tabindex="9999"/></td> <html:hidden property="value(SmkSComments)"/> <html:hidden property="value(SmkSDate)"/> --- 561,566 ---- <td class="dataEntryTable" align="center"><html:text property="value(SmkHValue)" size="8%" /></td> <td class="dataEntryTable" align="center"><html:text property="value(SmkCValue)" size="8%" /></td> ! <td class="dataEntryTable" align="center"><input type="text" id="SmkDate" name="SmkDate" value="<%=request.getAttribute("SmkSDate")%>" size="8%" /></td> ! <td class="dataEntryTable" align="center"><input type="text" id="SmkComments" name="SmkComments" value="<%=request.getAttribute("SmkSComments")%>" size="25%" tabindex="9999"/></td> <html:hidden property="value(SmkSComments)"/> <html:hidden property="value(SmkSDate)"/> *************** *** 592,596 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="ExerDesc"/> <font class="eightyPercent"><bean:write name="ExerMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 592,596 ---- </tr> <tr> ! <td class="dataEntryTable"><bean:write name="ExerDesc"/> <font class="eightyPercent"><%=request.getAttribute("ExerMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 605,609 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="DietDesc"/> <font class="eightyPercent"><bean:write name="DietMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 605,609 ---- </tr> <tr> ! <td class="dataEntryTable"><bean:write name="DietDesc"/> <font class="eightyPercent"><%=request.getAttribute("DietMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 639,643 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="DpScDisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 639,643 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("DpScDisplay")%>/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 655,659 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="StScDisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 655,659 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("StScDisplay")%>/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 664,669 **** </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(StScValue)" value="Yes" />Yes ! <html:radio property="value(StScValue)" value="No" />No </td> <html:hidden property="value(StScDate)"/> --- 664,669 ---- </td> <td class="dataEntryTable" align="center"> ! <html:radio property="value(StScValue)" value="yes" />Yes ! <html:radio property="value(StScValue)" value="no" />No </td> <html:hidden property="value(StScDate)"/> *************** *** 671,675 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="LcCtDisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 671,675 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("LcCtDisplay")%>/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 708,712 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="MedGDisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 708,712 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("MedGDisplay")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 724,728 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="MedNDisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 724,728 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("MedNDisplay")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 740,744 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="MedRDisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 740,744 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("MedRDisplay")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 756,760 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="MedADisplay"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 756,760 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("MedADisplay")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 804,808 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="BPDisplay"/><br><font class="eightyPercent"><bean:write name="BPMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 804,808 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("BPDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("BPMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 817,821 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="WHRDisplay"/><br><font class="eightyPercent"><bean:write name="WHRMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <logic:present name="WHRLastData"> --- 817,821 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("WHRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WHRMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <logic:present name="WHRLastData"> *************** *** 833,837 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="WCDisplay"/><br><font class="eightyPercent"><bean:write name="WCMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <logic:present name="WCLastData"> --- 833,837 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("WCDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WCMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <logic:present name="WCLastData"> *************** *** 849,853 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="HCDisplay"/><br><font class="eightyPercent"><bean:write name="HCMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <logic:present name="HCLastData"> --- 849,853 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("HCDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HCMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <logic:present name="HCLastData"> *************** *** 865,874 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="WTDisplay"/><br><font class="eightyPercent"><bean:write name="WTMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <logic:present name="WTLastData"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><bean:write name="WTLDDate"/></td></tr> ! <tr><td class="eightyPercent" align="right"><bean:write name="WTLastData"/></td></tr> </table> --- 865,874 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("WTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WTMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <logic:present name="WTLastData"> <table cellpadding='0' cellspacing='0'> ! <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WTLDDate")%></td></tr> ! <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WTLastData")%></td></tr> </table> *************** *** 881,885 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="HTDisplay"/><br><font class="eightyPercent"><bean:write name="HTMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 881,885 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("HTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HTMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 894,898 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="HRDisplay"/><br><font class="eightyPercent"><bean:write name="HRMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 894,898 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("HRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HRMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 935,945 **** <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Foot Exam</th> ! <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<bean:write name="FTNoDate"/>" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="FTComments" wrap="hard" cols="24" style="height:180" tabindex="9999"><logic:present name="FTNoComments"><bean:write name="FTNoComments"/></logic:present></textarea> </td> </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="FTNoDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 935,945 ---- <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Foot Exam</th> ! <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<%=request.getAttribute("FTNeDate")%>" size="10%" tabindex="9999"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="FTComments" wrap="hard" cols="24" style="height:180" tabindex="9999"><logic:present name="FTNoComments"><%=request.getAttribute("FTNoComments")%></logic:present></textarea> </td> </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("FTNoDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 958,962 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="FTNeDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 958,962 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("FTNeDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 974,978 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="FTIsDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 974,978 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("FTIsDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 990,994 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="FTUlDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 990,994 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("FTUlDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1006,1010 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="FTInDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1006,1010 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("FTInDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1022,1026 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="FTOtDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1022,1026 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("FTOtDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1038,1042 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="FTReDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1038,1042 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("FTReDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1055,1065 **** <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Eye Exam</th> ! <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<bean:write name="iNoDate"/>" size="10%"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="iComments" wrap="hard" cols="24" style="height:180"><logic:present name="iNoComments"><bean:write name="iNoComments"/></logic:present></textarea> </td> </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="iNoDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1055,1065 ---- <tr class="dataEntryTable"> <th class="dataEntryTable" colspan="3">Eye Exam</th> ! <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<%=request.getAttribute("iDiaDate")%>" size="10%"/></td> <td class="dataEntryTable" rowspan="8" valign="top" align="center"> ! <textarea name="iComments" wrap="hard" cols="24" style="height:180"><logic:present name="iNoComments"><%=request.getAttribute("iNoComments")%></logic:present></textarea> </td> </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("iNoDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1078,1082 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="iHypDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1078,1082 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("iHypDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1094,1098 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="iDiaDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1094,1098 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1110,1114 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="iOthDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1110,1114 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("iOthDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1169,1173 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="HbA1Desc"/><br><font class="eightyPercent"><bean:write name="HbA1MeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1169,1173 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("HbA1Desc")%><br><font class="eightyPercent"><%=request.getAttribute("HbA1MeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1182,1186 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="BGDesc"/><br><font class="eightyPercent"><bean:write name="BGMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1182,1186 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("BGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("BGMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1195,1199 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="LDLDesc"/><br><font class="eightyPercent"><bean:write name="LDLMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1195,1199 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("LDLDesc")%><br><font class="eightyPercent"><%=request.getAttribute("LDLMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1208,1212 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="HDLDesc"/><br><font class="eightyPercent"><bean:write name="HDLMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1208,1212 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("HDLDesc")%><br><font class="eightyPercent"><%=request.getAttribute("HDLMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1221,1225 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="TCHLDesc"/><br><font class="eightyPercent"><bean:write name="TCHLMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1221,1225 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("TCHLDesc")%><br><font class="eightyPercent"><%=request.getAttribute("TCHLMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1234,1238 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="TRIGDesc"/><br><font class="eightyPercent"><bean:write name="TRIGMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1234,1238 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("TRIGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("TRIGMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1247,1251 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="UALBDesc"/><br><font class="eightyPercent"><bean:write name="UALBMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1247,1251 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("UALBDesc")%><br><font class="eightyPercent"><%=request.getAttribute("UALBMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1260,1264 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="24UADesc"/><br><font class="eightyPercent"><bean:write name="24UAMeasuringInstrc"/></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1260,1264 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("24UADesc")%><br><font class="eightyPercent"><%=request.getAttribute("24UAMeasuringInstrc")%></font></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1346,1350 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="NtrCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1346,1350 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("NtrCDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1359,1363 **** </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><bean:write name="ExeCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1359,1363 ---- </tr> <tr class="dataEntryTable"> ! <td class="dataEntryTable"><%=request.getAttribute("ExeCDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1372,1376 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="SmCCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1372,1376 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("SmCCDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1385,1389 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="DiaCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1385,1389 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("DiaCDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1398,1402 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="PsyCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1398,1402 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("PsyCDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> *************** *** 1411,1415 **** </tr> <tr> ! <td class="dataEntryTable"><bean:write name="OthCDesc"/></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> --- 1411,1415 ---- </tr> <tr> ! <td class="dataEntryTable"><%=request.getAttribute("OthCDesc")%></td> <td class="dataEntryTable" align="center"> <table cellpadding='0' cellspacing='0'> |
|
From: Jay G. <jay...@us...> - 2004-12-09 15:30:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16402 Modified Files: IncomingLabManagement.java Log Message: added loging and change call to method getFileNamesToParse Index: IncomingLabManagement.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingLabManagement.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IncomingLabManagement.java 29 Nov 2004 21:20:41 -0000 1.3 --- IncomingLabManagement.java 9 Dec 2004 15:30:12 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- import java.util.*; import oscar.oscarMDSLab.*; + import oscar.oscarMDSLab.dbUtil.*; /** *************** *** 22,26 **** static String workingFile = "UPLD.TXT"; //static String incomingHL7dir = "./mds"; ! static String incomingHL7dir = "./mds"; static String moddedTime = "MODTIME.TXT"; //static String errorHL7dir = "./mdsError"; --- 23,27 ---- static String workingFile = "UPLD.TXT"; //static String incomingHL7dir = "./mds"; ! static String incomingHL7dir = "c:/Data/mds"; static String moddedTime = "MODTIME.TXT"; //static String errorHL7dir = "./mdsError"; *************** *** 42,45 **** --- 43,47 ---- // Create an appending file handler boolean append = true; + //FileHandler handler = new FileHandler("c:/Data/LabManagement.log", append); FileHandler handler = new FileHandler("LabManagement.log", append); handler.setFormatter(new SimpleFormatter()); *************** *** 68,71 **** --- 70,83 ---- completedHL7dir = labProperties.getProperty("completedHL7dir"); auditLogFile = labProperties.getProperty("auditLogFile"); + + logger.info("busyFile "+busyFile+"\n"+ + "workingFile "+workingFile+"\n"+ + "incomingHL7dir "+incomingHL7dir+" prop "+labProperties.getProperty("incomingHL7dir") +"\n"+ + "moddedTime "+moddedTime+"\n"+ + "errorHL7dir "+errorHL7dir+"\n"+ + "dupsHL7dir "+dupsHL7dir+"\n"+ + "completedHL7dir "+completedHL7dir+"\n"+ + "auditLogFile "+auditLogFile); + } public static void main(String[] args) { *************** *** 74,77 **** --- 86,90 ---- try{ if ( args[0] == null ){ throw new Exception("Usage Exception"); } + logger.info("Loading Properties file "+args[0]); loadProperties(args[0]); *************** *** 81,84 **** --- 94,98 ---- System.exit(2); } + DBHandler db = new DBHandler(); *************** *** 93,97 **** if (inMDS.filesToParse(incomingHL7dir,moddedTime)){ ! ArrayList fileNamesList = inMDS.getFileNamesToParse(incomingHL7dir); for (int i = 0 ; i < fileNamesList.size();i++){ --- 107,111 ---- if (inMDS.filesToParse(incomingHL7dir,moddedTime)){ ! ArrayList fileNamesList = inMDS.getFileNamesToParse(incomingHL7dir,auditLogFile); for (int i = 0 ; i < fileNamesList.size();i++){ *************** *** 102,106 **** if(bfp.parseFile(incomingHL7dir+"/"+filename)){ ! bfp.processResult(auditLogFile,dupsHL7dir); inMDS.moveCompletedFile(incomingHL7dir+"/"+filename,completedHL7dir); }else{ --- 116,120 ---- if(bfp.parseFile(incomingHL7dir+"/"+filename)){ ! bfp.processResult(incomingHL7dir+"/"+auditLogFile,dupsHL7dir); inMDS.moveCompletedFile(incomingHL7dir+"/"+filename,completedHL7dir); }else{ |
|
From: Jay G. <jay...@us...> - 2004-12-09 15:25:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15353 Modified Files: IncomingMDSFiles.java Log Message: Added more logging and changed move completed file to ignore the audit file Index: IncomingMDSFiles.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingMDSFiles.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** IncomingMDSFiles.java 29 Nov 2004 21:21:22 -0000 1.3 --- IncomingMDSFiles.java 9 Dec 2004 15:25:02 -0000 1.4 *************** *** 57,61 **** } } catch (IOException e) { ! logger.severe("Error Creating Working File "+e.getMessage()); } return success; --- 57,61 ---- } } catch (IOException e) { ! logger.severe("Error Creating Working File:"+workingFile+ " Error "+e.getMessage()); } return success; *************** *** 95,98 **** --- 95,99 ---- public long getCurrentModifiedTime(String incomingHL7dir){ + logger.info("Getting Last Modified time of "+incomingHL7dir); File file = new File(incomingHL7dir); return file.lastModified(); *************** *** 102,105 **** --- 103,107 ---- public long getLastModifiedTime(String moddedTime){ //READ FILE + logger.info ("Reading Last Modified Time from: "+moddedTime); String str = "0"; try { *************** *** 121,124 **** --- 123,127 ---- public void setLastModifiedTime(long modTime,String moddedTimeFile){ + logger.info("Writeing Last Modified Time to: "+moddedTimeFile); try { BufferedWriter out = new BufferedWriter(new FileWriter(moddedTimeFile)); *************** *** 130,134 **** } ! public ArrayList getFileNamesToParse(String incomingHL7dir){ logger.info("Getting Files Names to Parse"); ArrayList retval = new ArrayList(); --- 133,137 ---- } ! public ArrayList getFileNamesToParse(String incomingHL7dir,String auditLogFile){ logger.info("Getting Files Names to Parse"); ArrayList retval = new ArrayList(); *************** *** 142,146 **** for (int i=0; i<children.length; i++) { // Get filename of file or directory ! if (!children[i].endsWith("TXT")){ logger.info("Adding filename :"+children[i] +" to list of files to be parsed"); retval.add(children[i]); --- 145,150 ---- for (int i=0; i<children.length; i++) { // Get filename of file or directory ! logger.info("filename: "+children[i]); ! if (!children[i].endsWith("TXT") && !children[i].equals(auditLogFile)){ logger.info("Adding filename :"+children[i] +" to list of files to be parsed"); retval.add(children[i]); |
|
From: Jay G. <jay...@us...> - 2004-12-09 15:23:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14984 Modified Files: LabProperties.java Log Message: Added Logging Index: LabProperties.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/LabProperties.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LabProperties.java 29 Nov 2004 21:41:54 -0000 1.1 --- LabProperties.java 9 Dec 2004 15:23:04 -0000 1.2 *************** *** 30,33 **** --- 30,34 ---- import java.io.*; import java.util.*; + import java.util.logging.*; /** *************** *** 37,44 **** --- 38,48 ---- public class LabProperties extends Properties { + Logger logger = Logger.getLogger("mdsFileManagement.LabProperties"); + static LabProperties labProperties = new LabProperties(); static boolean loaded = false; private LabProperties() { + } *************** *** 55,61 **** --- 59,67 ---- try{ FileInputStream fis2 = new FileInputStream(propFileName) ; + load(fis2); fis2.close(); loaded = true; + logger.info(this.toString()); } catch (Exception e) { System.err.println("Error, file "+propFileName+" could not be loaded - "+e.getMessage()); *************** *** 65,68 **** --- 71,75 ---- } return loaded; + } |
|
From: Jay G. <jay...@us...> - 2004-12-09 15:17:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/dbUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13631 Modified Files: DBHandler.java Log Message: added default constructor that will call init Index: DBHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/oscar/oscarMDSLab/dbUtil/DBHandler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DBHandler.java 29 Nov 2004 21:43:43 -0000 1.2 --- DBHandler.java 9 Dec 2004 15:17:05 -0000 1.3 *************** *** 33,36 **** --- 33,40 ---- } + public DBHandler(){ + init(); + } + public DBHandler(String dbName) { init(); |
|
From: Ivy C. <ic...@us...> - 2004-12-09 04:03:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13299 Modified Files: FrmToXMLUtil.java Log Message: updated sel_visit_type value Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FrmToXMLUtil.java 7 Dec 2004 04:07:54 -0000 1.6 --- FrmToXMLUtil.java 9 Dec 2004 04:03:09 -0000 1.7 *************** *** 53,61 **** String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); ProviderData prData = new ProviderData(dataProps.getProperty("provider_no")); ! String vType = "7"; //Other if(prData.getProvider_type().equalsIgnoreCase("doctor")) ! vType = "1"; //FamilyMDVisit else if(prData.getProvider_type().equalsIgnoreCase("nurse")) ! vType = "3"; //NurseVisit SitePatientVisitRecordsDocument visitDocument = SitePatientVisitRecordsDocument.Factory.newInstance(); --- 53,61 ---- String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); ProviderData prData = new ProviderData(dataProps.getProperty("provider_no")); ! String vType = "Other"; //Other if(prData.getProvider_type().equalsIgnoreCase("doctor")) ! vType = "FamilyMDVisit"; //FamilyMDVisit else if(prData.getProvider_type().equalsIgnoreCase("nurse")) ! vType = "NurseVisit"; //NurseVisit SitePatientVisitRecordsDocument visitDocument = SitePatientVisitRecordsDocument.Factory.newInstance(); |
|
From: Ivy C. <ic...@us...> - 2004-12-09 04:01:52
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13007 Modified Files: appointmentcontrol.jsp Log Message: added search_waiting_list query Index: appointmentcontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment/appointmentcontrol.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** appointmentcontrol.jsp 20 Jul 2004 14:24:17 -0000 1.4 --- appointmentcontrol.jsp 9 Dec 2004 04:01:42 -0000 1.5 *************** *** 47,50 **** --- 47,51 ---- {"search_detail", "select * from demographic where demographic_no=?"}, {"search_demographiccust_alert", "select cust3 from demographiccust where demographic_no = ? " }, + {"search_waitinglist", "select wl.listID, wln.name from waitingList wl, waitingListName wln where wl.demographic_no=? and wln.ID=wl.listID order by wl.listID"}, }; |
|
From: Ivy C. <ic...@us...> - 2004-12-09 04:00:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12732 Modified Files: appointmentaddarecord.jsp Log Message: updated waiting list Index: appointmentaddarecord.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment/appointmentaddarecord.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** appointmentaddarecord.jsp 11 Sep 2003 20:53:40 -0000 1.3 --- appointmentaddarecord.jsp 9 Dec 2004 04:00:33 -0000 1.4 *************** *** 28,32 **** if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); %> ! <%@ page import="java.sql.*, java.util.*, oscar.MyDateFormat" errorPage="errorpage.jsp"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> --- 28,32 ---- if(session.getValue("user") == null) response.sendRedirect("../logout.jsp"); %> ! <%@ page import="java.sql.*, java.util.*, oscar.MyDateFormat, oscar.oscarWaitingList.bean.*, oscar.oscarWaitingList.WaitingList" errorPage="errorpage.jsp"%> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> *************** *** 66,70 **** else intparam[0]=0; int rowsAffected = apptMainBean.queryExecuteUpdate(param,intparam,request.getParameter("dboperation")); ! if (rowsAffected ==1) { %> <p><h1><bean:message key="appointment.addappointment.msgAddSuccess"/></h1></p> --- 66,91 ---- else intparam[0]=0; int rowsAffected = apptMainBean.queryExecuteUpdate(param,intparam,request.getParameter("dboperation")); ! if (rowsAffected ==1) { ! ! WaitingList wL = WaitingList.getInstance(); ! if(wL.getFound()){ ! ! String param1 = request.getParameter("demographic_no"); ! ResultSet rs = apptMainBean.queryResults(param1, "search_waitinglist"); ! if(rs.next()){ ! %> ! <form name="updateWLFrm" action="../oscarWaitingList/RemoveFromWaitingList.jsp"> ! <input type="hidden" name="listId" value="<%=rs.getString("listID")%>"/> ! <input type="hidden" name="demographicNo" value="<%=request.getParameter("demographic_no")%>"/> ! <script LANGUAGE="JavaScript"> ! var removeList = confirm("Click OK to remove patient from the waiting list: <%=rs.getString("name")%>"); ! if(removeList){ ! document.forms[0].action = "../oscarWaitingList/RemoveFromWaitingList.jsp?demographicNo=<%=request.getParameter("demographic_no")%>&listID=<%=rs.getString("listID")%>"; ! document.forms[0].submit(); ! } ! </script> ! </form> ! <%} ! } %> <p><h1><bean:message key="appointment.addappointment.msgAddSuccess"/></h1></p> |
|
From: Ivy C. <ic...@us...> - 2004-12-09 03:53:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11445 Modified Files: demographicupdatearecord.jsp Log Message: added alert to user while adding user with an appointment in the future to the waiting list Index: demographicupdatearecord.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicupdatearecord.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** demographicupdatearecord.jsp 8 Nov 2004 19:34:15 -0000 1.12 --- demographicupdatearecord.jsp 9 Dec 2004 03:53:03 -0000 1.13 *************** *** 1,3 **** --- 1,6 ---- <%@ page import="java.sql.*, java.util.*, oscar.oscarWaitingList.WaitingList" errorPage="errorpage.jsp" %> + <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> + <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> + <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> <!-- *************** *** 26,36 **** */ --> ! <html> ! <head><title>demographic: the following records</title> ! </head> ! <link rel="stylesheet" href="../web.css" /> ! <body onLoad="this.focus()" > ! <center> <table border="0" cellspacing="0" cellpadding="0" width="100%" > <tr bgcolor="#486ebd"> --- 29,43 ---- */ --> ! <% ! if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); ! response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 ! response.setHeader("Pragma","no-cache"); //HTTP 1.0 ! response.setDateHeader ("Expires", 0); //prevents caching at the proxy ! %> ! <html:html locale="true"> ! <head></head> ! <body> ! <center> <table border="0" cellspacing="0" cellpadding="0" width="100%" > <tr bgcolor="#486ebd"> *************** *** 98,130 **** param2[5]="<unotes>"+ request.getParameter("notes")+"</unotes>"; rowsAffected = apptMainBean.queryExecuteUpdate(param2, "add_custrecord"); ! } ! //add to waiting list if the waiting_list parameter in the property file is set to true ! ! WaitingList wL = WaitingList.getInstance(); ! if(wL.getFound()){ ! ! String[] paramWLChk = new String[2]; ! paramWLChk[0] = request.getParameter("demographic_no"); ! paramWLChk[1] = request.getParameter("list_id"); ! //check if patient has already added to the waiting list and check if the patient already has an appointment in the future ! rs = apptMainBean.queryResults(paramWLChk, "search_demo_waiting_list"); ! ! if(!rs.next()){ ! String[] paramWLPosition = new String[1]; ! paramWLPosition[0] = request.getParameter("list_id"); ! if(paramWLPosition[0].compareTo("")!=0){ ! ResultSet rsWL = apptMainBean.queryResults(paramWLPosition, "search_waitingListPosition"); ! if(rsWL.next()){ ! String[] paramWL = new String[4]; ! paramWL[0] = request.getParameter("list_id"); ! paramWL[1] = request.getParameter("demographic_no"); ! paramWL[2] = request.getParameter("waiting_list_note"); ! //System.out.println("max position: " + Integer.toString(rsWL.getInt("position"))); ! paramWL[3] = Integer.toString(rsWL.getInt("position") + 1); ! apptMainBean.queryExecuteUpdate(paramWL, "add2waitinglist"); ! } ! } ! } ! } if (vLocale.getCountry().equals("BR")) { --- 105,109 ---- param2[5]="<unotes>"+ request.getParameter("notes")+"</unotes>"; rowsAffected = apptMainBean.queryExecuteUpdate(param2, "add_custrecord"); ! } if (vLocale.getCountry().equals("BR")) { *************** *** 171,177 **** } } %> <h2> Update a Provider Record Successfully ! ! <p><a href="demographiccontrol.jsp?demographic_no=<%=request.getParameter("demographic_no")%>&displaymode=edit&dboperation=search_detail"><%= request.getParameter("demographic_no") %></a> </h2> <%-- --- 150,216 ---- } } + + //add to waiting list if the waiting_list parameter in the property file is set to true + + WaitingList wL = WaitingList.getInstance(); + if(wL.getFound()){ + %> + <form name="add2WLFrm" action="../oscarWaitingList/Add2WaitingList.jsp"> + <input type="hidden" name="listId" value="<%=request.getParameter("list_id")%>"/> + <input type="hidden" name="demographicNo" value="<%=request.getParameter("demographic_no")%>"/> + <input type="hidden" name="demographic_no" value="<%=request.getParameter("demographic_no")%>"/> + <input type="hidden" name="waitingListNote" value="<%=request.getParameter("waiting_list_note")%>"/> + <input type="hidden" name="displaymode" value="edit"/> + <input type="hidden" name="dboperation" value="search_detail"/> + <% + if(!request.getParameter("list_id").equalsIgnoreCase("0")){ + String[] paramWLChk = new String[2]; + paramWLChk[0] = request.getParameter("demographic_no"); + paramWLChk[1] = request.getParameter("list_id"); + //check if patient has already added to the waiting list and check if the patient already has an appointment in the future + rs = apptMainBean.queryResults(paramWLChk, "search_demo_waiting_list"); + + if(!rs.next()){ + System.out.println("not on the selected waiting list"); + ResultSet rsAppt = apptMainBean.queryResults(paramWLChk[0], "search_future_appt"); + if(rsAppt.next()){ + System.out.println("has appointment in the future"); + %> + <script language="JavaScript"> + var add2List = confirm("The patient already has an appointment, do you still want to add him/her to the waiting list?"); + if(add2List){ + document.add2WLFrm.action = "../oscarWaitingList/Add2WaitingList.jsp?demographicNo=<%=request.getParameter("demographic_no")%>&listId=<%=request.getParameter("list_id")%>&waitingListNote=<%=request.getParameter("waiting_list_note")==null?"":request.getParameter("waiting_list_note")%>"; + } + else{ + document.add2WLFrm.action ="demographiccontrol.jsp?demographic_no=<%=request.getParameter("demographic_no")%>&displaymode=edit&dboperation=search_detail"; + } + document.add2WLFrm.submit(); + </script> + + <%} + else{%> + <script language="JavaScript"> + document.add2WLFrm.action = "../oscarWaitingList/Add2WaitingList.jsp?demographicNo=<%=request.getParameter("demographic_no")%>&listId=<%=request.getParameter("list_id")%>&waitingListNote=<%=request.getParameter("waiting_list_note")==null?"":request.getParameter("waiting_list_note")%>"; + document.add2WLFrm.submit(); + </script> + + <%} + } + else{ + response.sendRedirect("demographiccontrol.jsp?demographic_no=" + request.getParameter("demographic_no") + "&displaymode=edit&dboperation=search_detail"); + } + } + else{ + response.sendRedirect("demographiccontrol.jsp?demographic_no=" + request.getParameter("demographic_no") + "&displaymode=edit&dboperation=search_detail"); + } + %> + </form><% + } + else{ + response.sendRedirect("demographiccontrol.jsp?demographic_no=" + request.getParameter("demographic_no") + "&displaymode=edit&dboperation=search_detail"); + } %> <h2> Update a Provider Record Successfully ! ! <p><a href="demographiccontrol.jsp?demographic_no=<%=request.getParameter("demographic_no")%>&displaymode=edit&dboperation=search_detail"><%= request.getParameter("demographic_no") %></a></p> </h2> <%-- *************** *** 182,190 **** --%> <% ! response.sendRedirect("demographiccontrol.jsp?demographic_no=" + request.getParameter("demographic_no") + "&displaymode=edit&dboperation=search_detail"); //response.sendRedirect("search.jsp"); } else { %> ! <h1>Sorry, fail to update !!! <%= request.getParameter("demographic_no") %>. <% } --- 221,229 ---- --%> <% ! //response.sendRedirect("demographiccontrol.jsp?demographic_no=" + request.getParameter("demographic_no") + "&displaymode=edit&dboperation=search_detail"); //response.sendRedirect("search.jsp"); } else { %> ! <h1>Sorry, fail to update !!! <%= request.getParameter("demographic_no") %>.</h1> <% } *************** *** 192,200 **** %> <p></p> ! <%@ include file="footer.jsp" %> ! <script language="JavaScript"> ! this.focus(); ! </SCRIPT> </center> </body> ! </html> --- 231,236 ---- %> <p></p> ! </center> </body> ! </html:html> |
|
From: Ivy C. <ic...@us...> - 2004-12-09 03:08:14
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3567 Modified Files: demographiccontrol.jsp Log Message: updated search_future_appt query Index: demographiccontrol.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiccontrol.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** demographiccontrol.jsp 15 Oct 2004 22:39:56 -0000 1.13 --- demographiccontrol.jsp 9 Dec 2004 03:08:03 -0000 1.14 *************** *** 101,105 **** {"search_waiting_list", "select * from waitingListName order by name"}, {"search_demo_waiting_list", "select * from waitingList where demographic_no=? AND listID=?"}, ! {"search_future_appt", "select a.demographic_no, a.appointment_date, wl.onListSince from appointment a, waitingList wl where a.appointment_date >= wl.onListSince AND a.demographic_no=wl.demographic_no AND a.demographic_no=?"}, }; --- 101,105 ---- {"search_waiting_list", "select * from waitingListName order by name"}, {"search_demo_waiting_list", "select * from waitingList where demographic_no=? AND listID=?"}, ! {"search_future_appt", "select a.demographic_no, a.appointment_date from appointment a where a.appointment_date >= now() AND a.demographic_no=?"}, }; |
|
From: Ivy C. <ic...@us...> - 2004-12-09 03:07:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3350 Modified Files: demographiceditdemographic.jsp Log Message: added "--Select Waiting List--" to the waiting list drop down Index: demographiceditdemographic.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** demographiceditdemographic.jsp 8 Nov 2004 04:11:51 -0000 1.37 --- demographiceditdemographic.jsp 9 Dec 2004 03:06:51 -0000 1.38 *************** *** 755,759 **** %> <select name="list_id"> ! <option value="" ></option> <% ResultSet rsWL = apptMainBean.queryResults("search_waiting_list"); --- 755,759 ---- %> <select name="list_id"> ! <option value="0" >--Select Waiting List--</option> <% ResultSet rsWL = apptMainBean.queryResults("search_waiting_list"); |
|
From: Ivy C. <ic...@us...> - 2004-12-09 03:04:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarWaitingList In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3042 Added Files: Add2WaitingList.jsp RemoveFromWaitingList.jsp Log Message: initial commit --- NEW FILE: Add2WaitingList.jsp --- <!-- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ --> <% if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> <%@ page 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" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <html:html locale="true"> <head> <title> </title> <% response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 response.setHeader("Pragma","no-cache"); //HTTP 1.0 response.setDateHeader ("Expires", 0); //prevents caching at the proxy WLWaitingListUtil.add2WaitingList(request.getParameter("listId"), request.getParameter("waitingListNote"), request.getParameter("demographicNo")); response.sendRedirect("../demographic/demographiccontrol.jsp?demographic_no=" + request.getParameter("demographicNo") + "&displaymode=edit&dboperation=search_detail"); %> <html:base/> </head> <link rel="stylesheet" type="text/css" href="../styles.css"> <body topmargin="0" leftmargin="0" vlink="#0000FF"> <html:errors/> <table> <tr> <td> Update waiting list </td> </tr> </table> </body> </html:html> --- NEW FILE: RemoveFromWaitingList.jsp --- <!-- /* * * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. * * This software is published under the GPL GNU General Public License. * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * * * <OSCAR TEAM> * * This software was written for the * Department of Family Medicine * McMaster Unviersity * Hamilton * Ontario, Canada */ --> <% if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp"); %> <%@ page 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" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <% response.setHeader("Cache-Control","no-cache"); //HTTP 1.1 response.setHeader("Pragma","no-cache"); //HTTP 1.0 response.setDateHeader ("Expires", 0); //prevents caching at the proxy WLWaitingListUtil.removeFromWaitingList(request.getParameter("listId"), request.getParameter("demographicNo")); %> <html:html locale="true"> <head> <title> </title> <html:base/> </head> <link rel="stylesheet" type="text/css" href="../styles.css"> <body topmargin="0" leftmargin="0" vlink="#0000FF"> <html:errors/> <table> <tr> <td> Update waiting list </td> </tr> </table> </body> </html:html> |
|
From: Jay G. <jay...@us...> - 2004-12-08 20:34:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13816 Modified Files: dbReportAgeSex.jsp Log Message: clean empty <% %> and changed jsp:forward to be in the format of </> instead of <> </> Index: dbReportAgeSex.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/dbReportAgeSex.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dbReportAgeSex.jsp 24 Sep 2004 20:34:58 -0000 1.5 --- dbReportAgeSex.jsp 8 Dec 2004 20:33:50 -0000 1.6 *************** *** 43,50 **** String demographic_dob="1800"; - %> - <% - - ResultSet rsdemo2 = null; int count1 = 0; --- 43,46 ---- *************** *** 81,87 **** %> ! <jsp:forward page='oscarReportAgeSex.jsp' > ! </jsp:forward> ! <% - %> \ No newline at end of file --- 77,80 ---- %> ! <jsp:forward page='oscarReportAgeSex.jsp'/> |
|
From: Jay G. <jay...@us...> - 2004-12-08 20:31:44
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarSurveillance In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13316 Modified Files: ReportSurvey.jsp Log Message: Added No Export label if surveillance doesn't support export Index: ReportSurvey.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarSurveillance/ReportSurvey.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ReportSurvey.jsp 27 Oct 2004 14:45:11 -0000 1.2 --- ReportSurvey.jsp 8 Dec 2004 20:31:34 -0000 1.3 *************** *** 113,117 **** <%if (survey.hasExport()){ %> ! <a href="CreateSurveillanceFile.do?surveyId=<%=survey.getSurveyId()%>" >create file</a> <br/> <br/> <%for (int i = 0; i < fileList.size(); i++){ String[] file = (String[]) fileList.get(i); %> --- 113,117 ---- <%if (survey.hasExport()){ %> ! <a href="CreateSurveillanceFile.do?surveyId=<%=survey.getSurveyId()%>" >Create File</a> <br/> <br/> <%for (int i = 0; i < fileList.size(); i++){ String[] file = (String[]) fileList.get(i); %> *************** *** 120,123 **** --- 120,125 ---- </a> </br> <%}%> + <%}else{%> + No Export <%}%> </td> |
|
From: Jay G. <jay...@us...> - 2004-12-08 19:27:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30359 Modified Files: billingTeleplanCorrectionWCB.jsp Log Message: remove comments on service location drop box to show again Index: billingTeleplanCorrectionWCB.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingTeleplanCorrectionWCB.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** billingTeleplanCorrectionWCB.jsp 2 Oct 2004 16:34:37 -0000 1.13 --- billingTeleplanCorrectionWCB.jsp 8 Dec 2004 19:27:42 -0000 1.14 *************** *** 319,323 **** <a onClick="popup('400', '600', 'support/billingfeeitem.jsp?info=all&form=TeleplanCorrectionFormWCB&field=w_extrafeeitem', 'eFeeItem');">Codes</a></td> </tr>--> ! <!-- <tr> <td class="FormLabel">Service Location:</td> <td><html:select name="serviceLocation" value="<%=form.getServiceLocation()%>" property="serviceLocation"> --- 319,323 ---- <a onClick="popup('400', '600', 'support/billingfeeitem.jsp?info=all&form=TeleplanCorrectionFormWCB&field=w_extrafeeitem', 'eFeeItem');">Codes</a></td> </tr>--> ! <tr> <td class="FormLabel">Service Location:</td> <td><html:select name="serviceLocation" value="<%=form.getServiceLocation()%>" property="serviceLocation"> *************** *** 333,337 **** <html:option value="Z">None of the above</html:option> </html:select></td> ! </tr>--> <tr> <td class="FormLabel">Report Type:</td> --- 333,337 ---- <html:option value="Z">None of the above</html:option> </html:select></td> ! </tr> <tr> <td class="FormLabel">Report Type:</td> |
|
From: Jay G. <jay...@us...> - 2004-12-08 19:26:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30162 Modified Files: TeleplanCorrectionFormWCB.java Log Message: changed service location to pull from wcb instead of billingmaster Index: TeleplanCorrectionFormWCB.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/administration/TeleplanCorrectionFormWCB.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** TeleplanCorrectionFormWCB.java 8 Nov 2004 16:06:37 -0000 1.6 --- TeleplanCorrectionFormWCB.java 8 Dec 2004 19:26:37 -0000 1.7 *************** *** 120,124 **** this.billingNo = result.getString("billing_no"); this.dataSeqNo = result.getString("t_dataseq"); ! this.serviceLocation = result.getString("service_location"); this.w_icd9 = result.getString("w_icd9"); w_reportype = result.getString("w_reporttype"); --- 120,124 ---- this.billingNo = result.getString("billing_no"); this.dataSeqNo = result.getString("t_dataseq"); ! this.serviceLocation = result.getString("w_servicelocation"); this.w_icd9 = result.getString("w_icd9"); w_reportype = result.getString("w_reporttype"); |
|
From: Ivy C. <ic...@us...> - 2004-12-07 04:12:10
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16088 Modified Files: formVTForm.jsp Log Message: updated controlEyeExam and controlFootExam function Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** formVTForm.jsp 7 Dec 2004 04:08:50 -0000 1.13 --- formVTForm.jsp 7 Dec 2004 04:11:59 -0000 1.14 *************** *** 343,346 **** --- 343,353 ---- document.forms[0].elements[ftReId-1].checked= false; + document.forms[0].elements[ftNeId].checked= true; + document.forms[0].elements[ftIsId].checked= true; + document.forms[0].elements[ftUlId].checked= true; + document.forms[0].elements[ftInId].checked= true; + document.forms[0].elements[ftOtId].checked= true; + document.forms[0].elements[ftReId].checked= true; + //alert("disable all foot exam checkboxes"); document.forms[0].elements[ftNeId-1].disabled= true; *************** *** 425,432 **** 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"); --- 432,439 ---- 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"); |
|
From: Ivy C. <ic...@us...> - 2004-12-07 04:09:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15428 Modified Files: formVTForm.jsp Log Message: fixed the popup bug on IE Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** formVTForm.jsp 6 Dec 2004 14:51:24 -0000 1.12 --- formVTForm.jsp 7 Dec 2004 04:08:50 -0000 1.13 *************** *** 195,199 **** 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(); } --- 195,199 ---- 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, "DecisionSupport", windowprops); popup.focus(); } |
|
From: Ivy C. <ic...@us...> - 2004-12-07 04:08:07
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15251 Modified Files: FrmToXMLUtil.java Log Message: added SelVisitType Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** FrmToXMLUtil.java 6 Dec 2004 07:09:12 -0000 1.5 --- FrmToXMLUtil.java 7 Dec 2004 04:07:54 -0000 1.6 *************** *** 30,33 **** --- 30,34 ---- import org.apache.xmlbeans.XmlCalendar; import oscar.oscarEncounter.oscarMeasurements.bean.*; + import oscar.oscarProvider.data.ProviderData; import oscar.oscarRx.data.*; import oscar.util.UtilDateUtilities; *************** *** 51,75 **** String _dateFormat = "yyyy-MM-dd hh:mm:ss"; String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); ! SitePatientVisitRecordsDocument visitDocument = SitePatientVisitRecordsDocument.Factory.newInstance(); SitePatientVisitRecordsDocument.SitePatientVisitRecords visitRecord = visitDocument.addNewSitePatientVisitRecords(); ! ! //Vector patientVec = comm.getAllPatientsInStudy(); ! ! //for ( int pVec = 0 ; pVec < patientVec.size();pVec++){ ! //Properties patientProps = (Properties) patientVec.get(pVec); ! ! //String patientCod = (String) patientProps.get("Patient_cod"); ! //Vector vec = comm.getElementByDemographicAndDate(patientCod,start,end); ! SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit visit = visitRecord.addNewSitePatientVisit(); ! try{ ! ! visit.setPatientCod(dataProps.getProperty("demographic_no")); ! visit.setVisitCod(dataProps.getProperty("visitCod")); String who = dataProps.getProperty("provider_no"); String how = "EMR"; String when = dateEntered; - EctMeasurementTypesBean mt; for (int i = 0; i < measurementTypes.size(); i++){ --- 52,80 ---- String _dateFormat = "yyyy-MM-dd hh:mm:ss"; String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); ! ProviderData prData = new ProviderData(dataProps.getProperty("provider_no")); ! String vType = "7"; //Other ! if(prData.getProvider_type().equalsIgnoreCase("doctor")) ! vType = "1"; //FamilyMDVisit ! else if(prData.getProvider_type().equalsIgnoreCase("nurse")) ! vType = "3"; //NurseVisit ! SitePatientVisitRecordsDocument visitDocument = SitePatientVisitRecordsDocument.Factory.newInstance(); SitePatientVisitRecordsDocument.SitePatientVisitRecords visitRecord = visitDocument.addNewSitePatientVisitRecords(); ! SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit visit = visitRecord.addNewSitePatientVisit(); ! ! try{ String who = dataProps.getProperty("provider_no"); String how = "EMR"; String when = dateEntered; + SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SelVisitType visitType = visit.addNewSelVisitType(); + visitType.setValue(vType); + visitType.setSignedWhen(when); + visitType.setSignedHow(how); + visitType.setSignedWho(who); + + visit.setPatientCod(dataProps.getProperty("demographic_no")); + visit.setVisitCod(dataProps.getProperty("visitCod")); + EctMeasurementTypesBean mt; for (int i = 0; i < measurementTypes.size(); i++){ *************** *** 77,81 **** String itemName = mt.getType(); String methodCall = (String) nameProps.get(itemName+"Value"); ! //System.out.println("method "+methodCall); org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); --- 82,86 ---- String itemName = mt.getType(); String methodCall = (String) nameProps.get(itemName+"Value"); ! System.out.println("method "+methodCall); org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); *************** *** 92,98 **** //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"); --- 97,100 ---- *************** *** 107,113 **** //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("BPDate"); --- 109,112 ---- *************** *** 124,130 **** //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); } --- 123,126 ---- *************** *** 140,144 **** String value = dataProps.getProperty(itemName+"Value"); ! //System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); --- 136,141 ---- String value = dataProps.getProperty(itemName+"Value"); ! value = translate(value, methodCall); ! System.out.println(itemName + " who "+who+" how "+how+ " when "+when+ " value "+value); setWhoWhatWhereWhen(obj,how,who,when,value); *************** *** 159,165 **** //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); } } --- 156,159 ---- *************** *** 294,298 **** //} } ! } } --- 288,312 ---- //} } ! } ! ! private static String translate(String input, String xmlName){ ! if(xmlName.startsWith("B")){ ! if(input.equalsIgnoreCase("yes")){ ! return "true"; ! } ! else ! return "false"; ! } ! else if (xmlName.startsWith("Sel")){ ! if(input.equalsIgnoreCase("yes")){ ! return "present"; ! } ! else{ ! return "absent"; ! } ! } ! return input; ! ! } } |
|
From: Ivy C. <ic...@us...> - 2004-12-07 04:05:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14915 Modified Files: FrmSetupFormAction.java Log Message: added translate checkbox and radio button value Index: FrmSetupFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** FrmSetupFormAction.java 6 Dec 2004 07:13:24 -0000 1.11 --- FrmSetupFormAction.java 7 Dec 2004 04:05:47 -0000 1.12 *************** *** 188,193 **** if(value!=null){ frm.setValue(mt.getType()+"Value", value); ! System.out.println("prefill " + mt.getType() + ": " + value); if(dMiles!=null&&dMeas!=null){ --- 188,194 ---- if(value!=null){ + value = translate(value, valueMethodCall); frm.setValue(mt.getType()+"Value", value); ! //System.out.println("prefill " + mt.getType() + ": " + value); if(dMiles!=null&&dMeas!=null){ *************** *** 372,374 **** --- 373,395 ---- } + + private String translate(String input, String xmlName){ + if(xmlName.startsWith("B_")){ + if(input.equalsIgnoreCase("true")){ + return "yes"; + } + else + return "no"; + } + else if (xmlName.startsWith("Sel_")){ + if(input.equalsIgnoreCase("present")){ + return "yes"; + } + else{ + return "no"; + } + } + return input; + + } } |
38 messages has been excluded from this view by a project administrator.
