You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jay G. <jay...@us...> - 2004-12-23 23:27:00
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4980 Added Files: EctSplitChart.java Log Message: init commit --- NEW FILE: EctSplitChart.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. * * * Jason Gallagher * * This software was written for the * Department of Family Medicine * McMaster University * Hamilton * Ontario, Canada * * * EctSplitChart.java * * Created on December 20, 2004, 2:33 PM */ package oscar.oscarEncounter.data; import java.sql.*; import java.text.*; import java.util.*; import oscar.oscarDB.*; /** * * @author Jay Gallagher */ public class EctSplitChart { public EctSplitChart() { } public Vector getSplitCharts(String demographicNo){ Vector vec = null;// try{ vec = new Vector(); DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "select eChartId, timeStamp from eChart where demographicNo= '"+demographicNo+"' and subject = 'SPLIT CHART' order by timeStamp "; ResultSet rs = db.GetSQL(sql); if(rs.next()) { String[] s = new String[2]; s[0] = rs.getString("eChartId"); Timestamp timestamp = rs.getTimestamp("timeStamp"); java.util.Date d = new java.util.Date(timestamp.getTime()); Format formatter = new SimpleDateFormat("yyyy-MM-dd"); s[1] = formatter.format(d); vec.add(s); } }catch(SQLException e){ e.printStackTrace(); vec = null; } return vec; } } |
|
From: Jay G. <jay...@us...> - 2004-12-23 23:25:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4614 Modified Files: Index.jsp Log Message: changed Locale Session Constant to new Struts Globals Class Added new Split Chart feature to see passed Split Charts Changed logic for adding "Encounter Reason" String Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index.jsp,v retrieving revision 1.68 retrieving revision 1.69 diff -C2 -d -r1.68 -r1.69 *** Index.jsp 24 Nov 2004 02:14:41 -0000 1.68 --- Index.jsp 23 Dec 2004 23:25:25 -0000 1.69 *************** *** 31,35 **** <%@ taglib uri="/WEB-INF/rewrite-tag.tld" prefix="rewrite" %> ! <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*, oscar.oscarWaitingList.WaitingList, java.net.*,java.util.Properties"%> <%@page import="oscar.oscarMDS.data.MDSResultsData"%> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> --- 31,35 ---- <%@ taglib uri="/WEB-INF/rewrite-tag.tld" prefix="rewrite" %> ! <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*, oscar.oscarWaitingList.WaitingList, java.net.*,java.util.*"%> <%@page import="oscar.oscarMDS.data.MDSResultsData"%> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> *************** *** 59,67 **** String providerName = bean.userName; String pAge = Integer.toString(dateConvert.calcAge(bean.yearOfBirth,bean.monthOfBirth,bean.dateOfBirth)); ! java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY); MDSResultsData labResults = new MDSResultsData(); labResults.populateMDSResultsData("", demoNo, "", "", "", "U"); String province = ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase(); Properties windowSizes = oscar.oscarEncounter.pageUtil.EctWindowSizes.getWindowSizes(provNo); %> --- 59,75 ---- String providerName = bean.userName; String pAge = Integer.toString(dateConvert.calcAge(bean.yearOfBirth,bean.monthOfBirth,bean.dateOfBirth)); ! java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY); MDSResultsData labResults = new MDSResultsData(); labResults.populateMDSResultsData("", demoNo, "", "", "", "U"); String province = ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase(); Properties windowSizes = oscar.oscarEncounter.pageUtil.EctWindowSizes.getWindowSizes(provNo); + + EctSplitChart ectSplitChart = new EctSplitChart(); + Vector splitChart = ectSplitChart.getSplitCharts(demoNo); + + boolean sChart = true; + if (splitChart == null || splitChart.size() == 0){ + sChart = false; + } %> *************** *** 481,504 **** var tmp; document.encForm.enTextarea.focus(); ! tmp = document.encForm.enTextarea.value; // these two lines cause the enTextarea to scroll to the bottom (only works in IE) ! document.encForm.enTextarea.value = tmp; // another option is to use window.setTimeout("document.encForm.enTextarea.scrollTop=2147483647", 0); (also only works in IE) } </script> <script language="javascript"> - function showpic(picture){ - //if (document.getElementById){ // Netscape 6 and IE 5+ - // var targetElement = document.getElementById(picture); - //targetElement.style.visibility = 'visible'; - //} - var aew = document.ids.Layer1.visibility; - } ! function hidepic(picture){ ! if (document.getElementById){ // Netscape 6 and IE 5+ ! var targetElement = document.getElementById(picture); ! targetElement.style.visibility = 'hidden'; } ! } function popperup(vheight,vwidth,varpage,pageName) { //open a new popup window hidepic('Layer1'); --- 489,541 ---- var tmp; document.encForm.enTextarea.focus(); ! document.encForm.enTextarea.value = document.encForm.enTextarea.value + ""; ! ! //tmp = document.encForm.enTextarea.value; // these two lines cause the enTextarea to scroll to the bottom (only works in IE) ! //document.encForm.enTextarea.value = tmp; // another option is to use window.setTimeout("document.encForm.enTextarea.scrollTop=2147483647", 0); (also only works in IE) } </script> <script language="javascript"> ! ///// ! function showpic(picture,id){ ! if (document.getElementById){ // Netscape 6 and IE 5+ ! var targetElement = document.getElementById(picture); ! var bal = document.getElementById(id); ! ! var offsetTrail = document.getElementById(id); ! var offsetLeft = 0; ! var offsetTop = 0; ! while (offsetTrail) { ! offsetLeft += offsetTrail.offsetLeft; ! offsetTop += offsetTrail.offsetTop; ! offsetTrail = offsetTrail.offsetParent; } ! if (navigator.userAgent.indexOf("Mac") != -1 && ! typeof document.body.leftMargin != "undefined") { ! offsetLeft += document.body.leftMargin; ! offsetTop += document.body.topMargin; ! } ! ! targetElement.style.left = offsetLeft +bal.offsetWidth; ! targetElement.style.top = offsetTop; ! targetElement.style.visibility = 'visible'; ! } ! } ! ! function hidepic(picture){ ! if (document.getElementById){ // Netscape 6 and IE 5+ ! var targetElement = document.getElementById(picture); ! targetElement.style.visibility = 'hidden'; ! } ! } ! ! ! ///// ! ! ! ! ! function popperup(vheight,vwidth,varpage,pageName) { //open a new popup window hidepic('Layer1'); *************** *** 950,954 **** <table border="0" cellpadding="0" cellspacing="0" width='100%' > <tr><td width='75%' > ! <a href=# onClick="popupPage2('../report/reportecharthistory.jsp?demographic_no=<%=bean.demographicNo%>');return false;"><div class="RowTop" ><bean:message key="global.encounter"/>: <%=bean.reason%></div></a><input type="hidden" name="enInput"/> </td><td width='5%' > <% --- 987,1002 ---- <table border="0" cellpadding="0" cellspacing="0" width='100%' > <tr><td width='75%' > ! <div class="RowTop" > ! <a href=# onClick="popupPage2('../report/reportecharthistory.jsp?demographic_no=<%=bean.demographicNo%>');return false;"> ! <bean:message key="global.encounter"/>: <%=bean.patientLastName %>, <%=bean.patientFirstName%> ! </a> ! <%if (sChart) {%> ! <!--http://localhost:8084/oscar/oscarEncounter/echarthistoryprint.jsp?echartid=7491&demographic_no=10090--> ! <a href="javascript: function myFunction() {return false; }" onClick="showpic('splitChartLayer','splitChartId');" id="splitChartId" > ! Split Chart ! </a> ! <%}%> ! </div> ! <input type="hidden" name="enInput"/> </td><td width='5%' > <% *************** *** 987,998 **** </div> </td> ! </tr> <tr> <td colspan="2" valign="top" style="text-align:left"> ! <textarea name='enTextarea' wrap="hard" cols="99" style="height:<%=windowSizes.getProperty("rowThreeSize")%>;overflow:auto"><% if(!bSplit) out.print(bean.encounter); else if(bTruncate) out.print(bean.encounter.substring(nEctLen-5120)+"\n--------------------------------------------------\n$$SPLIT CHART$$\n"); else out.print(bean.encounter+"\n--------------------------------------------------\n$$SPLIT CHART$$\n");%><%if(bean.eChartTimeStamp==null){%><%="\n["+dateConvert.DateToString(bean.currentDate)+" .: "+bean.reason+"]\n"%><%} ! // border-right:6px solid #ccccff;border-right:6px solid #ccccff; ! else if(bean.currentDate.compareTo(bean.eChartTimeStamp)>0) ! {%><%="\n__________________________________________________\n["+dateConvert.DateToString(bean.currentDate)+" .: "+bean.reason+"]\n"%><%} ! if(!bean.oscarMsg.equals("")){%><%="\n\n"+bean.oscarMsg%><%}%></textarea> </td> </tr> --- 1035,1067 ---- </div> </td> ! </tr> ! <% ! //System.out.println("reason "+bean.reason+" subject "+bean.subject); ! String encounterText = ""; ! try{ ! if(!bSplit){ ! encounterText = bean.encounter; ! }else if(bTruncate){ ! encounterText = bean.encounter.substring(nEctLen-5120)+"\n--------------------------------------------------\n$$SPLIT CHART$$\n"; ! }else{ ! encounterText = bean.encounter+"\n--------------------------------------------------\n$$SPLIT CHART$$\n"; ! } ! if(bean.eChartTimeStamp==null){ ! encounterText +="\n["+dateConvert.DateToString(bean.currentDate)+" .: "+bean.reason+"] \n"; ! }else if(bean.currentDate.compareTo(bean.eChartTimeStamp)>0){ ! encounterText +="\n__________________________________________________\n["+dateConvert.DateToString(bean.currentDate)+" .: "+bean.reason+"]\n"; ! }else if((bean.currentDate.compareTo(bean.eChartTimeStamp) == 0) && (bean.reason != null || bean.subject != null ) && !bean.reason.equals(bean.subject) ){ ! encounterText +="\n__________________________________________________\n["+dateConvert.DateToString(bean.currentDate)+" .: "+bean.reason+"]\n"; ! } ! //System.out.println("eChartTimeStamp" + bean.eChartTimeStamp+" bean.currentDate " + dateConvert.DateToString(bean.currentDate));//" diff "+bean.currentDate.compareTo(bean.eChartTimeStamp)); ! if(!bean.oscarMsg.equals("")){ ! encounterText +="\n\n"+bean.oscarMsg; ! } ! ! }catch(Exception eee){eee.printStackTrace();} ! %> <tr> <td colspan="2" valign="top" style="text-align:left"> ! <textarea name='enTextarea' wrap="hard" cols="99" style="height:<%=windowSizes.getProperty("rowThreeSize")%>;overflow:auto"><%=encounterText%></textarea> </td> </tr> *************** *** 1039,1042 **** --- 1108,1138 ---- </form> + <%if (sChart){ %> + <div id="splitChartLayer" style="position:absolute; left:1px; top:1px; width:150px; height:311px; visibility: hidden; z-index:1" > + + <table width="98%" border="1" cellspacing="1" cellpadding="1" align=center bgcolor="#CCCCFF"> + <tr class="LightBG"> + <td class="wcblayerTitle">Date</td> + <td class="wcblayerTitle" align="right"> + <a href="javascript: function myFunction() {return false; }" onclick="hidepic('splitChartLayer');" style="text-decoration: none;">X</a> + </td> + </tr> + <% for (int i = 0 ; i < splitChart.size(); i++){ + String[] s = (String[]) splitChart.get(i);%> + <tr class="background-color : #ccccff;"> + <td class="wcblayerTitle"> + <a href=# onClick="hidepic('splitChartLayer');popupPage2('echarthistoryprint.jsp?echartid=<%=s[0]%>&demographic_no=<%=bean.demographicNo%>');return false;"> + <%=s[1]%> + </a> + </td> + <td class="wcblayerItem" > + + </td> + </tr> + <%}%> + </table> + </div> + <%}%> + </body> </html:html> |
|
From: Jay G. <jay...@us...> - 2004-12-20 20:36:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18417 Modified Files: echarthistoryprint.jsp Log Message: added top <html> tag Index: echarthistoryprint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/echarthistoryprint.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** echarthistoryprint.jsp 1 Apr 2004 18:28:45 -0000 1.2 --- echarthistoryprint.jsp 20 Dec 2004 20:36:38 -0000 1.3 *************** *** 58,62 **** } </script> ! <body topmargin="0" leftmargin="0" vlink="#0000FF"> <html:errors/> --- 58,62 ---- } </script> ! <html:html> <body topmargin="0" leftmargin="0" vlink="#0000FF"> <html:errors/> |
|
From: Jay G. <jay...@us...> - 2004-12-20 19:18:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31336 Modified Files: savemyform.jsp Log Message: Commented out XML doc create. Still needs to be save somewhere Index: savemyform.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/savemyform.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** savemyform.jsp 30 Aug 2004 15:23:42 -0000 1.4 --- savemyform.jsp 20 Dec 2004 19:17:54 -0000 1.5 *************** *** 87,91 **** //Section that creates XML, still needs to be inserted somewhere into a MYSQL table ! try{ Document doc = UtilXML.newDocument(); Element root = UtilXML.addNode(doc, form_name); --- 87,92 ---- //Section that creates XML, still needs to be inserted somewhere into a MYSQL table ! //TODO: Needs to xml validate for illegal characters ! /*try{ Document doc = UtilXML.newDocument(); Element root = UtilXML.addNode(doc, form_name); *************** *** 100,104 **** ex.printStackTrace(); } ! --- 101,105 ---- ex.printStackTrace(); } ! */ |
|
From: Jay G. <jay...@us...> - 2004-12-20 19:13:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30241 Modified Files: calldeletedformdata.jsp Log Message: Put Date and time columns together Index: calldeletedformdata.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/calldeletedformdata.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** calldeletedformdata.jsp 27 Aug 2004 13:34:20 -0000 1.9 --- calldeletedformdata.jsp 20 Dec 2004 19:13:29 -0000 1.10 *************** *** 102,106 **** <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> ! <td class="MainTableTopRowLeftColumn"> <bean:message key="eform.calldeletedformdata.msgMyform"/> </td> --- 102,106 ---- <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> ! <td class="MainTableTopRowLeftColumn" width="175"> <bean:message key="eform.calldeletedformdata.msgMyform"/> </td> *************** *** 133,143 **** </td> ! <td class="MainTableRightColumn"> ! <table border="0" cellspacing="2" cellpadding="2" width="98%"> <tr bgcolor="<%=deepColor%>" > ! <th width=20%><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>&orderby=form_name"><bean:message key="eform.showmyform.btnFormName"/></a></th> ! <th width=40%><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>&orderby=subject"><bean:message key="eform.showmyform.btnSubject"/></a></th> <th><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formDate"/></a></th> ! <th><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formTime"/></a></th> <th><bean:message key="eform.showmyform.msgAction"/></th> </tr> --- 133,143 ---- </td> ! <td class="MainTableRightColumn" valign="top"> ! <table border="0" cellspacing="2" cellpadding="2" width="100%"> <tr bgcolor="<%=deepColor%>" > ! <th ><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>&orderby=form_name"><bean:message key="eform.showmyform.btnFormName"/></a></th> ! <th ><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>&orderby=subject"><bean:message key="eform.showmyform.btnSubject"/></a></th> <th><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formDate"/></a></th> ! <!--<th><a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formTime"/></a></th>--> <th><bean:message key="eform.showmyform.msgAction"/></th> </tr> *************** *** 152,157 **** <td><a href="JavaScript:newWindow('showmyformdata.jsp?fdid=<%=rs.getInt("fdid")%>','window2')"><%=rs.getString("form_name")%></a></td> <td><%=rs.getString("subject")%></td> ! <td nowrap align='center'><%=rs.getString("form_date")%></td> ! <td nowrap align='center'><%=rs.getString("form_time")%></td> <td nowrap align='center'><a href="undeleteformdata.jsp?fdid=<%=rs.getInt("fdid")%>&demographic_no=<%=demographic_no%>"><bean:message key="eform.calldeletedformdata.btnUndelete"/></a></td> </tr> --- 152,156 ---- <td><a href="JavaScript:newWindow('showmyformdata.jsp?fdid=<%=rs.getInt("fdid")%>','window2')"><%=rs.getString("form_name")%></a></td> <td><%=rs.getString("subject")%></td> ! <td nowrap align='center'><%=rs.getString("form_date")%> <%=rs.getString("form_time")%></td> <td nowrap align='center'><a href="undeleteformdata.jsp?fdid=<%=rs.getInt("fdid")%>&demographic_no=<%=demographic_no%>"><bean:message key="eform.calldeletedformdata.btnUndelete"/></a></td> </tr> |
|
From: Jay G. <jay...@us...> - 2004-12-20 19:13:16
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30089 Modified Files: showmyform.jsp Log Message: Put Date and time columns together Index: showmyform.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/showmyform.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** showmyform.jsp 27 Aug 2004 13:34:20 -0000 1.10 --- showmyform.jsp 20 Dec 2004 19:13:06 -0000 1.11 *************** *** 107,111 **** <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> ! <td class="MainTableTopRowLeftColumn"> <bean:message key="eform.showmyform.msgMyForm"/> </td> --- 107,111 ---- <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> ! <td class="MainTableTopRowLeftColumn" width="175" > <bean:message key="eform.showmyform.msgMyForm"/> </td> *************** *** 138,149 **** <a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.btnDeleted"/> </a> </td> ! <td class="MainTableRightColumn"> ! <table border="0" cellspacing="2" cellpadding="2" width="95%"> <tr bgcolor=<%=deepColor%> > <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>&orderby=form_name"><bean:message key="eform.showmyform.btnFormName"/></a></th> <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>&orderby=subject"><bean:message key="eform.showmyform.btnSubject"/></a></th> ! <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formDate"/></a></th> ! <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formTime"/></a></th> ! <th></th> </tr> <% --- 138,148 ---- <a href="calldeletedformdata.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.btnDeleted"/> </a> </td> ! <td class="MainTableRightColumn" valign="top"> ! <table border="0" cellspacing="2" cellpadding="2" width="100%"> <tr bgcolor=<%=deepColor%> > <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>&orderby=form_name"><bean:message key="eform.showmyform.btnFormName"/></a></th> <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>&orderby=subject"><bean:message key="eform.showmyform.btnSubject"/></a></th> ! <th><a href="showmyform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formDate"/></a></th> ! <th><bean:message key="eform.showmyform.msgAction"/></th> </tr> <% *************** *** 157,162 **** <td><a href="JavaScript:newWindow('showmyformdata.jsp?fdid=<%=rs.getInt("fdid")%>','_blank')"><%=rs.getString("form_name")%></a></td> <td><%=rs.getString("subject")%></td> ! <td align='center'><%=rs.getString("form_date")%></td> ! <td align='center'><%=rs.getString("form_time")%></td> <td align='center'><a href="deleteformdata.jsp?fdid=<%=rs.getInt("fdid")%>&demographic_no=<%=demographic_no%>"><bean:message key="eform.uploadimages.btnDelete"/></a></td> </tr> --- 156,160 ---- <td><a href="JavaScript:newWindow('showmyformdata.jsp?fdid=<%=rs.getInt("fdid")%>','_blank')"><%=rs.getString("form_name")%></a></td> <td><%=rs.getString("subject")%></td> ! <td align='center'><%=rs.getString("form_date")%> <%=rs.getString("form_time")%></td> <td align='center'><a href="deleteformdata.jsp?fdid=<%=rs.getInt("fdid")%>&demographic_no=<%=demographic_no%>"><bean:message key="eform.uploadimages.btnDelete"/></a></td> </tr> |
|
From: Jay G. <jay...@us...> - 2004-12-20 19:08:54
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29086 Modified Files: myform.jsp Log Message: Made Forms List Alphabetically by default. Removed File and form time Index: myform.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/myform.jsp,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** myform.jsp 27 Aug 2004 13:34:20 -0000 1.10 --- myform.jsp 20 Dec 2004 19:08:31 -0000 1.11 *************** *** 10,14 **** <% ! String param = request.getParameter("orderby")!=null?request.getParameter("orderby"):"form_date desc"; String [][] dbQueries=new String[][] { // Postgres cant execute this query --- 10,14 ---- <% ! String param = request.getParameter("orderby")!=null?request.getParameter("orderby"):"form_name "; String [][] dbQueries=new String[][] { // Postgres cant execute this query *************** *** 99,103 **** <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> ! <td class="MainTableTopRowLeftColumn"> <bean:message key="eform.myform.msgEForm"/> </td> --- 99,103 ---- <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> ! <td class="MainTableTopRowLeftColumn" width="175"> <bean:message key="eform.myform.msgEForm"/> </td> *************** *** 135,141 **** <th><a href="myform.jsp?demographic_no=<%=demographic_no%>&orderby=form_name"><bean:message key="eform.showmyform.btnFormName"/></a></th> <th><a href="myform.jsp?demographic_no=<%=demographic_no%>&orderby=subject"><bean:message key="eform.showmyform.btnSubject"/></a></th> ! <th><a href="myform.jsp?demographic_no=<%=demographic_no%>&orderby=file_name"><bean:message key="eform.myform.btnFile"/></a></th> <th><a href="myform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formDate"/></a></th> ! <th><a href="myform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formTime"/></a></th> </tr> --- 135,141 ---- <th><a href="myform.jsp?demographic_no=<%=demographic_no%>&orderby=form_name"><bean:message key="eform.showmyform.btnFormName"/></a></th> <th><a href="myform.jsp?demographic_no=<%=demographic_no%>&orderby=subject"><bean:message key="eform.showmyform.btnSubject"/></a></th> ! <!--<th><a href="myform.jsp?demographic_no=<%=demographic_no%>&orderby=file_name"><bean:message key="eform.myform.btnFile"/></a></th>--> <th><a href="myform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formDate"/></a></th> ! <!--<th><a href="myform.jsp?demographic_no=<%=demographic_no%>"><bean:message key="eform.showmyform.formTime"/></a></th> --> </tr> *************** *** 146,157 **** %> <tr bgcolor="<%=bgcolor%>"> ! <td width=25%> <a href="makemyform.jsp?fid=<%=rs.getInt("fid")%>&form_name=<%=rs.getString("form_name")%>&demographic_no=<%=demographic_no%>&subject=<%=rs.getString("subject")%>"> <%=rs.getString("form_name")%> </a></td> ! <td width=30% ><%=rs.getString("subject")%></td> ! <td width=25% ><%=rs.getString("file_name")%></td> <td nowrap align='center'><%=rs.getString("form_date")%></td> ! <td nowrap align='center'><%=rs.getString("form_time")%></td> </tr> <% --- 146,157 ---- %> <tr bgcolor="<%=bgcolor%>"> ! <td > <a href="makemyform.jsp?fid=<%=rs.getInt("fid")%>&form_name=<%=rs.getString("form_name")%>&demographic_no=<%=demographic_no%>&subject=<%=rs.getString("subject")%>"> <%=rs.getString("form_name")%> </a></td> ! <td ><%=rs.getString("subject")%></td> ! <!--<td width=25% ><%=rs.getString("file_name")%></td>--> <td nowrap align='center'><%=rs.getString("form_date")%></td> ! <!--<td nowrap align='center'><%=rs.getString("form_time")%></td>--> </tr> <% |
|
From: Jay G. <jay...@us...> - 2004-12-20 16:14:03
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18507 Modified Files: formannualmaleV2.jsp Log Message: Fixed bug with check dates. Was checking for LMP which is only available on female form Index: formannualmaleV2.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formannualmaleV2.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** formannualmaleV2.jsp 12 Aug 2004 21:08:10 -0000 1.3 --- formannualmaleV2.jsp 20 Dec 2004 16:13:53 -0000 1.4 *************** *** 200,206 **** b = false; } ! if(valDate(document.forms[0].lmp)==false){ ! b = false; ! } return b; --- 200,204 ---- b = false; } ! return b; |
|
From: Jay G. <jay...@us...> - 2004-12-20 15:32:05
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8934 Modified Files: FrmFormAction.java Log Message: more debugging statements Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** FrmFormAction.java 15 Dec 2004 22:14:46 -0000 1.18 --- FrmFormAction.java 20 Dec 2004 15:31:53 -0000 1.19 *************** *** 162,165 **** --- 162,166 ---- //Write to Measurement Table + System.out.println("exit "+submit+" inputValue "+inputValue); if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) //System.out.println("write to measurement table: " + mt.getType()); write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); |
|
From: Jay G. <jay...@us...> - 2004-12-19 03:27:12
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7500 Modified Files: formVTForm.jsp Log Message: removed enctype="multipart/form-data" from form Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** formVTForm.jsp 9 Dec 2004 21:16:43 -0000 1.17 --- formVTForm.jsp 19 Dec 2004 03:27:00 -0000 1.18 *************** *** 448,452 **** <!-- --> ! <html:form action="/form/SubmitForm" enctype="multipart/form-data"> <link rel="stylesheet" type="text/css" href="../oscarEncounter/oscarMeasurements/styles/measurementStyle.css"> <link rel="stylesheet" type="text/css" media="print" href="print.css"/> --- 448,452 ---- <!-- --> ! <html:form action="/form/SubmitForm" > <link rel="stylesheet" type="text/css" href="../oscarEncounter/oscarMeasurements/styles/measurementStyle.css"> <link rel="stylesheet" type="text/css" media="print" href="print.css"/> |
|
From: Jay G. <jay...@us...> - 2004-12-16 17:07:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15830 Modified Files: FrmFormForm.java Log Message: Added more debugging and removed final from Map values Index: FrmFormForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** FrmFormForm.java 15 Dec 2004 22:03:01 -0000 1.3 --- FrmFormForm.java 16 Dec 2004 17:07:08 -0000 1.4 *************** *** 27,38 **** public final class FrmFormForm extends ActionForm { ! public FrmFormForm(){ ! System.out.println("FrmFormForm gets instantiated"); } //Using map-backed method to get the value of each field //key: the field property //value: the value of the associated key ! private final Map values = new HashMap(); public void setValue(String key, Object value) { --- 27,42 ---- public final class FrmFormForm extends ActionForm { ! ! static int howmany = 0; ! public FrmFormForm(){ ! howmany++; ! System.out.println("FrmFormForm gets instantiated howmany = "+howmany+" "); ! System.out.println("FrmFormForm currentMem = "+currentMem()); } //Using map-backed method to get the value of each field //key: the field property //value: the value of the associated key ! private Map values = new HashMap(); public void setValue(String key, Object value) { *************** *** 44,47 **** --- 48,63 ---- return values.get(key); } + + public void finalize(){ + howmany--; + System.out.println("FrmFormForm gets finalized howmany = "+howmany+" "); + System.out.println("FrmFormForm currentMem = "+currentMem()); + } + public String currentMem(){ + long total = Runtime.getRuntime().totalMemory(); + long free = Runtime.getRuntime().freeMemory(); + long Used = total - free; + return "Total "+total+" Free "+free+" USED "+Used; + } } |
|
From: Jay G. <jay...@us...> - 2004-12-15 22:14:56
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16586 Modified Files: FrmFormAction.java Log Message: more debugging Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** FrmFormAction.java 15 Dec 2004 22:00:57 -0000 1.17 --- FrmFormAction.java 15 Dec 2004 22:14:46 -0000 1.18 *************** *** 139,142 **** --- 139,144 ---- props.setProperty("visitCod", visitCod); String diagnosisVT = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) frm.getValue("diagnosisVT")); + System.out.println("diagnosisVT >"+diagnosisVT+"< form val >"+frm.getValue("diagnosisVT")); + //for VTForm props.setProperty("diagnosis", diagnosisVT); |
|
From: Jay G. <jay...@us...> - 2004-12-15 22:03:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13325 Modified Files: FrmFormForm.java Log Message: Added more debugging Index: FrmFormForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormForm.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FrmFormForm.java 15 Dec 2004 16:25:38 -0000 1.2 --- FrmFormForm.java 15 Dec 2004 22:03:01 -0000 1.3 *************** *** 37,41 **** public void setValue(String key, Object value) { ! System.out.println("Size of FrmFormForm "+values.size()); values.put(key, value); } --- 37,41 ---- public void setValue(String key, Object value) { ! System.out.println("adding key "+key+" value "+value+" Size of FrmFormForm "+values.size()); values.put(key, value); } |
|
From: Jay G. <jay...@us...> - 2004-12-15 22:01:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12865 Modified Files: FrmFormAction.java Log Message: Seperated StringEscapeUtils call to a seperate line Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** FrmFormAction.java 15 Dec 2004 15:20:40 -0000 1.16 --- FrmFormAction.java 15 Dec 2004 22:00:57 -0000 1.17 *************** *** 138,144 **** props.setProperty("provider_no", providerNo); 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")); --- 138,144 ---- props.setProperty("provider_no", providerNo); props.setProperty("visitCod", visitCod); ! String diagnosisVT = org.apache.commons.lang.StringEscapeUtils.escapeSql((String) frm.getValue("diagnosisVT")); //for VTForm ! props.setProperty("diagnosis", diagnosisVT); //System.out.println("diagnosis: " + props.getProperty("diagnosis")); |
|
From: Jay G. <jay...@us...> - 2004-12-15 16: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-serv31192 Modified Files: FrmFormForm.java Log Message: debug statement Index: FrmFormForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormForm.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** FrmFormForm.java 18 Nov 2004 18:24:25 -0000 1.1 --- FrmFormForm.java 15 Dec 2004 16:25:38 -0000 1.2 *************** *** 28,31 **** --- 28,34 ---- public final class FrmFormForm extends ActionForm { + public FrmFormForm(){ + System.out.println("FrmFormForm gets instantiated"); + } //Using map-backed method to get the value of each field //key: the field property *************** *** 34,37 **** --- 37,41 ---- public void setValue(String key, Object value) { + System.out.println("Size of FrmFormForm "+values.size()); values.put(key, value); } |
|
From: Jay G. <jay...@us...> - 2004-12-15 15:20:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15424 Modified Files: FrmFormAction.java Log Message: Changed CurrentMem return statement Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** FrmFormAction.java 15 Dec 2004 14:26:37 -0000 1.15 --- FrmFormAction.java 15 Dec 2004 15:20:40 -0000 1.16 *************** *** 401,406 **** public String currentMem(){ ! long Used = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); ! return ""+Used; } } --- 401,408 ---- public String currentMem(){ ! long total = Runtime.getRuntime().totalMemory(); ! long free = Runtime.getRuntime().freeMemory(); ! long Used = total - free; ! return "Total "+total+" Free "+free+" USED "+Used; } } |
|
From: Jay G. <jay...@us...> - 2004-12-15 14:46:38
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7157 Modified Files: oscardata_bc.sql Log Message: Added Referral Doc Index: oscardata_bc.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata_bc.sql,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** oscardata_bc.sql 13 Oct 2004 15:26:06 -0000 1.12 --- oscardata_bc.sql 15 Dec 2004 14:46:08 -0000 1.13 *************** *** 10265,10269 **** INSERT INTO billingreferral VALUES (10028,'25905','Maher','D','Intern','Geriatric Services','Royal Jubilee Hospital','Victoria','BC','V8R1J8','2503708000',''); insert into billingreferral values (10029,'28091','Poon','C','Urology','102-123 East 15th Street','','North Vancouver','BC','V7L2P7','6049878171',''); ! -- --- 10265,10269 ---- INSERT INTO billingreferral VALUES (10028,'25905','Maher','D','Intern','Geriatric Services','Royal Jubilee Hospital','Victoria','BC','V8R1J8','2503708000',''); insert into billingreferral values (10029,'28091','Poon','C','Urology','102-123 East 15th Street','','North Vancouver','BC','V7L2P7','6049878171',''); ! insert into billingreferral values (10039,'28149','Gilbart','Michael Kenneth','Orthopedic Surgery','Allan McGavin Sports Med. Center','3055 Wesbrook Mall','Vancouver','BC','V6T1Z3','6048225699',''); -- |
|
From: Jay G. <jay...@us...> - 2004-12-15 14:26:49
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3009 Modified Files: FrmFormAction.java Log Message: Added Current Memory Left Statements for debugging Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FrmFormAction.java 10 Dec 2004 20:29:36 -0000 1.14 --- FrmFormAction.java 15 Dec 2004 14:26:37 -0000 1.15 *************** *** 65,77 **** private String _dateFormat = "yyyy/MM/dd"; ! ActionErrors errors = new ActionErrors(); ! boolean valid = true; public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException ! { ! System.out.println("FrmFormAction is called"); System.gc(); FrmFormForm frm = (FrmFormForm) form; --- 65,78 ---- private String _dateFormat = "yyyy/MM/dd"; ! public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) ! throws ServletException, IOException{ ! ActionErrors errors = new ActionErrors(); ! boolean valid = true; ! System.out.println("FrmFormAction is called "+currentMem()); System.gc(); + System.out.println("current mem 1 "+currentMem()); FrmFormForm frm = (FrmFormForm) form; *************** *** 80,84 **** request.getSession().setAttribute("EctSessionBean", bean); ! String formName = (String) frm.getValue("formName"); String formId = (String) frm.getValue("formId"); String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); --- 81,86 ---- request.getSession().setAttribute("EctSessionBean", bean); ! String formName = (String) frm.getValue("formName"); ! System.out.println("formNme Top "+formName); String formId = (String) frm.getValue("formId"); String dateEntered = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),_dateFormat); *************** *** 86,92 **** --- 88,97 ---- String visitCod = UtilDateUtilities.DateToString(UtilDateUtilities.Today(),"yyyyMMdd"); + System.out.println("current mem 2 "+currentMem()); + Properties props = new Properties(); EctFormProp formProp = EctFormProp.getInstance(); Vector measurementTypes = formProp.getMeasurementTypes(); + System.out.println("num measurements "+measurementTypes.size()); String demographicNo = null; String providerNo = (String) session.getValue("user"); *************** *** 94,100 **** --- 99,109 ---- demographicNo = bean.getDemographicNo(); + System.out.println("current mem 3 "+currentMem()); + errors.clear(); valid = true; + System.out.println("current mem 4 "+currentMem()); + String submit = request.getParameter("submit"); *************** *** 105,108 **** --- 114,118 ---- long startTime = System.currentTimeMillis(); + System.out.println("current mem 5 "+currentMem()); for(int i=0; i<measurementTypes.size(); i++){ mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); *************** *** 115,121 **** //validate ! valid = validate( inputValue, observationDate, mt, validation, request); } ! long endTime = System.currentTimeMillis(); long delTime = endTime - startTime; --- 125,131 ---- //validate ! valid = validate( inputValue, observationDate, mt, validation, request,errors); } ! System.out.println("current mem 6 "+currentMem()); long endTime = System.currentTimeMillis(); long delTime = endTime - startTime; *************** *** 135,138 **** --- 145,149 ---- startTime = System.currentTimeMillis(); for(int i=0; i<measurementTypes.size(); i++){ + System.out.println("current mem 7.1."+i+" "+currentMem()); mt = (EctMeasurementTypesBean) measurementTypes.elementAt(i); validation = (EctValidationsBean) mt.getValidationRules().elementAt(0); *************** *** 158,166 **** 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); --- 169,177 ---- props.setProperty(type+"LastDataEnteredDate", lastDataEnteredDate); System.out.println("type: " + type + " input: " + inputValue); ! props.setProperty(type+"Date", observationDate); props.setProperty(type+"Comments", comments); ! if(!GenericValidator.isBlankOrNull(inputValue)){ props.setProperty(type+"Value", inputValue); *************** *** 179,182 **** --- 190,194 ---- } } + System.out.println("current mem 7.2."+i+" "+currentMem()); } endTime = System.currentTimeMillis(); *************** *** 185,188 **** --- 197,201 ---- //Store the the form table for keeping the current record + System.out.println("current mem 8 "+currentMem()); try{ String sql = "SELECT * FROM form"+formName + " WHERE demographic_no='"+demographicNo + "' AND ID=0"; *************** *** 190,199 **** frh.setDateFormat(_dateFormat); (frh).saveFormRecord(props, sql); ! } ! catch(SQLException e){ System.out.println(e.getMessage()); } ! //Send to Mils thru xml-rpc Properties nameProps = convertName(formName); --- 203,211 ---- frh.setDateFormat(_dateFormat); (frh).saveFormRecord(props, sql); ! }catch(SQLException e){ System.out.println(e.getMessage()); } ! System.out.println("current mem 9 "+currentMem()); //Send to Mils thru xml-rpc Properties nameProps = convertName(formName); *************** *** 201,207 **** String decisionSupportURL = connect2OSDSF(xmlData); request.setAttribute("decisionSupportURL", decisionSupportURL); ! ! } ! else{ //return to the orignal form return (new ActionForward("/form/SetupForm.do?formName="+formName+"&formId=0")); --- 213,218 ---- String decisionSupportURL = connect2OSDSF(xmlData); request.setAttribute("decisionSupportURL", decisionSupportURL); ! System.out.println("current mem 9 "+currentMem()); ! }else{ //return to the orignal form return (new ActionForward("/form/SetupForm.do?formName="+formName+"&formId=0")); *************** *** 219,228 **** } EctFormData fData = new EctFormData(); String formNameByFormTable = fData.getFormNameByFormTable("../form/SetupForm.do?formName="+formName+"&demographic_no="); String[] formPath = {"","0"}; try{ formPath = (new FrmData()).getShortcutFormValue(demographicNo, formNameByFormTable); ! } ! catch(SQLException e){ e.printStackTrace(); } --- 230,240 ---- } EctFormData fData = new EctFormData(); + System.out.println("formName from Frm ForamAction"+formName); String formNameByFormTable = fData.getFormNameByFormTable("../form/SetupForm.do?formName="+formName+"&demographic_no="); + System.out.println("formNameByFormTable"+formNameByFormTable); String[] formPath = {"","0"}; try{ formPath = (new FrmData()).getShortcutFormValue(demographicNo, formNameByFormTable); ! }catch(SQLException e){ e.printStackTrace(); } *************** *** 234,239 **** ! private boolean validate(String inputValue, String observationDate, EctMeasurementTypesBean mt, EctValidationsBean validation, HttpServletRequest request ){ ! EctValidation ectValidation = new EctValidation(); String inputTypeDisplay = mt.getTypeDesc(); --- 246,252 ---- ! private boolean validate(String inputValue, String observationDate, EctMeasurementTypesBean mt, EctValidationsBean validation, HttpServletRequest request,ActionErrors errors ){ ! EctValidation ectValidation = new EctValidation(); ! boolean valid = true; String inputTypeDisplay = mt.getTypeDesc(); *************** *** 250,255 **** int iIsNumeric = Integer.parseInt(validation.getIsNumeric()==null?"0":validation.getIsNumeric()); ! org.apache.commons.validator.GenericValidator gValidator = new org.apache.commons.validator.GenericValidator(); ! if(!gValidator.isBlankOrNull(inputValue)){ if(iIsNumeric==1 && !ectValidation.isInRange(dMax, dMin, inputValue)){ errors.add(inputValueName, new ActionError("errors.range", inputTypeDisplay, Double.toString(dMin), Double.toString(dMax))); --- 263,268 ---- int iIsNumeric = Integer.parseInt(validation.getIsNumeric()==null?"0":validation.getIsNumeric()); ! ! if(!GenericValidator.isBlankOrNull(inputValue)){ if(iIsNumeric==1 && !ectValidation.isInRange(dMax, dMin, inputValue)){ errors.add(inputValueName, new ActionError("errors.range", inputTypeDisplay, Double.toString(dMin), Double.toString(dMax))); *************** *** 387,389 **** --- 400,406 ---- } + public String currentMem(){ + long Used = Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory(); + return ""+Used; + } } |
|
From: Ivy C. <ic...@us...> - 2004-12-10 20:29:47
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv881 Modified Files: FrmFormAction.java Log Message: updated validation Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** FrmFormAction.java 9 Dec 2004 18:43:21 -0000 1.13 --- FrmFormAction.java 10 Dec 2004 20:29:36 -0000 1.14 *************** *** 149,153 **** //Write to Measurement Table ! if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); --- 149,153 ---- //Write to Measurement Table ! if(submit.equalsIgnoreCase("exit") && !inputValue.equalsIgnoreCase("")) //System.out.println("write to measurement table: " + mt.getType()); write2MeasurementTable(demographicNo, providerNo, mt, inputValue, observationDate, comments); *************** *** 284,295 **** saveErrors(request, errors); valid = false; } ! } ! if(!ectValidation.isDate(observationDate)&&inputValue.compareTo("")!=0){ ! errors.add(inputDateName, ! new ActionError("errors.invalidDate", inputTypeDisplay)); ! saveErrors(request, errors); ! valid = false; ! } return valid; } --- 284,295 ---- saveErrors(request, errors); valid = false; + } + if(!ectValidation.isDate(observationDate)&&inputValue.compareTo("")!=0){ + errors.add(inputDateName, + new ActionError("errors.invalidDate", inputTypeDisplay)); + saveErrors(request, errors); + valid = false; } ! } return valid; } |
|
From: Ivy C. <ic...@us...> - 2004-12-10 19:10:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16192 Modified Files: oscarinit.sql Log Message: added isDate column to validation table Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** oscarinit.sql 23 Nov 2004 21:10:07 -0000 1.64 --- oscarinit.sql 10 Dec 2004 19:10:26 -0000 1.65 *************** *** 5800,5803 **** --- 5800,5804 ---- isNumeric bool, isTrue bool, + isDate bool, PRIMARY KEY(id) ) TYPE =MyISAM; |
|
From: Ivy C. <ic...@us...> - 2004-12-09 22:26:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24559 Modified Files: WLWaitingListBeanHandler.java Log Message: removed update waitinglist Index: WLWaitingListBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/bean/WLWaitingListBeanHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WLWaitingListBeanHandler.java 15 Oct 2004 22:34:48 -0000 1.4 --- WLWaitingListBeanHandler.java 9 Dec 2004 22:26:03 -0000 1.5 *************** *** 54,58 **** // WLPatientWaitingListBeanHandler.updateWaitingList(rs.getString("demographic_no")); //} ! updateWaitingList(waitingListID); String sql = "SELECT CONCAT(d.last_name, ', ', d.first_name) AS patientName, d.demographic_no, d.phone, w.position, w.note, w.onListSince FROM waitingList w, demographic d WHERE w.demographic_no = d.demographic_no AND w.listID='"+ waitingListID + "' ORDER BY w.position"; --- 54,58 ---- // WLPatientWaitingListBeanHandler.updateWaitingList(rs.getString("demographic_no")); //} ! //updateWaitingList(waitingListID); String sql = "SELECT CONCAT(d.last_name, ', ', d.first_name) AS patientName, d.demographic_no, d.phone, w.position, w.note, w.onListSince FROM waitingList w, demographic d WHERE w.demographic_no = d.demographic_no AND w.listID='"+ waitingListID + "' ORDER BY w.position"; *************** *** 134,137 **** --- 134,139 ---- } + + public Vector getWaitingListVector(){ return waitingListVector; |
|
From: Ivy C. <ic...@us...> - 2004-12-09 22:26:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/bean In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24400 Modified Files: WLPatientWaitingListBeanHandler.java Log Message: removed update waitinglist Index: WLPatientWaitingListBeanHandler.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/bean/WLPatientWaitingListBeanHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WLPatientWaitingListBeanHandler.java 15 Oct 2004 22:34:48 -0000 1.4 --- WLPatientWaitingListBeanHandler.java 9 Dec 2004 22:25:47 -0000 1.5 *************** *** 50,57 **** ResultSet rs; String sql = "SELECT * FROM waitingListName"; ! for (rs = db.GetSQL(sql); rs.next();){ ! WLWaitingListBeanHandler.updateWaitingList(rs.getString("ID")); ! } ! rs.close(); sql = "SELECT wn.name, w.position, w.note, w.onListSince FROM waitingListName wn, waitingList w WHERE wn.ID = w.ListID AND demographic_no ='"+ demographicNo + "'"; --- 50,57 ---- ResultSet rs; String sql = "SELECT * FROM waitingListName"; ! //for (rs = db.GetSQL(sql); rs.next();){ ! // WLWaitingListBeanHandler.updateWaitingList(rs.getString("ID")); ! //} ! //rs.close(); sql = "SELECT wn.name, w.position, w.note, w.onListSince FROM waitingListName wn, waitingList w WHERE wn.ID = w.ListID AND demographic_no ='"+ demographicNo + "'"; |
|
From: Ivy C. <ic...@us...> - 2004-12-09 21:17:03
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6956 Modified Files: formVTForm.jsp Log Message: added medication allergy Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** formVTForm.jsp 9 Dec 2004 19:23:33 -0000 1.16 --- formVTForm.jsp 9 Dec 2004 21:16:43 -0000 1.17 *************** *** 1325,1328 **** --- 1325,1351 ---- <tr> <th></th> + <th class="title" width="98%"> + <a href="javascript: showHideItem('medicationAllergies');">Medication Allergies>> </a> + </th> + </tr> + <tr> + <td></td> + <td><table style="display:none" cellpadding='1' cellspacing='0' id="medicationAllergies"> + <tr> + <td> + <logic:present name="allergies"> + <logic:iterate id="alg" name="allergies"> + <bean:write name="alg"/><br> + </logic:iterate> + </logic:present> + <logic:notPresent name="allergies"> + No Allergies in the current drug profile + </logic:notPresent> + </td> + </tr></table> + </td> + </tr> + <tr> + <th></th> <th class="title"> <a href="javascript: showHideItem('counselling');" >Counselling >></a> |
|
From: Jay G. <jay...@us...> - 2004-12-09 19:30:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13135 Modified Files: MsgHandleMessagesAction.java Log Message: Cleaned up code a bit and added a debugging line LOOK4ME Index: MsgHandleMessagesAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgHandleMessagesAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MsgHandleMessagesAction.java 29 Apr 2004 14:49:20 -0000 1.9 --- MsgHandleMessagesAction.java 9 Dec 2004 19:30:40 -0000 1.10 *************** *** 18,22 **** // * This software was written for the // * Department of Family Medicine ! // * McMaster Unviersity // * Hamilton // * Ontario, Canada --- 18,22 ---- // * This software was written for the // * Department of Family Medicine ! // * McMaster University // * Hamilton // * Ontario, Canada *************** *** 55,65 **** MsgSessionBean bean = (MsgSessionBean)request.getSession().getAttribute("msgSessionBean"); String providerNo = bean.getProviderNo(); ! String messageNo = ((MsgHandleMessagesForm)form).getMessageNo(); String sentbyNo ; String sentByLocation; ! String reply = ((MsgHandleMessagesForm)form).getReply(); ! String replyAll = ((MsgHandleMessagesForm)form).getReplyAll(); ! String delete = ((MsgHandleMessagesForm)form).getDelete(); ! String forward = ((MsgHandleMessagesForm)form).getForward(); oscar.oscarMessenger.data.MsgReplyMessageData replyMessageData; --- 55,66 ---- MsgSessionBean bean = (MsgSessionBean)request.getSession().getAttribute("msgSessionBean"); String providerNo = bean.getProviderNo(); ! MsgHandleMessagesForm frm = (MsgHandleMessagesForm) form; ! String messageNo = frm.getMessageNo(); String sentbyNo ; String sentByLocation; ! String reply = frm.getReply(); ! String replyAll = frm.getReplyAll(); ! String delete = frm.getDelete(); ! String forward = frm.getForward(); oscar.oscarMessenger.data.MsgReplyMessageData replyMessageData; *************** *** 94,98 **** DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); java.sql.ResultSet rs; ! String sql = new String("update messagelisttbl set status = \'del\' where provider_no = \'"+providerNo+"\' and message = \'"+messageNo+"\'"); db.RunSQL(sql); --- 95,99 ---- DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); java.sql.ResultSet rs; ! String sql = "update messagelisttbl set status = 'del' where provider_no = '"+providerNo+"' and message = '"+messageNo+"'"; db.RunSQL(sql); *************** *** 102,106 **** } ! else if(reply.compareToIgnoreCase("Reply") == 0 || (replyAll.compareToIgnoreCase("reply All") == 0)){ String[] replyval = new String[] {}; --- 103,107 ---- } ! else if(reply.equalsIgnoreCase("Reply") || (replyAll.equalsIgnoreCase("reply All") )){ String[] replyval = new String[] {}; *************** *** 132,138 **** if(replyAll.compareToIgnoreCase("reply All") == 0){ // add every one that got the message ! rs = db.GetSQL("select provider_no, remoteLocation from messagelisttbl where message = \'"+messageNo+"\'"); while (rs.next()){ ! // System.out.println("pro no "+rs.getString("provider_no")+" remo Loco "+rs.getString("remoteLocation")); vector.add(rs.getString("provider_no")); replyMessageData.add(rs.getString("provider_no"),rs.getString("remoteLocation")); --- 133,139 ---- if(replyAll.compareToIgnoreCase("reply All") == 0){ // add every one that got the message ! rs = db.GetSQL("select provider_no, remoteLocation from messagelisttbl where message = '"+messageNo+"'"); while (rs.next()){ ! System.out.println("LOOK4ME pro no "+rs.getString("provider_no")+" remo Loco "+rs.getString("remoteLocation")); vector.add(rs.getString("provider_no")); replyMessageData.add(rs.getString("provider_no"),rs.getString("remoteLocation")); |
|
From: Ivy C. <ic...@us...> - 2004-12-09 19:23:45
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11087 Modified Files: formVTForm.jsp Log Message: removed alert msg when mile server is not available, put the msg beside the heading instead Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** formVTForm.jsp 9 Dec 2004 18:39:42 -0000 1.15 --- formVTForm.jsp 9 Dec 2004 19:23:33 -0000 1.16 *************** *** 32,36 **** response.setHeader("Pragma","no-cache"); //HTTP 1.0 response.setDateHeader ("Expires", 0); //prevents caching at the proxy ! System.out.println(session.getServletContext().getRealPath("../form/VTForm.xml")); %> --- 32,36 ---- response.setHeader("Pragma","no-cache"); //HTTP 1.0 response.setDateHeader ("Expires", 0); //prevents caching at the proxy ! //String milesServerErrMsg = request.getAttribute("decisionSupportURL")==null?"(Miles server is not available)":""; %> *************** *** 198,207 **** popup.focus(); } ! else{ alert("Miles server is not avaiable!"); ! } } ! function showHideItem(id){ --- 198,207 ---- popup.focus(); } ! /*else{ alert("Miles server is not avaiable!"); ! }*/ } ! function showHideItem(id){ *************** *** 466,470 **** <tr> <td class="subject"> ! Vascular Data Entry Template </td> </tr> --- 466,470 ---- <tr> <td class="subject"> ! Vascular Data Entry Template <%=request.getAttribute("decisionSupportURL")==null?"(Miles server is not available)":""%> </td> </tr> |
