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...> - 2005-05-21 15:29:40
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4896 Modified Files: MsgDisplayMessagesBean.java Log Message: removed code for displaying demographic linked messages moved to MsgDisplayDemographicMessagesAction Index: MsgDisplayMessagesBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDisplayMessagesBean.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MsgDisplayMessagesBean.java 5 May 2005 17:39:05 -0000 1.10 --- MsgDisplayMessagesBean.java 21 May 2005 15:29:31 -0000 1.11 *************** *** 34,37 **** --- 34,38 ---- private String providerNo; private java.util.Vector messageid; + private java.util.Vector messagePosition; private java.util.Vector status; private java.util.Vector date; *************** *** 218,221 **** --- 219,226 ---- messageid = new java.util.Vector(); status = new java.util.Vector(); + messagePosition = new java.util.Vector(); + + int index = 0; + try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); *************** *** 226,232 **** while (rs.next()) { ! // System.out.println("message "+rs.getString("message")+" status "+rs.getString("status")); messageid.add( rs.getString("message") ); status.add( rs.getString("status") ); } --- 231,238 ---- while (rs.next()) { ! messagePosition.add(Integer.toString(index)); messageid.add( rs.getString("message") ); status.add( rs.getString("status") ); + index++; } *************** *** 326,330 **** String providerNo= this.getProviderNo(); java.util.Vector msg = new java.util.Vector(); ! try{ --- 332,336 ---- String providerNo= this.getProviderNo(); java.util.Vector msg = new java.util.Vector(); ! int index = 0; try{ *************** *** 343,349 **** --- 349,357 ---- dm.status = rs.getString("status"); dm.messageId = rs.getString("message"); + dm.messagePosition = Integer.toString(index); dm.thesubject = rs.getString("thesubject"); dm.thedate = rs.getString("thedate"); dm.sentby = rs.getString("sentby"); + String att = rs.getString("attachment"); if (att == null || att.equals("null") ){ *************** *** 352,358 **** dm.attach = "1"; } msg.add(dm); ! // System.out.println("message "+rs.getString("message")+" status "+rs.getString("status")); } --- 360,371 ---- dm.attach = "1"; } + + if(rs.isLast()){ + dm.isLastMsg = true; + } + msg.add(dm); ! index++; } |
|
From: Ivy C. <ic...@us...> - 2005-05-21 15:28:09
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4590 Modified Files: MsgViewMessageAction.java Log Message: forward to different location according to from location Index: MsgViewMessageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgViewMessageAction.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** MsgViewMessageAction.java 2 May 2005 01:17:18 -0000 1.9 --- MsgViewMessageAction.java 21 May 2005 15:28:00 -0000 1.10 *************** *** 31,34 **** --- 31,35 ---- import java.util.Hashtable; import java.util.Locale; + import java.util.Vector; import javax.servlet.RequestDispatcher; import javax.servlet.ServletException; *************** *** 64,73 **** System.out.println("MsgSessionBean is null"); ! String messageNo = request.getParameter("messageID"); String linkMsgDemo = request.getParameter("linkMsgDemo"); ! String demographic_no = request.getParameter("demographic_no"); int i = 1; - System.out.println("the value of linkMsgDemo is: " + linkMsgDemo); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); --- 65,84 ---- System.out.println("MsgSessionBean is null"); ! String messageNo = request.getParameter("messageID"); ! String messagePosition = request.getParameter("messagePosition"); String linkMsgDemo = request.getParameter("linkMsgDemo"); ! String demographic_no = request.getParameter("demographic_no"); ! String orderBy = request.getParameter("orderBy"); ! String msgCount = request.getParameter("msgCount"); ! String from = request.getParameter("from")==null?"oscarMessenger":request.getParameter("from"); ! ! if(msgCount==null){ ! MsgDisplayMessagesBean DisplayMessagesBeanId = new MsgDisplayMessagesBean(); ! Vector theMessages2 = DisplayMessagesBeanId.estDemographicInbox(orderBy,demographic_no); ! msgCount = Integer.toString(theMessages2.size()); ! } ! int i = 1; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); *************** *** 105,109 **** // not from query request.setAttribute("viewMessageNo",messageNo); ! request.setAttribute("providerNo",providerNo); } else{ --- 116,126 ---- // not from query request.setAttribute("viewMessageNo",messageNo); ! request.setAttribute("viewMessagePosition",messagePosition); ! request.setAttribute("providerNo",providerNo); ! if(orderBy!=null){ ! request.setAttribute("orderBy", orderBy); ! } ! ! System.out.println("viewMessagePosition: " + messagePosition + "IsLastMsg: " + request.getAttribute("viewMessageIsLastMsg")); } else{ *************** *** 119,122 **** --- 136,140 ---- MsgDemoMap msgDemoMap = new MsgDemoMap(); msgDemoMap.linkMsg2Demo(messageNo, demographic_no); + } } *************** *** 133,137 **** ParameterActionForward actionforward = new ParameterActionForward(mapping.findForward("success")); ! actionforward.addParameter("linkMsgDemo", linkMsgDemo); return actionforward; --- 151,162 ---- ParameterActionForward actionforward = new ParameterActionForward(mapping.findForward("success")); ! if(from.equalsIgnoreCase("encounter")){ ! actionforward = new ParameterActionForward(mapping.findForward("viewFromEncounter")); ! actionforward.addParameter("demographic_no", demographic_no); ! actionforward.addParameter("msgCount", msgCount); ! } ! else{ ! actionforward.addParameter("linkMsgDemo", linkMsgDemo); ! } return actionforward; |
|
From: Ivy C. <ic...@us...> - 2005-05-21 15:27:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4449 Modified Files: MsgSessionBean.java Log Message: added demographic Index: MsgSessionBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgSessionBean.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** MsgSessionBean.java 10 Mar 2004 15:57:15 -0000 1.4 --- MsgSessionBean.java 21 May 2005 15:27:24 -0000 1.5 *************** *** 34,37 **** --- 34,38 ---- private String attach = null; private String messageId = null; + private String demographic_no = null; public String getProviderNo() *************** *** 92,95 **** --- 93,107 ---- } + public String getDemographic_no (){ + if ( this.demographic_no == null){ + this.demographic_no = new String(); + } + return this.demographic_no ; + } + + public void setDemographic_no (String str){ + this.demographic_no = str; + } + public void nullMessageId(){ this.messageId = null; |
|
From: Ivy C. <ic...@us...> - 2005-05-21 15:26:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4241 Modified Files: MsgDemoMap.java Log Message: added unlinkMsg Index: MsgDemoMap.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/util/MsgDemoMap.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** MsgDemoMap.java 2 May 2005 01:18:02 -0000 1.1 --- MsgDemoMap.java 21 May 2005 15:26:16 -0000 1.2 *************** *** 32,36 **** public void linkMsg2Demo(String msgId, String demographic_no){ ! System.out.println("input msgId: " + msgId + " input demographic_no: " + demographic_no); //both msgId + demographic_no is the the primary key --- 32,36 ---- public void linkMsg2Demo(String msgId, String demographic_no){ ! //System.out.println("input msgId: " + msgId + " input demographic_no: " + demographic_no); //both msgId + demographic_no is the the primary key *************** *** 76,80 **** //sql = "select tbl.thedate, tbl.thesubject from msgDemoMap map, messagetbl tbl where demographic_no ='"+ demographic_no // + "' and tbl.messageid = map.messageID order by tbl.thedate"; ! sql = "select messageID from msgDemoMap where demographic_no='"+demographic_no+"'"; ResultSet rs = db.GetSQL(sql); --- 76,80 ---- //sql = "select tbl.thedate, tbl.thesubject from msgDemoMap map, messagetbl tbl where demographic_no ='"+ demographic_no // + "' and tbl.messageid = map.messageID order by tbl.thedate"; ! sql = "select map.messageID from msgDemoMap map, messagetbl m where m.messageid=map.messageID and demographic_no='"+demographic_no+"' order by m.thedate desc"; ResultSet rs = db.GetSQL(sql); *************** *** 89,91 **** --- 89,110 ---- return msgVector; } + + public void unlinkMsg (String demographic_no, String messageID){ + Vector msgVector= new Vector(); + try{ + System.out.println("input msgId: " + messageID + " input demographic_no: " + demographic_no); + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sql = ""; + //sql = "select tbl.thedate, tbl.thesubject from msgDemoMap map, messagetbl tbl where demographic_no ='"+ demographic_no + // + "' and tbl.messageid = map.messageID order by tbl.thedate"; + sql = "delete from msgDemoMap where demographic_no='"+demographic_no+"' and messageID='"+messageID+"'"; + + db.RunSQL(sql); + + db.CloseConn(); + } + catch (java.sql.SQLException e){ + msgVector = null; + } + } } |
|
From: Ivy C. <ic...@us...> - 2005-05-21 15:25:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4032 Modified Files: MsgMessageData.java Log Message: added constructor Index: MsgMessageData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/data/MsgMessageData.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** MsgMessageData.java 2 May 2005 02:16:06 -0000 1.12 --- MsgMessageData.java 21 May 2005 15:25:14 -0000 1.13 *************** *** 33,42 **** public class MsgMessageData { ! boolean areRemotes = false; ! boolean areLocals = false; ! java.util.ArrayList providerArrayList = null; ! String currentLocationId = null; public String getCurrentLocationId(){ if (currentLocationId == null){ --- 33,66 ---- public class MsgMessageData { ! boolean areRemotes = false; ! boolean areLocals = false; ! java.util.ArrayList providerArrayList = null; ! String currentLocationId = null; + private String messageSubject; + private String messageDate; + public MsgMessageData(){ + } + + public MsgMessageData(String msgID){ + try{ + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + String sql = ""; + //sql = "select tbl.thedate, tbl.thesubject from msgDemoMap map, messagetbl tbl where demographic_no ='"+ demographic_no + // + "' and tbl.messageid = map.messageID order by tbl.thedate"; + sql = "select thesubject, thedate from messagetbl where messageid='"+msgID+"'"; + + ResultSet rs = db.GetSQL(sql); + if(rs.next()){ + this.messageSubject = rs.getString("thesubject"); + this.messageDate = rs.getString("thedate"); + } + db.CloseConn(); + } + catch (java.sql.SQLException e){ + System.out.println("Message data not found"); + } + } public String getCurrentLocationId(){ if (currentLocationId == null){ *************** *** 560,563 **** --- 584,593 ---- } + public String getSubject(){ + return this.messageSubject; + } + public String getDate(){ + return this.messageDate; + } } |
|
From: Ivy C. <ic...@us...> - 2005-05-21 15:24:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3865 Modified Files: MsgDisplayMessage.java Log Message: added message position Index: MsgDisplayMessage.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/data/MsgDisplayMessage.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MsgDisplayMessage.java 11 Sep 2003 20:53:42 -0000 1.3 --- MsgDisplayMessage.java 21 May 2005 15:24:14 -0000 1.4 *************** *** 28,31 **** --- 28,33 ---- public class MsgDisplayMessage { public String messageId = null; + public String messagePosition = null; + public boolean isLastMsg = false; public String status = null; public String thesubject = null; |
|
From: Ivy C. <ic...@us...> - 2005-05-21 14:46:35
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29176 Added Files: ViewMessageFromEncounter.jsp DisplayDemographicMessages.jsp Log Message: initial check in --- NEW FILE: ViewMessageFromEncounter.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"); String providerview = request.getParameter("providerview")==null?"all":request.getParameter("providerview") ; boolean bFirstDisp=true; //this is the first time to display the window if (request.getParameter("bFirstDisp")!=null) bFirstDisp= (request.getParameter("bFirstDisp")).equals("true"); %> <%@ page language="java" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <link rel="stylesheet" type="text/css" href="encounterStyles.css"> <html:html locale="true"> <head> <logic:notPresent name="msgSessionBean" scope="session"> <logic:redirect href="index.jsp" /> </logic:notPresent> <logic:present name="msgSessionBean" scope="session"> <bean:define id="bean" type="oscar.oscarMessenger.pageUtil.MsgSessionBean" name="msgSessionBean" scope="session" /> <logic:equal name="bean" property="valid" value="false"> <logic:redirect href="index.jsp" /> </logic:equal> </logic:present> <% oscar.oscarMessenger.pageUtil.MsgSessionBean bean = (oscar.oscarMessenger.pageUtil.MsgSessionBean)pageContext.findAttribute("bean"); oscar.oscarMessenger.util.MsgDemoMap msgDemoMap = new oscar.oscarMessenger.util.MsgDemoMap(); java.util.Vector demoVector = msgDemoMap.getDemoVector((String) request.getAttribute("viewMessageId")); String sPrevMsg = (String) request.getAttribute("viewMessagePosition"); String sNextMsg = (String) request.getAttribute("viewMessagePosition"); int iPrevMsg = sPrevMsg==null?0:Integer.parseInt(sPrevMsg) - 1; int iNextMsg = sNextMsg==null?0:Integer.parseInt(sNextMsg) + 1; String messageId = (String) request.getAttribute("viewMessageId"); String isLastMessage = (String) request.getAttribute("viewMessageIsLastMsg"); String orderBy = (String) request.getAttribute("orderBy"); String demographic_no = bean.getDemographic_no(); String provider_no = bean.getProviderNo(); String msgCount = (String) request.getParameter("msgCount"); int iMsgCount =0; if(msgCount!=null){ iMsgCount = Integer.parseInt(msgCount); } %> <title> <bean:message key="oscarMessenger.ViewMessage.title"/> </title> <style type="text/css"> td.messengerButtonsA{ /*background-color: #6666ff;*/ /*background-color: #6699cc;*/ background-color: #003399; } td.messengerButtonsD{ /*background-color: #84c0f4;*/ background-color: #555599; } a.messengerButtons{ color: #ffffff; font-size: 9pt; text-decoration: none; } table.messButtonsA{ border-top: 2px solid #cfcfcf; border-left: 2px solid #cfcfcf; border-bottom: 2px solid #333333; border-right: 2px solid #333333; } table.messButtonsD{ border-top: 2px solid #333333; border-left: 2px solid #333333; border-bottom: 2px solid #cfcfcf; border-right: 2px solid #cfcfcf; } </style> <script type="text/javascript"> function BackToOscar() { window.close(); } function popupViewAttach(vheight,vwidth,varpage) { //open a new popup window var page = varpage; windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0"; var popup=window.open(varpage, "oscarMVA", windowprops); if (popup != null) { if (popup.opener == null) { popup.opener = self; } } } function popup(demographicNo, msgId, providerNo) { //open a new popup window var vheight = 700; var vwidth = 980; //alert("popup is called and the demographicNo is: " + demographicNo); if (demographicNo!=null){ windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0"; var page = 'WriteToEncounter.do?demographic_no='+demographicNo+'&msgId='+msgId+'&providerNo='+providerNo; var popUp=window.open(page, "<bean:message key="provider.appointmentProviderAdminDay.apptProvider"/>", windowprops); if (popUp != null) { if (popUp.opener == null) { popUp.opener = self; } popUp.focus(); } } } </script> </head> <body class="BodyStyle" vlink="#0000FF" > <!-- --> <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> <td class="MainTableTopRowLeftColumn"> <bean:message key="oscarMessenger.ViewMessage.msgMessenger"/> </td> <td class="MainTableTopRowRightColumn"> <table class="TopStatusBar"> <tr> <td > <bean:message key="oscarMessenger.ViewMessage.msgViewMessage"/> </td> <td > </td> <td style="text-align:right"> <a href="javascript:popupStart(300,400,'Help.jsp')" ><bean:message key="global.help"/></a> | <a href="javascript:popupStart(300,400,'About.jsp')" ><bean:message key="global.about"/></a> | <a href="javascript:popupStart(300,400,'License.jsp')" ><bean:message key="global.license"/></a> </td> </tr> </table> </td> </tr> <tr> <td class="MainTableLeftColumn"> </td> <td class="MainTableRightColumn"> <table> <tr> <td> <table cellspacing=3> <tr> <td> <table class=messButtonsA cellspacing=0 cellpadding=3 ><tr><td class="messengerButtonsA"> <a href="javascript:BackToOscar()" class="messengerButtons"><bean:message key="oscarMessenger.ViewMessage.btnExit"/></a> </td></tr></table> </td> <td><%if(iPrevMsg>=0){%> <table class=messButtonsA cellspacing=0 cellpadding=3 ><tr><td class="messengerButtonsA"> <a class="messengerButtons" href="<%=request.getContextPath()%>/oscarMessenger/ViewMessageByPosition.do?from=encounter&msgCount=<%=msgCount%>&orderBy=<%=orderBy%>&demographic_no=<%=request.getParameter("demographic_no")%>&messagePosition=<%=Integer.toString(iPrevMsg)%>"> << Prev Msg </a> </td></tr></table> <%}%> </td> <td><%if(iNextMsg < iMsgCount){%> <table class=messButtonsA cellspacing=0 cellpadding=3 ><tr><td class="messengerButtonsA"> <a class="messengerButtons" href="<%=request.getContextPath()%>/oscarMessenger/ViewMessageByPosition.do?from=encounter&msgCount=<%=msgCount%>&orderBy=<%=orderBy%>&demographic_no=<%=request.getParameter("demographic_no")%>&messagePosition=<%=Integer.toString(iNextMsg)%>"> Next Msg >> </a> </td></tr></table> <%}%> </td> </tr> </table> </td> </tr> <tr> <td> <table cellspacing="1" valign="top"> <tr> <td bgcolor="#DDDDFF"> <bean:message key="oscarMessenger.ViewMessage.msgFrom"/>: </td> <td bgcolor="#CCCCFF"> <%= request.getAttribute("viewMessageSentby") %> </td> </tr> <tr> <td bgcolor="#DDDDFF"> <bean:message key="oscarMessenger.ViewMessage.msgTo"/>: </td> <td bgcolor="#BFBFFF"> <%= request.getAttribute("viewMessageSentto") %> </td> </tr> <tr> <td bgcolor="#DDDDFF"> <bean:message key="oscarMessenger.ViewMessage.msgSubject"/>: </td> <td bgcolor="#BBBBFF"> <%= request.getAttribute("viewMessageSubject") %> </td> </tr> <tr> <td bgcolor="#DDDDFF"> <bean:message key="oscarMessenger.ViewMessage.msgDate"/>: </td> <td bgcolor="#B8B8FF"> <%= request.getAttribute("viewMessageDate") %> <%= request.getAttribute("viewMessageTime") %> </td> </tr> <% String attach = (String) request.getAttribute("viewMessageAttach"); String id = (String) request.getAttribute("viewMessageId"); if ( attach != null && attach.equals("1") ){ %> <tr> <td bgcolor="#DDDDFF"> <bean:message key="oscarMessenger.ViewMessage.msgAttachments"/>: </td> <td bgcolor="#B8B8FF"> <a href="javascript:popupViewAttach(700,960,'ViewAttach.do?attachId=<%=id%>')"> <bean:message key="oscarMessenger.ViewMessage.btnAttach"/> </a> </td> </tr> <% } %> <tr> <html:form action="/oscarMessenger/HandleMessages" > <td bgcolor="#EEEEFF" ></td> <td bgcolor="#EEEEFF" > <textarea name="Message" wrap="hard" readonly="true" rows="18" cols="60"><%= request.getAttribute("viewMessageMessage") %></textarea><br> <input onclick="javascript:popup(<%=demographic_no%>, <%=messageId%>, <%=provider_no%>);" class="ControlPushButton" type="button" name="writeToEncounter" value="Write To Encounter"> </td> </html:form> </tr> <tr> <td bgcolor="#EEEEFF" ></td> <td bgcolor="#EEEEFF" > </td> </tr> <tr> <td bgcolor="#EEEEFF"> </td> <td bgcolor="#EEEEFF" > <font style="font-weight:bold">Demographic(s) linked to this message</font> </td> </tr> <% if(demoVector!=null){ for(int i=0; i<demoVector.size(); i++){%> <tr> <td bgcolor="#EEEEFF"></td> <td bgcolor="#EEEEFF"> <%=demoVector.elementAt(i)%> </td> </tr> <%} } else{%> <tr> <td bgcolor="#EEEEFF"></td> <td bgcolor="#EEEEFF"> No demographic is linked to this message </td> </tr> <%}%> </table> </td> </tr> </table> </td> </tr> <tr> <td class="MainTableBottomRowLeftColumn"> </td> <td class="MainTableBottomRowRightColumn"> </td> </tr> </table> </body> </html:html> --- NEW FILE: DisplayDemographicMessages.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 */ --%> <%@ page language="java" %> <%@ 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" %> <%@ page import="oscar.oscarDemographic.data.DemographicData"%> <% //pageContext.setAttribute("pageType",""+pageType); if (request.getParameter("orderby") != null){ String orderby = request.getParameter("orderby"); String sessionOrderby = (String) session.getAttribute("orderby"); if (sessionOrderby != null && sessionOrderby.equals(orderby)){ orderby = "!"+orderby; } session.setAttribute("orderby",orderby); } String orderby = (String) session.getAttribute("orderby"); String moreMessages="false"; if (request.getParameter("moreMessages") != null){ moreMessages=request.getParameter("moreMessages"); } final int INITIAL_DISPLAY=20; %> <logic:notPresent name="msgSessionBean" scope="session"> <logic:redirect href="index.jsp" /> </logic:notPresent> <logic:present name="msgSessionBean" scope="session"> <bean:define id="bean" type="oscar.oscarMessenger.pageUtil.MsgSessionBean" name="msgSessionBean" scope="session" /> <logic:equal name="bean" property="valid" value="false"> <logic:redirect href="index.jsp" /> </logic:equal> </logic:present> <% oscar.oscarMessenger.pageUtil.MsgSessionBean bean = (oscar.oscarMessenger.pageUtil.MsgSessionBean)pageContext.findAttribute("bean"); String demographic_no = bean.getDemographic_no(); String demographic_name = ""; if ( demographic_no != null ) { DemographicData demographic_data = new DemographicData(); DemographicData.Demographic demographic = demographic_data.getDemographic(demographic_no); demographic_name = demographic.getLastName() + ", " + demographic.getFirstName(); } %> <jsp:useBean id="DisplayMessagesBeanId" scope="session" class="oscar.oscarMessenger.pageUtil.MsgDisplayMessagesBean" /> <% DisplayMessagesBeanId.setProviderNo(bean.getProviderNo()); bean.nullAttachment();%> <jsp:setProperty name="DisplayMessagesBeanId" property="*" /> <jsp:useBean id="ViewMessageForm" scope="session" class="oscar.oscarMessenger.pageUtil.MsgViewMessageForm"/> <html:html locale="true"> <head> <html:base /> <link rel="stylesheet" type="text/css" href="encounterStyles.css"> <title> <bean:message key="oscarMessenger.DisplayMessages.title"/> </title> <style type="text/css"> td.messengerButtonsA{ /*background-color: #6666ff;*/ /*background-color: #6699cc;*/ background-color: #003399; } td.messengerButtonsD{ /*background-color: #84c0f4;*/ background-color: #555599; } a.messengerButtons{ color: #ffffff; font-size: 9pt; text-decoration: none; } table.messButtonsA{ border-top: 2px solid #cfcfcf; border-left: 2px solid #cfcfcf; border-bottom: 2px solid #333333; border-right: 2px solid #333333; } table.messButtonsD{ border-top: 2px solid #333333; border-left: 2px solid #333333; border-bottom: 2px solid #cfcfcf; border-right: 2px solid #cfcfcf; } </style> <script type="text/javascript"> function BackToOscar() { window.close(); } function unlink(){ document.forms[0].submit(); } </script> </head> <body class="BodyStyle" vlink="#0000FF" onload="window.focus()"> <!-- --> <table class="MainTable" id="scrollNumber1" name="encounterTable"> <tr class="MainTableTopRow"> <td class="MainTableTopRowLeftColumn"> <bean:message key="oscarMessenger.DisplayMessages.msgMessenger"/> </td> <td class="MainTableTopRowRightColumn"> <table class="TopStatusBar"> <tr> <td > <div class="DivContentTitle">Messages related to <%=demographic_name%> </div> </td> <td > </td> <td style="text-align:right"> <a href="javascript:popupStart(300,400,'Help.jsp')" ><bean:message key="global.help"/></a> | <a href="javascript:popupStart(300,400,'About.jsp')" ><bean:message key="global.about"/></a> | <a href="javascript:popupStart(300,400,'License.jsp')" ><bean:message key="global.license"/></a> </td> </tr> </table> </td> </tr> <tr> <td class="MainTableLeftColumn"> </td> <td class="MainTableRightColumn"> <table width="100%"> <tr> <td> <table cellspacing=3 > <tr> <td > <table class=messButtonsA cellspacing=0 cellpadding=3><tr><td class="messengerButtonsA"> <a href="javascript:BackToOscar()" class="messengerButtons"><bean:message key="oscarMessenger.DisplayMessages.btnExit"/></a> </td></tr></table> </td> </tr> </table> </td> </tr> <tr> <td> <%String strutsAction = "/oscarMessenger/DisplayDemographicMessages.do?demographic_no="+demographic_no; %> <html:form action="<%=strutsAction%>" > <table border="0" width="80%" cellspacing="1"> <tr> <th bgcolor="#DDDDFF" width="75"> </th> <th align="left" bgcolor="#DDDDFF"> <% if (moreMessages.equals("true")){%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=status&moreMessages=true" > <bean:message key="oscarMessenger.DisplayMessages.msgStatus"/> </html:link> <%}else{%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=status&moreMessages=false" > <bean:message key="oscarMessenger.DisplayMessages.msgStatus"/> </html:link> <%}%> </th> <th align="left" bgcolor="#DDDDFF"> <% if (moreMessages.equals("true")){%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=from&moreMessages=true" > <bean:message key="oscarMessenger.DisplayMessages.msgFrom"/> </html:link> <%}else{%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=from&moreMessages=false" > <bean:message key="oscarMessenger.DisplayMessages.msgFrom"/> </html:link> <%}%> </th> <th align="left" bgcolor="#DDDDFF"> <% if (moreMessages.equals("true")){%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=subject&moreMessages=true" > <bean:message key="oscarMessenger.DisplayMessages.msgSubject"/> </html:link> <%}else{%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=subject&moreMessages=false" > <bean:message key="oscarMessenger.DisplayMessages.msgSubject"/> </html:link> <%}%> </th> <th align="left" bgcolor="#DDDDFF"> <% if (moreMessages.equals("true")){%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=date&moreMessages=true" > <bean:message key="oscarMessenger.DisplayMessages.msgDate"/> </html:link> <%}else{%> <html:link page="/oscarMessenger/DisplayDemographicMessages.jsp?orderby=date&moreMessages=false" > <bean:message key="oscarMessenger.DisplayMessages.msgDate"/> </html:link> <%}%> </th> </tr> <% //java.util.Vector theMessages = new java.util.Vector() ; java.util.Vector theMessages2 = new java.util.Vector() ; theMessages2 = DisplayMessagesBeanId.estDemographicInbox(orderby,demographic_no); String msgCount = Integer.toString(theMessages2.size()); %> <!-- for loop Control Initiliation variabe changed to nextMessage --> <%for (int i = 0; i < theMessages2.size() ; i++) { oscar.oscarMessenger.data.MsgDisplayMessage dm; dm = (oscar.oscarMessenger.data.MsgDisplayMessage) theMessages2.get(i); String isLastMsg = "false"; %> <tr> <td bgcolor="#EEEEFF" width="75"> <html:checkbox property="messageNo" value="<%=dm.messageId %>" /> <% String atta = dm.attach; if (atta.equals("1")){ %><img src="img/clip4.JPG"><% } %> </td> <td bgcolor="#EEEEFF"> <% String key = "oscarMessenger.DisplayMessages.msgStatus"+dm.status.substring(0,1).toUpperCase()+dm.status.substring(1); %> <bean:message key="<%= key %>"/> </td> <td bgcolor="#EEEEFF"> <%= dm.sentby %> </td> <td bgcolor="#EEEEFF"> <a href="<%=request.getContextPath()%>/oscarMessenger/ViewMessage.do?from=encounter&demographic_no=<%=demographic_no%>&msgCount=<%=msgCount%>&orderBy=<%=orderby%>&messageID=<%=dm.messageId%>&messagePosition=<%=dm.messagePosition%>"> <%=dm.thesubject%> </a> </td> <td bgcolor="#EEEEFF"> <%= dm.thedate %> </td> </tr> <%}%> </table> <table width="80%"> <tr> <td> <input type="button" value="Unlink Messages" onclick="javascript:unlink();"> </td> <% if (moreMessages.equals("false") && theMessages2.size()>=INITIAL_DISPLAY){ %> <td width="60%"></td> <td align="left"> <html:link page="/oscarMessenger/DisplayMessages.jsp?moreMessages=true" > <bean:message key="oscarMessenger.DisplayMessages.msgAllMessage"/> </html:link> </td> <%}%> </tr> </table> </html:form> </td> </tr> </table> </td> </tr> <tr> <td class="MainTableBottomRowLeftColumn"> </td> <td class="MainTableBottomRowRightColumn"> </td> </tr> </table> </body> </html:html> |
|
From: Jay G. <jay...@us...> - 2005-05-19 18:49:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20977 Modified Files: appointmentprovideradminday.jsp Log Message: Added javascript to always focus on the popups. useful when window is already open and minimized Index: appointmentprovideradminday.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** appointmentprovideradminday.jsp 10 May 2005 13:20:39 -0000 1.42 --- appointmentprovideradminday.jsp 19 May 2005 18:49:18 -0000 1.43 *************** *** 157,161 **** windowprops = "height=700,width=1000,location=no," + "scrollbars=yes,menubars=no,toolbars=no,resizable=yes,top=10,left=0"; ! window.open(page, windowname, windowprops); } --- 157,167 ---- windowprops = "height=700,width=1000,location=no," + "scrollbars=yes,menubars=no,toolbars=no,resizable=yes,top=10,left=0"; ! var popup = window.open(page, windowname, windowprops); ! if (popup != null) { ! if (popup.opener == null) { ! popup.opener = self; ! } ! popup.focus(); ! } } *************** *** 169,172 **** --- 175,179 ---- popup.opener = self; } + popup.focus(); } } |
|
From: Jay G. <jay...@us...> - 2005-05-19 18:31:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17484 Modified Files: FrmToXMLUtil.java Log Message: put check to round doubles where ints are required Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** FrmToXMLUtil.java 16 May 2005 17:24:25 -0000 1.14 --- FrmToXMLUtil.java 19 May 2005 18:30:55 -0000 1.15 *************** *** 277,281 **** if(value.equalsIgnoreCase("")) value="0"; ! Integer integer = new Integer(value); setValueMethod.invoke(obj, new Object[] {integer}); i = 2; --- 277,287 ---- if(value.equalsIgnoreCase("")) value="0"; ! Integer integer = null; ! try{ ! integer = new Integer(value); ! }catch (NumberFormatException nfe) { ! integer = new Integer(""+Math.round( Double.parseDouble(value) )); ! } ! setValueMethod.invoke(obj, new Object[] {integer}); i = 2; |
|
From: Yi Li <yi...@us...> - 2005-05-18 16:08:25
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16050/billing/CA/ON Modified Files: billingOB.jsp Log Message: update the javascript checking condition for secialist only Index: billingOB.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingOB.jsp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** billingOB.jsp 14 May 2005 22:01:33 -0000 1.17 --- billingOB.jsp 18 May 2005 15:32:23 -0000 1.18 *************** *** 155,159 **** // alert("The billing type is 'do not bill'."); // b = false; ! } else if (!document.forms[0].xml_referral.checked){ //if ref. no check for (i=0;i<document.forms[0].length;i++){ --- 155,159 ---- // alert("The billing type is 'do not bill'."); // b = false; ! } <%if(oscarVariables.getProperty("isSpecialist", "").equals("true")) {%>else if (!document.forms[0].xml_referral.checked){ //if ref. no check for (i=0;i<document.forms[0].length;i++){ *************** *** 182,186 **** } } ! } return b; } --- 182,186 ---- } } ! }<%}%> return b; } |
|
From: Yi Li <yi...@us...> - 2005-05-17 14:12:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24948/billing/CA/ON Modified Files: billingDigSearch.jsp Log Message: fix a (minor) bug caused by last change Index: billingDigSearch.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingDigSearch.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** billingDigSearch.jsp 14 May 2005 16:18:47 -0000 1.3 --- billingDigSearch.jsp 17 May 2005 14:12:25 -0000 1.4 *************** *** 102,105 **** --- 102,108 ---- <h3><font face="Arial, Helvetica, sans-serif"></font></h3> <form name="codesearch" method=POST action="billingDigSearch.jsp"> + <%if(request.getParameter("name2")!=null) {%> + <input type="hidden" name="name2" value="<%=request.getParameter("name2")%>"> + <%}%> <p><font face="Arial, Helvetica, sans-serif" size="2"><b><bean:message key="billing.billingDigSearch.msgRefine"/></b><br><bean:message key="billing.billingDigSearch.msgCodeRange"/>: <select name="coderange"> |
|
From: Jay G. <jay...@us...> - 2005-05-16 21:08:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15582 Modified Files: FrmToXMLUtil.java Log Message: added logic to switch drug cod if atc code was empty Index: FrmToXMLUtil.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** FrmToXMLUtil.java 9 Mar 2005 22:49:15 -0000 1.13 --- FrmToXMLUtil.java 16 May 2005 17:24:25 -0000 1.14 *************** *** 213,217 **** for(int i=0; i<prescribedDrugs.length; i++){ SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug(); ! drug.setDrugCod("ATC_"+prescribedDrugs[i].getAtcCode().trim()); SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName(); drugName.setSignedHow(how); --- 213,222 ---- for(int i=0; i<prescribedDrugs.length; i++){ SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug(); ! String atccode = prescribedDrugs[i].getAtcCode().trim(); ! if (atccode == null || atccode.equalsIgnoreCase("null") || atccode.equals("")){ ! drug.setDrugCod("NAM_"+prescribedDrugs[i].getDrugName()); ! }else{ ! drug.setDrugCod("ATC_"+prescribedDrugs[i].getAtcCode().trim()); ! } SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName(); drugName.setSignedHow(how); |
|
From: Jay G. <jay...@us...> - 2005-05-15 19:56:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22490 Modified Files: CMLDisplay.jsp Log Message: fixed button leading to wrong location. removed Echart button if called from Echart Index: CMLDisplay.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON/CMLDisplay.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CMLDisplay.jsp 11 May 2005 01:48:15 -0000 1.1 --- CMLDisplay.jsp 15 May 2005 19:55:47 -0000 1.2 *************** *** 198,204 **** <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> ! <% if ( request.getParameter("searchProviderNo") == null ) { // we were called from e-chart %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> ! <% } else { // we were called from lab module %> <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, '../../../oscarMDS/SearchPatient.do?labType=CML&segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(lab.pLastName+", "+lab.pFirstName )%>', 'searchPatientWindow')"> <% } %> --- 198,202 ---- <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> ! <% if ( request.getParameter("searchProviderNo") != null ) { // we were called from e-chart %> <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, '../../../oscarMDS/SearchPatient.do?labType=CML&segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(lab.pLastName+", "+lab.pFirstName )%>', 'searchPatientWindow')"> <% } %> *************** *** 568,575 **** <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> ! <% if ( request.getParameter("searchProviderNo") == null ) { // we were called from e-chart %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> ! <% } else { // we were called from lab module %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')"> <% } %> </td> --- 566,571 ---- <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> ! <% if ( request.getParameter("searchProviderNo") != null ) { // we were called from e-chart %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, '../../../oscarMDS/SearchPatient.do?labType=CML&segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(lab.pLastName+", "+lab.pFirstName )%>', 'searchPatientWindow')"> <% } %> </td> |
|
From: Yi Li <yi...@us...> - 2005-05-15 04:21:19
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21915/form Modified Files: formInvoice.jsp Log Message: update for only creator view Index: formInvoice.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formInvoice.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** formInvoice.jsp 14 May 2005 16:54:50 -0000 1.1 --- formInvoice.jsp 15 May 2005 04:21:10 -0000 1.2 *************** *** 2,6 **** /* * ! * Copyright (c) 2005- OSCAR SERVICE. */ --> --- 2,6 ---- /* * ! * Copyright (c) 2005- OSCAR. */ --> *************** *** 35,39 **** } ! if(!provNo.equals(props.getProperty("provider_no", provNo))) return; %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> --- 35,41 ---- } ! if(props!=null) { ! if(!props.getProperty("provider_no", ""+provNo).equals(""+provNo)) return; ! } %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> |
|
From: Jay G. <jay...@us...> - 2005-05-15 00:33:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15033 Modified Files: FrmFormAction.java Log Message: removed code that formatted string for echart. replaced it with "" Index: FrmFormAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmFormAction.java,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** FrmFormAction.java 31 Jan 2005 21:34:10 -0000 1.27 --- FrmFormAction.java 15 May 2005 00:33:03 -0000 1.28 *************** *** 264,275 **** System.out.println("submit value: " + submit); if(submit.equalsIgnoreCase("exit")){ ! String toEChart = "[" + timeStamp + ".: Vascular Tracker] \n\n" ! + "Subjective: \n \t" + (String) frm.getValue("subjective") + "\n" ! + "Objective: \n \t" + (String) frm.getValue("objective") + "\n" ! + "Assessment: \n \t" + (String) frm.getValue("assessment") + "\n" ! + "Plan: \n \t" + (String) frm.getValue("plan") + "\n" ! + "Diagnosis: \n \t" + (String) frm.getValue("diagnosisVT") + "\n\n" ! + "[end of Vascular Tracker] \n"; ! request.setAttribute("diagnosisVT", org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(toEChart)); return (new ActionForward("/form/formSaveAndExit.jsp")); } --- 264,276 ---- System.out.println("submit value: " + submit); if(submit.equalsIgnoreCase("exit")){ ! String toEChart = "[" + timeStamp + ".: Vascular Tracker] \n\n" ; ! // + "Subjective: \n \t" + (String) frm.getValue("subjective") + "\n" ! // + "Objective: \n \t" + (String) frm.getValue("objective") + "\n" ! // + "Assessment: \n \t" + (String) frm.getValue("assessment") + "\n" ! // + "Plan: \n \t" + (String) frm.getValue("plan") + "\n" ! // + "Diagnosis: \n \t" + (String) frm.getValue("diagnosisVT") + "\n\n" ! // + "[end of Vascular Tracker] \n"; ! //request.setAttribute("diagnosisVT", org.apache.commons.lang.StringEscapeUtils.escapeJavaScript(toEChart)); ! request.setAttribute("diagnosisVT", ""); return (new ActionForward("/form/formSaveAndExit.jsp")); } |
|
From: Jay G. <jay...@us...> - 2005-05-15 00:21:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13018 Modified Files: formSaveAndExit.jsp Log Message: fixed bug that would scroll encounter text area to the top in firefox. also focus the window on the encounter Index: formSaveAndExit.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formSaveAndExit.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** formSaveAndExit.jsp 6 Dec 2004 05:25:02 -0000 1.4 --- formSaveAndExit.jsp 15 May 2005 00:21:08 -0000 1.5 *************** *** 54,58 **** self.window.close(); opener.document.encForm.enTextarea.value = opener.document.encForm.enTextarea.value + "\n" + text; ! opener.setTimeout("document.encForm.enTextarea.scrollTop=2147483647", 0); // setTimeout is needed to allow browser to realize that text field has been updated opener.document.encForm.enTextarea.focus(); } --- 54,59 ---- self.window.close(); opener.document.encForm.enTextarea.value = opener.document.encForm.enTextarea.value + "\n" + text; ! opener.setTimeout("document.encForm.enTextarea.scrollTop=document.encForm.enTextarea.scrollHeight", 0); // setTimeout is needed to allow browser to realize that text field has been updated ! opener.focus(); opener.document.encForm.enTextarea.focus(); } |
|
From: Jay G. <jay...@us...> - 2005-05-15 00:01:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9090 Modified Files: ViewConsultationRequests.jsp Log Message: added link to consult on patients name Index: ViewConsultationRequests.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ViewConsultationRequests.jsp 9 Feb 2005 07:36:02 -0000 1.7 --- ViewConsultationRequests.jsp 15 May 2005 00:00:49 -0000 1.8 *************** *** 259,263 **** --- 259,265 ---- </td> <td class="stat<%=status%>"> + <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')"> <%=patient%> + </a> </td> <td class="stat<%=status%>"> |
|
From: Jay G. <jay...@us...> - 2005-05-15 00:00:23
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8844 Modified Files: DisplayDemographicConsultationRequests.jsp Log Message: Added link to consultation on patient name Index: DisplayDemographicConsultationRequests.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/DisplayDemographicConsultationRequests.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** DisplayDemographicConsultationRequests.jsp 19 Aug 2004 19:07:46 -0000 1.5 --- DisplayDemographicConsultationRequests.jsp 15 May 2005 00:00:14 -0000 1.6 *************** *** 215,219 **** --- 215,221 ---- </td> <td class="stat<%=status%>"> + <a href="javascript:popupOscarRx(700,960,'../../oscarEncounter/ViewRequest.do?requestId=<%=id%>')"> <%=patient%> + </a> </td> <td class="stat<%=status%>"> |
|
From: Yi Li <yi...@us...> - 2005-05-14 22:01:42
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19254/billing/CA/ON Modified Files: billingOB.jsp Log Message: update javascript for some service code checking Index: billingOB.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingOB.jsp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** billingOB.jsp 5 May 2005 02:02:15 -0000 1.16 --- billingOB.jsp 14 May 2005 22:01:33 -0000 1.17 *************** *** 155,158 **** --- 155,185 ---- // alert("The billing type is 'do not bill'."); // b = false; + } else if (!document.forms[0].xml_referral.checked){ + //if ref. no check + for (i=0;i<document.forms[0].length;i++){ + var cd = document.forms[0].elements[i]; + if(cd.value=="checked" && cd.checked) { + //alert(cd.value); + var na = cd.name; + na = na.substring(4); + //alert(na); A265A, A266A, A565A, A815A, A665A + if(na=="A265A" || na=="A266A" || na=="A565A" || na=="A815A" || na=="A665A" || na=="A001A") { + alert("You may forget to check referral box!"); + } else if(na=="C265A" || na=="C266A" || na=="C565A" || na=="C815A" || na=="C665A" ) { + alert("You may forget to check referral box!"); + } else if(na.substring(0,1)=="W" ) { + alert("You may forget to check referral box!"); + } + } else if(cd.name=="xml_other1" || cd.name=="xml_other2" || cd.name=="xml_other3" ) { + var na = cd.value; + if(na=="A265A" || na=="A266A" || na=="A565A" || na=="A815A" || na=="A665A" || na=="A001A") { + alert("You may forget to check referral box!"); + } else if(na=="C265A" || na=="C266A" || na=="C565A" || na=="C815A" || na=="C665A" ) { + alert("You may forget to check referral box!"); + } else if(na.substring(0,1)=="W" ) { + alert("You may forget to check referral box!"); + } + } + } } return b; |
|
From: Yi Li <yi...@us...> - 2005-05-14 16:55:01
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv434/form Added Files: formInvoice.jsp Log Message: temp form and should not run on real application --- NEW FILE: formInvoice.jsp --- <!-- /* * * Copyright (c) 2005- OSCAR SERVICE. */ --> <%@ page language="java"%> <%@ page import="oscar.form.*, oscar.form.data.*" %> <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %> <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" /> <% String formClass = "Invoice"; String formLink = "formInvoice.jsp"; int demoNo = Integer.parseInt(request.getParameter("demographic_no")); int formId = Integer.parseInt(request.getParameter("formId")); int provNo = Integer.parseInt((String) session.getAttribute("user")); FrmRecord rec = (new FrmRecordFactory()).factory(formClass); java.util.Properties props = rec.getFormRecord(demoNo, formId); FrmData fd = new FrmData(); //get project_home String project_home = request.getContextPath().substring(1); //get provider name String providerName = providerBean.getProperty(""+provNo, ""); String[] temp = providerName.split(","); if(temp.length>1) { providerName = temp[1] + " " + temp[0]; } if(!provNo.equals(props.getProperty("provider_no", provNo))) return; %> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html:html locale="true"> <% response.setHeader("Cache-Control","no-cache");%> <head> <title>Personal Invoice</title> <link rel="stylesheet" type="text/css" href="bcArStyle.css" > <!-- calendar stylesheet --> <link rel="stylesheet" type="text/css" media="all" href="../share/calendar/calendar.css" title="win2k-cold-1" /> <!-- main calendar program --> <script type="text/javascript" src="../share/calendar/calendar.js"></script> <!-- language for the calendar --> <script type="text/javascript" src="../share/calendar/lang/<bean:message key="global.javascript.calendar"/>"></script> <!-- the following script defines the Calendar.setup helper function, which makes adding a calendar a matter of 1 or 2 lines of code. --> <script type="text/javascript" src="../share/calendar/calendar-setup.js"></script> <html:base/> </head> <script type="text/javascript" language="Javascript"> function reset() { document.forms[0].target = ""; document.forms[0].action = "/<%=project_home%>/form/formname.do" ; } function onPrint() { var ret = checkAllDates(); if(ret==true) { if (document.all){ document.all.FrmForm.action="../form/createpdf?__title=Invoice&__cfgfile=invoice&__template=invoice"; }else{ //document.getElementById('FrmForm').action="../form/createpdf?__title=Invoice&__cfgfile=invoice&__template=invoice"; document.forms[0].action="../form/createpdf?__title=Invoice&__cfgfile=invoice&__template=invoice"; } document.forms[0].target="_blank"; } return ret; } function setfocus() { this.focus(); document.forms[0].invoiceTo.focus(); } function onSave() { document.forms[0].submit.value="save"; var ret = checkAllDates(); if(ret==true) { reset(); ret = confirm("Are you sure you want to save this form?"); } return ret; } function onExit() { if(confirm("Are you sure you wish to exit without saving your changes?")==true) { window.close(); } return(false); } function onSaveExit() { //document.forms[0].submit.value="exit"; var ret = checkAllDates(); if(ret == true) { reset(); ret = confirm("Are you sure you wish to save and close this window?"); } return ret; } function isNumber(ss){ var s = ss.value; var i; for (i = 0; i < s.length; i++){ // Check that current character is number. var c = s.charAt(i); if (c == '.') { continue; } else if (((c < "0") || (c > "9"))) { alert('Invalid '+s+' in field ' + ss.name); ss.focus(); return false; } } // All characters are numbers. return true; } function checkTypeIn(obj) { if(!isNumber(obj.value) ) { alert ("You need type in a number in the field."); } } function checkAllDates(){ var b = true; for (var i =0; i <document.forms[0].elements.length; i++) { if (document.forms[0].elements[i].name.indexOf("age_")>=0) { if(!isNumber(document.forms[0].elements[i])) b=false; } } return b; } </script> <body bgproperties="fixed" topmargin=0 leftmargin=1 rightmargin=1 onLoad="setfocus()"> <!-- @oscar.formDB Table="formInvoice" @oscar.formDB Field="ID" Type="int(10)" Null="NOT NULL" Key="PRI" Default="" Extra="auto_increment" @oscar.formDB Field="demographic_no" Type="int(10)" Null="NOT NULL" Default="'0'" @oscar.formDB Field="provider_no" Type="int(10)" Null="" Default="NULL" @oscar.formDB Field="formCreated" Type="date" Null="" Default="NULL" @oscar.formDB Field="formEdited" Type="timestamp" --> <html:form action="/form/formname"> <input type="hidden" name="demographic_no" value="<%= props.getProperty("demographic_no", "0") %>" /> <input type="hidden" name="formCreated" value="<%= props.getProperty("formCreated", "") %>" /> <input type="hidden" name="form_class" value="<%=formClass%>" /> <input type="hidden" name="form_link" value="<%=formLink%>" /> <input type="hidden" name="formId" value="<%=formId%>" /> <input type="hidden" name="provider_no" value=<%=request.getParameter("provNo")%> /> <input type="hidden" name="submit" value="exit"/> <table class="Head" class="hidePrint"> <tr> <td align="left"> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> <input type="submit" value="Print" onclick="javascript:return onPrint();return false;"/> </td> </tr> </table> <center> <table width="100%" border="0" cellspacing="0" cellpadding="0" > <tr><td> <table width="100%" border="0" cellspacing="0" cellpadding="0" > <tr> <td width="50%"></td> <td valign="top"> <table width="10%" border="0" cellspacing="0" cellpadding="0" > <tr> <td nowrap> Patient name: </td><td> <input type="text" name="patientName" size="60" maxlength="80" value="<%= props.getProperty("patientName", "") %>" @oscar.formDB /> </td> </tr><tr> <td> Address: </td><td> <input type="text" name="c_address" size="60" maxlength="80" value="<%= props.getProperty("c_address", "") %>" @oscar.formDB /> <input type="text" name="c_address2" size="60" maxlength="80" value="<%= props.getProperty("c_address2", "") %>" @oscar.formDB /> </td> </tr><tr> <td> Phone: </td><td> <input type="text" name="c_phone" size="60" maxlength="60" value="<%= props.getProperty("c_phone", "") %>" @oscar.formDB /> </td> </tr><tr> <td> DOB: </td><td> <input type="text" name="dateOfBirth" size="10" maxlength="10" value="<%= props.getProperty("dateOfBirth", "") %>" @oscar.formDB /> <input type="text" name="patientSex" size="1" maxlength="6" value="<%= props.getProperty("patientSex", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap> Health Number: </td><td> <input type="text" name="c_phn" size="20" maxlength="20" value="<%= props.getProperty("c_phn", "") %>" @oscar.formDB /> </td> </tr> </table> </td> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0" bgcolor="#99CCFF"> <tr> <th><font size="+2">INVOICE</font></th> </tr> </table> <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td nowrap width="10%">Date:</td> <td> <input type="text" name="date_invoice" id="date_invoice" readonly size="8" maxlength="10" value="<%= props.getProperty("date_invoice", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_invoice_cal"/> </td> </tr><tr> <td nowrap>To:</td> <td> <input type="text" name="invoiceTo" size="50" maxlength="80" value="<%= props.getProperty("invoiceTo", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap>Ref.:</td> <td> <input type="text" name="invoiceRef" size="50" maxlength="80" value="<%= props.getProperty("invoiceRef", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap>Service date:</td> <td> <input type="text" name="date_service" id="date_service" readonly size="8" maxlength="10" value="<%= props.getProperty("date_service", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_service_cal"/> </td> </tr><tr> <td nowrap>Service type:</td> <td> <input type="text" name="serviceType" size="50" maxlength="80" value="<%= props.getProperty("serviceType", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap>Amount billed: $</td> <td> <input type="text" name="amountBilled" onChange="checkTypeIn()" size="10" maxlength="10" value="<%= props.getProperty("amountBilled", "") %>" @oscar.formDB /> </td> </tr><tr> <td nowrap valign="top">Comments:</td> <td> <textarea name="comments" style="width:100%" cols="100" rows="12" @oscar.formDB dbType="text" > <%= props.getProperty("comments", "") %> </textarea> </td> </tr><tr> <td align="right">Dr.</td> <td> <input type="text" name="signature" size="50" maxlength="60" value="<%= props.getProperty("signature", providerName) %>" @oscar.formDB /> </td> </tr><tr> <td nowrap>Date:</td> <td> <input type="text" name="date_signature" id="date_signature" readonly size="8" maxlength="10" value="<%= props.getProperty("date_signature", "") %>" @oscar.formDB dbType="date"/> <img src="../images/cal.gif" id="date_signature_cal"/> </td> </tr> </table> </td> </tr> </table> </center> <table class="Head" class="hidePrint"> <tr> <td align="left"> <input type="submit" value="Save" onclick="javascript:return onSave();" /> <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/> <input type="submit" value="Exit" onclick="javascript:return onExit();"/> <input type="submit" value="Print" onclick="javascript:return onPrint();return false;"/> </td> </tr> </table> </html:form> <script type="text/javascript"> Calendar.setup({ inputField : "date_invoice", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_invoice_cal" }); Calendar.setup({ inputField : "date_service", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_service_cal" }); Calendar.setup({ inputField : "date_signature", ifFormat : "%Y/%m/%d", showsTime :false, button : "date_signature_cal" }); </script> </body> </html:html> |
|
From: Yi Li <yi...@us...> - 2005-05-14 16:54:02
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv329/WEB-INF/classes/src/oscar/form Added Files: FrmInvoiceRecord.java Log Message: temp form and should not run on real application --- NEW FILE: FrmInvoiceRecord.java --- /* * Copyright (c) 2005- <OSCAR TEAM> */ package oscar.form; import java.sql.ResultSet; import java.sql.SQLException; import java.util.Properties; import oscar.oscarDB.DBHandler; import oscar.util.UtilDateUtilities; public class FrmInvoiceRecord extends FrmRecord { private String _dateFormat = "yyyy/MM/dd"; public Properties getFormRecord(int demographicNo, int existingID) throws SQLException { Properties props = new Properties(); if (existingID <= 0) { DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = "SELECT demographic_no, last_name, first_name, sex, address, city, province, postal, phone, phone2, year_of_birth, month_of_birth, date_of_birth, hin, ver, hc_type FROM demographic WHERE demographic_no = " + demographicNo; ResultSet rs = db.GetSQL(sql); if (rs.next()) { java.util.Date date = UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs .getString("month_of_birth"), rs.getString("date_of_birth")); props.setProperty("demographic_no", rs.getString("demographic_no")); props.setProperty("formCreated", UtilDateUtilities.DateToString(UtilDateUtilities.Today(), _dateFormat)); props.setProperty("patientName", rs.getString("first_name") + " " + rs.getString("last_name")); props.setProperty("patientSex", rs.getString("sex")); props.setProperty("dateOfBirth", UtilDateUtilities.DateToString(date, _dateFormat)); //props.setProperty("c_surname", rs.getString("last_name")); props.setProperty("c_address", rs.getString("address")); props.setProperty("c_address2", rs.getString("city") + "," + rs.getString("province") + " " + rs.getString("postal")); //props.setProperty("c_province", rs.getString("province")); //props.setProperty("c_postal", rs.getString("postal")); props.setProperty("c_phn", rs.getString("hin") + rs.getString("ver") + "(" + rs.getString("hc_type") + ")"); props.setProperty("c_phone", rs.getString("phone") + " " + rs.getString("phone2")); props.setProperty("date_invoice", UtilDateUtilities.DateToString(UtilDateUtilities.Today(), _dateFormat)); props.setProperty("date_signature", UtilDateUtilities.DateToString(UtilDateUtilities.Today(), _dateFormat)); } rs.close(); db.CloseConn(); } else { String sql = "SELECT * FROM formInvoice WHERE demographic_no = " + demographicNo + " AND ID = " + existingID; FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); props = (frh).getFormRecord(sql); } return props; } public int saveFormRecord(Properties props) throws SQLException { String demographic_no = props.getProperty("demographic_no"); String sql = "SELECT * FROM formInvoice WHERE demographic_no=" + demographic_no + " AND ID=0"; FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).saveFormRecord(props, sql)); } public Properties getPrintRecord(int demographicNo, int existingID) throws SQLException { String sql = "SELECT * FROM formInvoice WHERE demographic_no = " + demographicNo + " AND ID = " + existingID; FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).getPrintRecord(sql)); } public String findActionValue(String submit) throws SQLException { FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).findActionValue(submit)); } public String createActionURL(String where, String action, String demoId, String formId) throws SQLException { FrmRecordHelp frh = new FrmRecordHelp(); frh.setDateFormat(_dateFormat); return ((frh).createActionURL(where, action, demoId, formId)); } } |
|
From: Yi Li <yi...@us...> - 2005-05-14 16:18:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25750/billing/CA/ON Modified Files: billingShortcutPg1.jsp billingDigSearch.jsp Log Message: update javascript for dx search Index: billingDigSearch.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingDigSearch.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** billingDigSearch.jsp 21 Feb 2004 06:31:19 -0000 1.2 --- billingDigSearch.jsp 14 May 2005 16:18:47 -0000 1.3 *************** *** 1,29 **** ! <!-- /* ! * * 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"); --- 1,29 ---- ! <!-- /* ! * * 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"); *************** *** 36,45 **** <%@ include file="dbBilling.jsp" %> <% String search = "",search2 = ""; ! search = request.getParameter("search"); if (search.compareTo("") == 0){ search = "search_diagnostic_code"; } ! ! String codeName = request.getParameter("name"); --- 36,45 ---- <%@ include file="dbBilling.jsp" %> <% String search = "",search2 = ""; ! search = request.getParameter("search"); if (search.compareTo("") == 0){ search = "search_diagnostic_code"; } ! ! String codeName = request.getParameter("name"); *************** *** 51,55 **** // if (intCode == -1){ ! %> --- 51,55 ---- // if (intCode == -1){ ! %> *************** *** 63,69 **** <!-- function CodeAttach(File2) { ! self.close(); self.opener.document.serviceform.xml_diagnostic_detail.value = File2; } --> --- 63,73 ---- <!-- function CodeAttach(File2) { ! self.close(); + <%if(request.getParameter("name2")!=null) {%> + self.opener.<%=request.getParameter("name2")%> = File2.substring(0,3); + <%} else {%> self.opener.document.serviceform.xml_diagnostic_detail.value = File2; + <%}%> } --> *************** *** 78,97 **** </tr> </table> ! <pre><% String coderange=request.getParameter("coderange"); String codedesc =request.getParameter("codedesc"); if (codedesc != null){ if (codedesc.compareTo("") == 0) { ! codeName = coderange; // search = "search_diagnostic_code"; ! } else { codeName = codedesc; // search = "search_diagnostic_text"; ! } } ! %></pre> --- 82,101 ---- </tr> </table> ! <pre><% String coderange=request.getParameter("coderange"); String codedesc =request.getParameter("codedesc"); if (codedesc != null){ if (codedesc.compareTo("") == 0) { ! codeName = coderange; // search = "search_diagnostic_code"; ! } else { codeName = codedesc; // search = "search_diagnostic_text"; ! } } ! %></pre> *************** *** 114,128 **** <form name="diagcode" id="diagcode" method="post" action="billingDigUpdate.jsp"> <table width="600" border="1"> ! ! <tr bgcolor="#CCCCFF"> <td width="12%"><b><font face="Arial, Helvetica, sans-serif" size="2"><bean:message key="billing.billingDigSearch.formCode"/></font></b></td> <td width="88%"><b><font face="Arial, Helvetica, sans-serif" size="2"><bean:message key="billing.billingDigSearch.formDescription"/></font></b></td> </tr> ! ! ! <% ResultSet rslocal = null; ResultSet rslocal2 = null; String Dcode="", DcodeDesc="", Dcode2="", DcodeDesc2=""; ! String codeName2=""; String color=""; int Count = 0; --- 118,132 ---- <form name="diagcode" id="diagcode" method="post" action="billingDigUpdate.jsp"> <table width="600" border="1"> ! ! <tr bgcolor="#CCCCFF"> <td width="12%"><b><font face="Arial, Helvetica, sans-serif" size="2"><bean:message key="billing.billingDigSearch.formCode"/></font></b></td> <td width="88%"><b><font face="Arial, Helvetica, sans-serif" size="2"><bean:message key="billing.billingDigSearch.formDescription"/></font></b></td> </tr> ! ! ! <% ResultSet rslocal = null; ResultSet rslocal2 = null; String Dcode="", DcodeDesc="", Dcode2="", DcodeDesc2=""; ! String codeName2=""; String color=""; int Count = 0; *************** *** 148,152 **** sBuffer.deleteCharAt(k); sBuffer.insert(k,""); ! textCode = sBuffer.toString(); } if (numCode.compareTo("")==0){ --- 152,156 ---- sBuffer.deleteCharAt(k); sBuffer.insert(k,""); ! textCode = sBuffer.toString(); } if (numCode.compareTo("")==0){ *************** *** 159,168 **** else{ //search text only ! codeName = "%" + textCode; search = "search_diagnostic_text"; searchType="N"; } }else{ ! if(textCode.compareTo("")==0){ // search number only --- 163,172 ---- else{ //search text only ! codeName = "%" + textCode; search = "search_diagnostic_text"; searchType="N"; } }else{ ! if(textCode.compareTo("")==0){ // search number only *************** *** 173,177 **** else{ //search both text and number only ! codeName = "%" + textCode; codeName2 = numCode; search = "search_diagnostic_text"; --- 177,181 ---- else{ //search both text and number only ! codeName = "%" + textCode; codeName2 = numCode; search = "search_diagnostic_text"; *************** *** 180,186 **** } } ! if (searchType.length() == 1) { ! // Retrieving Provider --- 184,190 ---- } } ! if (searchType.length() == 1) { ! // Retrieving Provider *************** *** 200,209 **** } %> ! ! <tr bgcolor="<%=color%>"> <td width="12%"><font face="Arial, Helvetica, sans-serif" size="2"><a href="javascript:CodeAttach('<%=Dcode%>|<%=DcodeDesc%>')"><%=Dcode%><a></font></td> <td width="88%"><font face="Arial, Helvetica, sans-serif" size="2"><input type="text" name="<%=Dcode%>" value="<%=DcodeDesc%>" size="60"><input type="submit" name="update" value="<bean:message key="billing.billingDigSearch.btnUpdate"/> <%=Dcode%>"></font></td> </tr> ! <% } } else --- 204,213 ---- } %> ! ! <tr bgcolor="<%=color%>"> <td width="12%"><font face="Arial, Helvetica, sans-serif" size="2"><a href="javascript:CodeAttach('<%=Dcode%>|<%=DcodeDesc%>')"><%=Dcode%><a></font></td> <td width="88%"><font face="Arial, Helvetica, sans-serif" size="2"><input type="text" name="<%=Dcode%>" value="<%=DcodeDesc%>" size="60"><input type="submit" name="update" value="<bean:message key="billing.billingDigSearch.btnUpdate"/> <%=Dcode%>"></font></td> </tr> ! <% } } else *************** *** 223,234 **** } %> ! ! <tr bgcolor="<%=color%>"> <td width="12%"><font face="Arial, Helvetica, sans-serif" size="2"><a href="javascript:CodeAttach('<%=Dcode%>|<%=DcodeDesc%>')"><%=Dcode%><a></font></td> <td width="88%"><font face="Arial, Helvetica, sans-serif" size="2"><input type="text" name="<%=Dcode%>" value="<%=DcodeDesc%>" size="60"><input type="submit" name="update" value="<bean:message key="billing.billingDigSearch.btnUpdate"/> <%=Dcode%>"></font></td> </tr> ! <% } ! rslocal2 = null; rslocal2 = apptMainBean.queryResults(codeName2+ "%", search2); --- 227,238 ---- } %> ! ! <tr bgcolor="<%=color%>"> <td width="12%"><font face="Arial, Helvetica, sans-serif" size="2"><a href="javascript:CodeAttach('<%=Dcode%>|<%=DcodeDesc%>')"><%=Dcode%><a></font></td> <td width="88%"><font face="Arial, Helvetica, sans-serif" size="2"><input type="text" name="<%=Dcode%>" value="<%=DcodeDesc%>" size="60"><input type="submit" name="update" value="<bean:message key="billing.billingDigSearch.btnUpdate"/> <%=Dcode%>"></font></td> </tr> ! <% } ! rslocal2 = null; rslocal2 = apptMainBean.queryResults(codeName2+ "%", search2); *************** *** 245,269 **** } %> ! ! <tr bgcolor="<%=color%>"> <td width="12%"><font face="Arial, Helvetica, sans-serif" size="2"><a href="javascript:CodeAttach('<%=Dcode2%>|<%=DcodeDesc2%>')"><%=Dcode2%><a></font></td> <td width="88%"><font face="Arial, Helvetica, sans-serif" size="2"><input type="text" name="<%=Dcode2%>" value="<%=DcodeDesc2%>" size="60"><input type="submit" name="update" value="<bean:message key="billing.billingDigSearch.btnUpdate"/> <%=Dcode2%>"></font></td> </tr> ! <% } } %> ! <% if (intCount == 0 ) { %> ! <tr bgcolor="<%=color%>"> <td colspan="2"><font face="Arial, Helvetica, sans-serif" size="2"><bean:message key="billing.billingDigSearch.msgNoMatch"/>. <%// =i%></font></td> ! </tr> <% }%> ! <% if (intCount == 1) { %> <script LANGUAGE="JavaScript"> <!-- ! CodeAttach('<%=Dcode%>|<%=DcodeDesc%>'); --> --- 249,273 ---- } %> ! ! <tr bgcolor="<%=color%>"> <td width="12%"><font face="Arial, Helvetica, sans-serif" size="2"><a href="javascript:CodeAttach('<%=Dcode2%>|<%=DcodeDesc2%>')"><%=Dcode2%><a></font></td> <td width="88%"><font face="Arial, Helvetica, sans-serif" size="2"><input type="text" name="<%=Dcode2%>" value="<%=DcodeDesc2%>" size="60"><input type="submit" name="update" value="<bean:message key="billing.billingDigSearch.btnUpdate"/> <%=Dcode2%>"></font></td> </tr> ! <% } } %> ! <% if (intCount == 0 ) { %> ! <tr bgcolor="<%=color%>"> <td colspan="2"><font face="Arial, Helvetica, sans-serif" size="2"><bean:message key="billing.billingDigSearch.msgNoMatch"/>. <%// =i%></font></td> ! </tr> <% }%> ! <% if (intCount == 1) { %> <script LANGUAGE="JavaScript"> <!-- ! CodeAttach('<%=Dcode%>|<%=DcodeDesc%>'); --> Index: billingShortcutPg1.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg1.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** billingShortcutPg1.jsp 11 Apr 2005 18:11:45 -0000 1.6 --- billingShortcutPg1.jsp 14 May 2005 16:18:47 -0000 1.7 *************** *** 459,464 **** t0 = escape("document.forms[0].elements[\'"+d+"\'].value"); t1 = escape("document.forms[0].elements[\'"+name2+"\'].value"); ! rs('att',('searchRefDoc.jsp?param='+t0+'¶m2='+t1),600,600,1); ! //awnd.focus(); } --- 459,470 ---- t0 = escape("document.forms[0].elements[\'"+d+"\'].value"); t1 = escape("document.forms[0].elements[\'"+name2+"\'].value"); ! awnd=rs('att',('searchRefDoc.jsp?param='+t0+'¶m2='+t1),600,600,1); ! awnd.focus(); ! } ! function dxScriptAttach(name2) { ! f0 = escape(document.forms[0].dxCode.value); ! f1 = escape("document.forms[0].elements[\'"+name2+"\'].value"); ! awnd=rs('att','billingDigSearch.jsp?name='+f0 + '&search=&name2='+f1,600,600,1); ! awnd.focus(); } *************** *** 572,576 **** <table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td> <a href="#" onClick="showHideLayers('Layer2','','show','Layer1','','hide'); return false;">Dx</a><br> ! <input type="text" name="dxCode" size="5" maxlength="5" value="<%=request.getParameter("dxCode")!=null?request.getParameter("dxCode"):dxCode%>"> </td><td> Cal.% mode<br> --- 578,582 ---- <table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td> <a href="#" onClick="showHideLayers('Layer2','','show','Layer1','','hide'); return false;">Dx</a><br> ! <input type="text" name="dxCode" size="5" maxlength="5" onDblClick="dxScriptAttach('dxCode')" value="<%=request.getParameter("dxCode")!=null?request.getParameter("dxCode"):dxCode%>"> </td><td> Cal.% mode<br> |
|
From: Jay G. <jay...@us...> - 2005-05-13 20:31:33
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32053 Modified Files: formVTForm.jsp Log Message: Changed to close vt messages popup when this page is closed Index: formVTForm.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v retrieving revision 1.43 retrieving revision 1.44 diff -C2 -d -r1.43 -r1.44 *** formVTForm.jsp 11 May 2005 17:23:25 -0000 1.43 --- formVTForm.jsp 13 May 2005 20:31:25 -0000 1.44 *************** *** 214,218 **** return ret; } ! function popupDecisionSupport(){ var varpage = "<%=request.getAttribute("decisionSupportURL")%>"; --- 214,218 ---- return ret; } ! var pageWindow = null; function popupDecisionSupport(){ var varpage = "<%=request.getAttribute("decisionSupportURL")%>"; *************** *** 224,227 **** --- 224,228 ---- 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); + pageWindow = popup; popup.focus(); } *************** *** 231,234 **** --- 232,244 ---- } + + function closeDSWindow(){ + if( pageWindow != null ){ + if ( !pageWindow.closed ) { + pageWindow.close(); + } + } + + } *************** *** 678,682 **** </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(680,760); popupDecisionSupport(); initialize();"> <!-- --> --- 688,692 ---- </script> ! <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(680,760); popupDecisionSupport(); initialize();" onunload="closeDSWindow();" > <!-- --> |
|
From: Jay G. <jay...@us...> - 2005-05-13 03:39:03
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8716 Modified Files: labValues.jsp Log Message: remove link to echart buttons Index: labValues.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/lab/CA/ON/labValues.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** labValues.jsp 11 May 2005 01:48:15 -0000 1.1 --- labValues.jsp 13 May 2005 03:38:54 -0000 1.2 *************** *** 431,434 **** --- 431,435 ---- <div class="Title2"> <%=""/*gResults.groupName*/%> + </div> </td> *************** *** 447,455 **** <td width="10%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formUnits"/></td> <td width="15%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formDateTimeCompleted"/></td> ! </tr> ! ! ! ! <% int linenum = 0; if (list != null){ --- 448,452 ---- <td width="10%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formUnits"/></td> <td width="15%" align="middle" valign="bottom" class="Cell"><bean:message key="oscarMDS.segmentDisplay.formDateTimeCompleted"/></td> ! </tr> <% int linenum = 0; if (list != null){ *************** *** 476,505 **** </table> ! ! ! ! ! ! <table width="100%" border="0" cellspacing="0" cellpadding="3" class="MainTableBottomRowRightColumn" bgcolor="#003399"> <tr> ! <td align="left" width="40%"> ! <% if ( request.getParameter("providerNo") != null /*&& ! mDSSegmentData.getAcknowledgedStatus(request.getParameter("providerNo")) */) { %> ! <input type="submit" value="<bean:message key="oscarMDS.segmentDisplay.btnAcknowledge"/>" onclick="getComment()"> ! <% } %> <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> ! <% if ( request.getParameter("searchProviderNo") == null ) { // we were called from e-chart %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()"> ! <% } else { // we were called from lab module %> ! <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')"> ! <% } %> ! </td> ! <td width="20%" valign="center" align="middle"> ! <span class="Field2"><i><bean:message key="oscarMDS.segmentDisplay.msgReportEnd"/></i></span> ! </td> ! <td width="40%"> ! ! </td> </tr> </table> --- 473,485 ---- </table> ! <table width="100%" border="0" cellspacing="0" cellpadding="3" class="MainTableBottomRowRightColumn" bgcolor="#003399"> <tr> ! <td align="left" > ! <input type="button" value=" <bean:message key="global.btnClose"/> " onClick="window.close()"> <input type="button" value=" <bean:message key="global.btnPrint"/> " onClick="window.print()"> ! ! </td> </tr> </table> |
|
From: Jay G. <jay...@us...> - 2005-05-12 14:48:50
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/tld In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17372 Modified Files: LabTag.java Log Message: Removed System.out.println Index: LabTag.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarLab/tld/LabTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** LabTag.java 10 May 2005 04:29:13 -0000 1.1 --- LabTag.java 12 May 2005 14:48:40 -0000 1.2 *************** *** 56,60 **** while (rs.next()) { numNewLabs = (rs.getInt(1)); ! System.out.println("Labs" +numNewLabs); } --- 56,60 ---- while (rs.next()) { numNewLabs = (rs.getInt(1)); ! //System.out.println("Labs" +numNewLabs); } |
