You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(95) |
Dec
(207) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(106) |
Feb
(69) |
Mar
(78) |
Apr
(65) |
May
(118) |
Jun
(121) |
Jul
(190) |
Aug
(95) |
Sep
(160) |
Oct
(114) |
Nov
(85) |
Dec
(79) |
| 2006 |
Jan
(103) |
Feb
(89) |
Mar
(41) |
Apr
(122) |
May
(94) |
Jun
(62) |
Jul
(491) |
Aug
(95) |
Sep
(279) |
Oct
(167) |
Nov
(156) |
Dec
(624) |
| 2007 |
Jan
(364) |
Feb
(271) |
Mar
(315) |
Apr
(378) |
May
(193) |
Jun
(235) |
Jul
(548) |
Aug
(388) |
Sep
(725) |
Oct
(369) |
Nov
(322) |
Dec
(487) |
| 2008 |
Jan
(552) |
Feb
(628) |
Mar
(817) |
Apr
(746) |
May
(1224) |
Jun
(1971) |
Jul
(1191) |
Aug
(876) |
Sep
(491) |
Oct
(267) |
Nov
(354) |
Dec
(747) |
| 2009 |
Jan
(322) |
Feb
(442) |
Mar
(573) |
Apr
(303) |
May
(401) |
Jun
(340) |
Jul
(403) |
Aug
(238) |
Sep
(267) |
Oct
(347) |
Nov
(456) |
Dec
(184) |
| 2010 |
Jan
(246) |
Feb
(432) |
Mar
(598) |
Apr
(250) |
May
(498) |
Jun
(715) |
Jul
(1282) |
Aug
(350) |
Sep
(504) |
Oct
(632) |
Nov
(870) |
Dec
(170) |
| 2011 |
Jan
(206) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(4) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2016 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jay G. <jay...@us...> - 2005-05-02 14:03:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1835 Modified Files: WriteScript.jsp Log Message: added handling for custom drugs to be updated in rewrite javascript function Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** WriteScript.jsp 30 Apr 2005 00:26:33 -0000 1.7 --- WriteScript.jsp 2 May 2005 14:03:08 -0000 1.8 *************** *** 264,269 **** origMinusName = removePRNifNeeded(origMinusName); origMinusName = removeNoSubsifNeeded(origMinusName); ! ! drugName = orig.substring(0,a.index+a[0].length); var beforeFirstDigit = ""; --- 264,274 ---- origMinusName = removePRNifNeeded(origMinusName); origMinusName = removeNoSubsifNeeded(origMinusName); ! ! if ( frm.brandName){ ! drugName = orig.substring(0,a.index+a[0].length); ! }else{ ! drugName = frm.customName.value + "\n"; ! } ! var beforeFirstDigit = ""; *************** *** 1158,1162 **** <br> <!-- peice Went Here --> ! <%RxDrugData.Interaction[] interactions = (RxDrugData.Interaction[]) bean.getInteractions(); if (interactions != null && interactions.length > 0){ System.out.println("interactions.length "+interactions.length); --- 1163,1168 ---- <br> <!-- peice Went Here --> ! ! <%RxDrugData.Interaction[] interactions = (RxDrugData.Interaction[]) bean.getInteractions(); if (interactions != null && interactions.length > 0){ System.out.println("interactions.length "+interactions.length); *************** *** 1166,1171 **** </div> <% } ! } ! %> <!--<div style="background-color:yellow;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> --- 1172,1178 ---- </div> <% } ! }else{ %> ! <div>Drug to Drug Interaction Service not available</div> ! <%}%> <!--<div style="background-color:yellow;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> |
|
From: Ivy C. <ic...@us...> - 2005-05-02 02:16:15
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/data In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13598 Modified Files: MsgMessageData.java Log Message: added getSubject(String msgId) method Index: MsgMessageData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/data/MsgMessageData.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** MsgMessageData.java 27 Apr 2004 16:34:34 -0000 1.11 --- MsgMessageData.java 2 May 2005 02:16:06 -0000 1.12 *************** *** 29,32 **** --- 29,34 ---- import oscar.oscarMessenger.util.*; + import java.sql.ResultSet; + public class MsgMessageData { *************** *** 536,539 **** --- 538,562 ---- return stringBuffer.toString(); } + + public String getSubject(String msgID){ + String subject=null; + 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 from messagetbl where messageid='"+msgID+"'"; + + ResultSet rs = db.GetSQL(sql); + if(rs.next()){ + subject = rs.getString("thesubject"); + } + db.CloseConn(); + } + catch (java.sql.SQLException e){ + subject="error: subject not found!"; + } + return subject; + } |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:25:55
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3968 Modified Files: oscarinit.sql Log Message: added msgDemoMap table Index: oscarinit.sql =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** oscarinit.sql 20 Apr 2005 20:13:47 -0000 1.76 --- oscarinit.sql 2 May 2005 01:25:40 -0000 1.77 *************** *** 5248,5251 **** --- 5248,5263 ---- ) TYPE=MyISAM; + + -- + -- Table structure for table `msgDemoMap` + -- + + CREATE TABLE msgDemoMap ( + messageID mediumint(9), + demographic_no int(10), + PRIMARY KEY (messageID, demographic_no) + ) TYPE=MyISAM; + + -- -- Table structure for table `mygroup` |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:21:04
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3099 Modified Files: ViewMessage.jsp Log Message: added link to demographic feature Index: ViewMessage.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/ViewMessage.jsp,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ViewMessage.jsp 7 Jun 2004 17:56:49 -0000 1.9 --- ViewMessage.jsp 2 May 2005 01:20:55 -0000 1.10 *************** *** 50,53 **** --- 50,55 ---- <% 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")); %> *************** *** 108,127 **** } ! 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){ ! //alert("demographicNo is not 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> --- 110,132 ---- } ! function popup(linkMsgDemo, demographicNo, msgId, providerNo) { //open a new popup window var vheight = 700; + var vwidth = 980; ! if(linkMsgDemo==null){ ! //alert("popup is called and the demographicNo is: " + demographicNo); ! if (demographicNo!=null){ ! //alert("demographicNo is not 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> *************** *** 129,133 **** </head> ! <body onload="popup(<%=request.getParameter("demographic_no")%>,<%=request.getAttribute("viewMessageId")%>,<%=request.getAttribute("providerNo")%>);" class="BodyStyle" vlink="#0000FF" > <script type="text/javascript"> //popup(<%=request.getParameter("demographic_no")%>,<%=request.getAttribute("viewMessageId")%>,<%=request.getAttribute("providerNo")%>); --- 134,138 ---- </head> ! <body onload="popup(<%=request.getParameter("linkMsgDemo")%>,<%=request.getParameter("demographic_no")%>,<%=request.getAttribute("viewMessageId")%>,<%=request.getAttribute("providerNo")%>);" class="BodyStyle" vlink="#0000FF" > <script type="text/javascript"> //popup(<%=request.getParameter("demographic_no")%>,<%=request.getAttribute("viewMessageId")%>,<%=request.getAttribute("providerNo")%>); *************** *** 277,281 **** <td bgcolor="#EEEEFF" > <bean:message key="oscarMessenger.ViewMessage.msgDemographicName"/>: ! <input type="TEXT" name="keyword" size="15" value="<%=bFirstDisp?"":request.getParameter("name").equals("")?session.getAttribute("appointmentname"):request.getParameter("name")%>"> <input class="ControlPushButton" type="submit" name="Submit" value="<bean:message key="oscarMessenger.ViewMessage.btnSearchAndWriteToEncounter"/>"> </td> --- 282,286 ---- <td bgcolor="#EEEEFF" > <bean:message key="oscarMessenger.ViewMessage.msgDemographicName"/>: ! <input type="TEXT" name="keyword" size="15" value=""> <input class="ControlPushButton" type="submit" name="Submit" value="<bean:message key="oscarMessenger.ViewMessage.btnSearchAndWriteToEncounter"/>"> </td> *************** *** 290,297 **** <input type="hidden" name="dboperation" value="add_apptrecord"> ! <input type="hidden" name="provider_no" value="115"> </form> </td> ! </tr> </table> </td> --- 295,355 ---- <input type="hidden" name="dboperation" value="add_apptrecord"> ! <input type="hidden" name="provider_no" value="<%=(String) session.getValue("user")%>"> ! </form> </td> ! </tr> ! <tr> ! <td bgcolor="#B8B8FF" ></td> ! <td bgcolor="#B8B8FF" ><font style="font-weight:bold">Link this message to ...</font></td> ! </tr> ! <tr> ! <td bgcolor="#EEEEFF" ></td> ! <form name="ADDAPPT" method="post" action="../appointment/appointmentcontrol.jsp"> ! <td bgcolor="#EEEEFF" > ! <bean:message key="oscarMessenger.ViewMessage.msgDemographicName"/>: ! <input type="TEXT" name="keyword" size="15" value=""> ! <input class="ControlPushButton" type="submit" name="Submit" value="Link"> ! </td> ! <input type="hidden" name="orderby" value="last_name" > ! <input type="hidden" name="search_mode" value="search_name" > ! <input type="hidden" name="messageId" value="<%=request.getAttribute("viewMessageNo")%>" > ! <input type="hidden" name="originalpage" value="../oscarMessenger/ViewMessage.do" > ! <input type="hidden" name="limit1" value="0" > ! <input type="hidden" name="limit2" value="5" > ! <!--input type="hidden" name="displaymode" value="TicklerSearch" --> ! <input type="hidden" name="displaymode" value="Search "> ! ! <input type="hidden" name="dboperation" value="add_apptrecord"> ! <input type="hidden" name="provider_no" value="<%=(String) session.getValue("user")%>"> ! <input type="hidden" name="linkMsgDemo" value="true"> ! </form> ! </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> |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:20:29
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2990 Modified Files: MsgCreateMessageForm.java Log Message: added demographic_no Index: MsgCreateMessageForm.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgCreateMessageForm.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MsgCreateMessageForm.java 11 Sep 2003 20:53:35 -0000 1.3 --- MsgCreateMessageForm.java 2 May 2005 01:20:20 -0000 1.4 *************** *** 36,39 **** --- 36,40 ---- private String[] provider; private String message,subject; + private String demographic_no; /** *************** *** 91,94 **** --- 92,111 ---- /** + * The get method for the demographic_no String + * @return String, this is the text of the demographic_no + */ + public String getDemographic_no(){ + return demographic_no; + } + + /** + *The set method for the message String + * @param msg String, The text of a message + */ + public void setDemographic_no(String demographic_no){ + this.demographic_no = demographic_no; + } + + /** * Used to reset everything to a null value * @param mapping |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:19:41
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2668 Modified Files: MsgDisplayMessagesBean.java Log Message: added to display messages for specified demographic Index: MsgDisplayMessagesBean.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDisplayMessagesBean.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MsgDisplayMessagesBean.java 18 Apr 2005 19:46:06 -0000 1.8 --- MsgDisplayMessagesBean.java 2 May 2005 01:19:30 -0000 1.9 *************** *** 90,94 **** return this.messageid; } ! public java.util.Vector getDelMessageid(){ getDeletedMessageIDs(); --- 90,94 ---- return this.messageid; } ! public java.util.Vector getDelMessageid(){ getDeletedMessageIDs(); *************** *** 241,245 **** String orderBy = null; if(order == null){ ! orderBy="messageId desc"; }else{ String desc = ""; --- 241,245 ---- String orderBy = null; if(order == null){ ! orderBy="m.messageid desc"; }else{ String desc = ""; *************** *** 258,262 **** orderBy = "message"; } ! orderBy += desc + ", messageId desc"; } return orderBy; --- 258,262 ---- orderBy = "message"; } ! orderBy += desc + ", m.messageid desc"; } return orderBy; *************** *** 318,321 **** --- 318,371 ---- //////////////////////////////////////////////=--------------------------------- + public java.util.Vector estDemographicInbox(){ + return estDemographicInbox(null, null); + } + //INBOX + public java.util.Vector estDemographicInbox(String orderby, String demographic_no){ + + String providerNo= this.getProviderNo(); + java.util.Vector msg = new java.util.Vector(); + + + try{ + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + java.sql.ResultSet rs; + + String sql = new String("select ml.message, ml.status, m.thesubject, m.thedate, m.attachment, m.sentby from messagelisttbl ml, messagetbl m, msgDemoMap map" + +" where map.demographic_no = '"+ demographic_no+"' and status not like \'del\' and remoteLocation = '"+getCurrentLocationId()+"' " + +" and m.messageid = map.messageID and ml.message=m.messageid order by "+getOrderBy(orderby)); + System.out.println(sql); + rs = db.GetSQL(sql); + + while (rs.next()) { + + oscar.oscarMessenger.data.MsgDisplayMessage dm = new oscar.oscarMessenger.data.MsgDisplayMessage(); + dm.status = rs.getString("status"); + dm.messageId = rs.getString("message"); + 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") ){ + dm.attach = "0"; + }else{ + dm.attach = "1"; + } + msg.add(dm); + + // System.out.println("message "+rs.getString("message")+" status "+rs.getString("status")); + + } + + rs.close(); + db.CloseConn(); + + }catch (java.sql.SQLException e){ e.printStackTrace(System.out); } + + return msg; + } + // + //////////////////////////////////////////////=--------------------------------- + //////////////////////////////////////////////////////////////////////////////// // |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:19:20
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2606 Modified Files: MsgDisplayMessagesAction.java Log Message: added to display messages for specified demographic Index: MsgDisplayMessagesAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDisplayMessagesAction.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** MsgDisplayMessagesAction.java 28 Dec 2004 18:53:51 -0000 1.7 --- MsgDisplayMessagesAction.java 2 May 2005 01:19:10 -0000 1.8 *************** *** 69,72 **** --- 69,75 ---- // System.out.println(bean.getProviderNo()); // System.out.println(bean.getUserName()); + if(request.getParameter("demographic_no")!=null){ + request.getSession().setAttribute("demographic_no", request.getParameter("demographic_no")); + } }//if else |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:19:06
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2511 Modified Files: DisplayMessages.jsp Log Message: added to display messages for specified demographic Index: DisplayMessages.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/DisplayMessages.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** DisplayMessages.jsp 18 Apr 2005 19:55:08 -0000 1.6 --- DisplayMessages.jsp 2 May 2005 01:18:58 -0000 1.7 *************** *** 30,33 **** --- 30,34 ---- <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %> + <%@ page import="oscar.oscarDemographic.data.DemographicData"%> <% *************** *** 40,47 **** --- 41,62 ---- }else if (boxType.equals("2")){ pageType = 2; + }else if (boxType.equals("3")){ + pageType = 3; }else{ pageType = 0; } //messageid + String demographic_no = request.getParameter("demographic_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(); + } + + + pageContext.setAttribute("pageType",""+pageType); *************** *** 162,165 **** --- 177,184 ---- <% delStyle = "messengerButtonsD"; break; + case 3: %> + <div class="DivContentTitle">Messages related to <%=demographic_name%> </div> + <% delStyle = "messengerButtonsD"; + break; }%> </td> *************** *** 303,306 **** --- 322,328 ---- theMessages2 = DisplayMessagesBeanId.estDeletedInbox(orderby); // System.out.println("deleted messages"); + case 3: + theMessages2 = DisplayMessagesBeanId.estDemographicInbox(orderby,demographic_no); + // System.out.println("demographic messages"); break; } //messageid |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:18:11
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2290 Added Files: MsgDemoMap.java Log Message: initial commit --- NEW FILE: MsgDemoMap.java --- /* * MsgDemoMap.java * * Created on April 24, 2005, 3:47 PM */ package oscar.oscarMessenger.util; import oscar.oscarDB.DBHandler; import java.sql.ResultSet; import java.util.Vector; /** * * @author root */ public class MsgDemoMap { /** Creates a new instance of MsgDemoMap */ public MsgDemoMap() { } /* Structure of the msgDemoMap table * +----------------+--------------+------+-----+---------+-------+ * | Field | Type | Null | Key | Default | Extra | * +----------------+--------------+------+-----+---------+-------+ * | messageID | mediumint(9) | | PRI | 0 | | * | demographic_no | int(10) | | PRI | 0 | | * +----------------+--------------+------+-----+---------+-------+ */ 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 //if the combination of both msgId and demographic_no value exsit in the table, new data will not be added try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = ""; sql = "insert into msgDemoMap values("+msgId+"," +demographic_no+ ")"; db.RunSQL(sql); db.CloseConn(); } catch (java.sql.SQLException e){ e.printStackTrace(System.out); } } public Vector getDemoVector(String msgId){ Vector demoVector= new Vector(); try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); String sql = ""; sql = "select d.last_name, d.first_name from msgDemoMap m, demographic d where messageID ='"+msgId + "' and d.demographic_no = m.demographic_no order by d.last_name, d.first_name"; ResultSet rs = db.GetSQL(sql); while(rs.next()){ demoVector.add(rs.getString("last_name")+", "+rs.getString("first_name")); } db.CloseConn(); } catch (java.sql.SQLException e){ demoVector = null; } return demoVector; } public Vector getMsgVector(String demographic_no){ Vector msgVector= new Vector(); 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 messageID from msgDemoMap where demographic_no='"+demographic_no+"'"; ResultSet rs = db.GetSQL(sql); while(rs.next()){ msgVector.add(rs.getString("messageID")); } db.CloseConn(); } catch (java.sql.SQLException e){ msgVector = null; } return msgVector; } } |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:17:28
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2141 Modified Files: MsgViewMessageAction.java Log Message: added link to demographic feature Index: MsgViewMessageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgViewMessageAction.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** MsgViewMessageAction.java 28 Dec 2004 18:38:48 -0000 1.8 --- MsgViewMessageAction.java 2 May 2005 01:17:18 -0000 1.9 *************** *** 25,28 **** --- 25,30 ---- package oscar.oscarMessenger.pageUtil; import oscar.oscarDB.DBHandler; + import oscar.oscarMessenger.util.*; + import oscar.util.*; import java.io.IOException; *************** *** 61,80 **** else System.out.println("MsgSessionBean is null"); ! ! // System.out.println(request.getAttributeNames()); ! // System.out.println(request.getQueryString()); String messageNo = request.getParameter("messageID"); int i = 1; try{ DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); java.sql.ResultSet rs; ! //rs = db.GetSQL("select count * from messagelisttbl where message = \'"+messageNo+"\' and provider_no = \'"+providerNo+"\'"); ! //int count = rs.getInt(1); ! //if (count == 0){ ! // System.out.println("test from view action \n\n\n" ); ! // return (mapping.findForward("noRights")); ! //}else{ ! // System.out.println("theres a message "); String sql = new String("Select * from messagetbl where messageid = \'"+messageNo+"\' "); rs = db.GetSQL(sql); --- 63,78 ---- else 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); java.sql.ResultSet rs; ! ! //print out message String sql = new String("Select * from messagetbl where messageid = \'"+messageNo+"\' "); rs = db.GetSQL(sql); *************** *** 116,120 **** db.RunSQL("update messagelisttbl set status = \'read\' where provider_no = \'"+providerNo+"\' and message = \'"+messageNo+"\' and status not like 'del'"); } ! //} --- 114,125 ---- db.RunSQL("update messagelisttbl set status = \'read\' where provider_no = \'"+providerNo+"\' and message = \'"+messageNo+"\' and status not like 'del'"); } ! ! if (linkMsgDemo !=null && demographic_no!=null){ ! if(linkMsgDemo.equalsIgnoreCase("true")){ ! MsgDemoMap msgDemoMap = new MsgDemoMap(); ! msgDemoMap.linkMsg2Demo(messageNo, demographic_no); ! } ! } ! //} *************** *** 122,128 **** db.CloseConn(); ! }catch (java.sql.SQLException e){ e.printStackTrace(System.out); } ! ! return (mapping.findForward("success")); } --- 127,139 ---- db.CloseConn(); ! } ! catch (java.sql.SQLException e){ ! e.printStackTrace(System.out); ! } ! ! ParameterActionForward actionforward = new ParameterActionForward(mapping.findForward("success")); ! actionforward.addParameter("linkMsgDemo", linkMsgDemo); ! ! return actionforward; } |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:17:17
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2099 Modified Files: MsgCreateMessageAction.java Log Message: linked to demographic if demographic_no is not null Index: MsgCreateMessageAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgCreateMessageAction.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** MsgCreateMessageAction.java 28 Dec 2004 19:06:47 -0000 1.6 --- MsgCreateMessageAction.java 2 May 2005 01:17:08 -0000 1.7 *************** *** 25,28 **** --- 25,29 ---- package oscar.oscarMessenger.pageUtil; import oscar.oscarDB.DBHandler; + import oscar.oscarMessenger.util.*; import java.io.IOException; *************** *** 68,72 **** String currLoco = null; String messageId = null; ! java.util.ArrayList providerListing, localProviderListing, remoteProviderListing; --- 69,74 ---- String currLoco = null; String messageId = null; ! String demographic_no = ((MsgCreateMessageForm)form).getDemographic_no(); ! java.util.ArrayList providerListing, localProviderListing, remoteProviderListing; *************** *** 108,111 **** --- 110,119 ---- } + + //link msg and demogrpahic if both messageId and demographic_no are not null + if(messageId!=null && demographic_no!=null){ + MsgDemoMap msgDemoMap = new MsgDemoMap(); + msgDemoMap.linkMsg2Demo(messageId, demographic_no); + } |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:15:26
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1658 Modified Files: CreateMessage.jsp Log Message: added link to demographic feature Index: CreateMessage.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/CreateMessage.jsp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** CreateMessage.jsp 18 May 2004 14:36:10 -0000 1.8 --- CreateMessage.jsp 2 May 2005 01:15:16 -0000 1.9 *************** *** 51,54 **** --- 51,56 ---- java.util.Vector locationVect = new java.util.Vector(); oscar.oscarMessenger.data.MsgReplyMessageData reData = new oscar.oscarMessenger.data.MsgReplyMessageData(); + boolean bFirstDisp=true; //this is the first time to display the window + if (request.getParameter("bFirstDisp")!=null) bFirstDisp= (request.getParameter("bFirstDisp")).equals("true"); %> *************** *** 421,426 **** <tr> <td> ! <html:form action="/oscarMessenger/CreateMessage" onsubmit="return validatefields()"> ! <table> <tr> <th bgcolor="#DDDDFF" width="75"> --- 423,454 ---- <tr> <td> ! <table> ! <tr> ! <th align="left" bgcolor="#DDDDFF" ><font style="font-weight:bold">Link this message to ...</font></th> ! <th bgcolor="#DDDDFF" ></th> ! </tr> ! <tr> ! <form name="ADDAPPT" method="post" action="../appointment/appointmentcontrol.jsp"> ! <td bgcolor="#EEEEFF" > ! Demographic: ! <input type="TEXT" name="keyword" size="15" value="<%=bFirstDisp?"":request.getParameter("name").equals("")?session.getAttribute("appointmentname"):request.getParameter("name")%>"> ! <input class="ControlPushButton" type="submit" name="Submit" value="Link"> ! </td> ! <input type="hidden" name="orderby" value="last_name" > ! <input type="hidden" name="search_mode" value="search_name" > ! <input type="hidden" name="originalpage" value="../oscarMessenger/CreateMessage.do" > ! <input type="hidden" name="limit1" value="0" > ! <input type="hidden" name="limit2" value="5" > ! <!--input type="hidden" name="displaymode" value="TicklerSearch" --> ! <input type="hidden" name="displaymode" value="Search "> ! ! <input type="hidden" name="dboperation" value="add_apptrecord"> ! <input type="hidden" name="provider_no" value="<%=(String) session.getValue("user")%>"> ! <input type="hidden" name="linkMsgDemo" value="true"> ! </form> ! <td bgcolor="#EEEEFF" ></td> ! </tr> ! <html:form action="/oscarMessenger/CreateMessage" onsubmit="return validatefields()"> ! <input type="hidden" name="demographic_no" value="<%=request.getParameter("demographic_no")%>" size="67"/> <tr> <th bgcolor="#DDDDFF" width="75"> *************** *** 545,550 **** </td> </tr> ! </table> ! </html:form> </td> </tr> --- 573,578 ---- </td> </tr> ! </html:form> ! </table> </td> </tr> *************** *** 556,559 **** --- 584,588 ---- </td> </tr> + </table> </td> |
|
From: Ivy C. <ic...@us...> - 2005-05-02 01:13:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1288 Modified Files: Index.jsp Log Message: added oscarMessages drop box Index: Index.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index.jsp,v retrieving revision 1.73 retrieving revision 1.74 diff -C2 -d -r1.73 -r1.74 *** Index.jsp 11 Mar 2005 16:42:03 -0000 1.73 --- Index.jsp 2 May 2005 01:13:25 -0000 1.74 *************** *** 32,36 **** <%@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" /> <% --- 32,36 ---- <%@page import="oscar.util.UtilMisc,oscar.oscarEncounter.data.*, oscar.oscarWaitingList.WaitingList, java.net.*,java.util.*"%> ! <%@page import="oscar.oscarMDS.data.MDSResultsData, oscar.oscarMessenger.util.MsgDemoMap, oscar.oscarMessenger.data.MsgMessageData"%> <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" /> <% *************** *** 65,68 **** --- 65,72 ---- Properties windowSizes = oscar.oscarEncounter.pageUtil.EctWindowSizes.getWindowSizes(provNo); + MsgDemoMap msgDemoMap = new MsgDemoMap(); + Vector msgVector = msgDemoMap.getMsgVector(demoNo); + MsgMessageData msgData = new MsgMessageData(); + EctSplitChart ectSplitChart = new EctSplitChart(); Vector splitChart = ectSplitChart.getSplitCharts(demoNo); *************** *** 527,530 **** --- 531,546 ---- } + function popUpMsg(vheight,vwidth,msgID) { + var page = "../oscarMessenger/ViewMessage.do?messageID="+msgID; + 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(page, "oscarMessenger", windowprops); + if (popup != null) { + if (popup.opener == null) { + popup.opener = self; + } + } + popup.focus(); + } + function goToSearch() { var x = window.confirm("<bean:message key="oscarEncounter.Index.goToSearchConfirm"/>"); *************** *** 785,790 **** </form> </table> ! ! <table class="LeftTable"> <form name="insertTemplateForm"> --- 801,837 ---- </form> </table> ! <table class="LeftTable"> ! <form name="msgForm"> ! <tr class="Header"> ! <td style="font-weight:bold"> ! oscarMessenger ! </td> ! </tr> ! <tr> ! <td> ! <select name="msgSelect" class="ControlSelect" onchange="javascript:popUpMsg(600,800,document.msgForm.msgSelect.options[document.msgForm.msgSelect.selectedIndex].value)"> ! <option value="null" selected>-Select Message- ! <% ! String msgId; ! String msgSubject; ! for(int j=0; j<10 && j<msgVector.size(); j++) { ! msgId = (String) msgVector.elementAt(j); ! msgSubject = msgData.getSubject(msgId); ! %> ! <option value="<%=msgId%>"><%=msgSubject %></option> ! <% }%> ! </select> ! </td> ! </td> ! </tr> ! <tr> ! <td> ! <a href=# onClick='popupPage2("<rewrite:reWrite jspPage="../oscarMessenger/DisplayMessages.do"/>?orderby=date&boxType=3&demographic_no=<%=demoNo%>&providerNo=<%=provNo%>&userName=<%=providerName%>"); return false;' > ! -All Messages-</a> ! </td> ! </tr> ! <!-- <tr><td> </td></tr> --> ! </form> ! </table> <table class="LeftTable"> <form name="insertTemplateForm"> |
|
From: Yi Li <yi...@us...> - 2005-05-01 17:44:08
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3745/WEB-INF/classes/src/oscar/form/pdfservlet Modified Files: FrmPDFServlet.java Log Message: update Index: FrmPDFServlet.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet/FrmPDFServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FrmPDFServlet.java 17 Apr 2005 05:03:53 -0000 1.9 --- FrmPDFServlet.java 1 May 2005 17:43:59 -0000 1.10 *************** *** 31,34 **** --- 31,35 ---- import java.io.ByteArrayOutputStream; + import java.io.FileInputStream; import java.io.InputStream; import java.io.PrintWriter; *************** *** 153,157 **** ByteArrayOutputStream baosPDF = new ByteArrayOutputStream(); PdfWriter writer = null; - String propPath = "/" + "oscar/form/prop/"; try { --- 154,157 ---- *************** *** 219,223 **** // create a reader for a certain document ! PdfReader reader = new PdfReader(propPath + template); // retrieve the total number of pages int n = reader.getNumberOfPages(); --- 219,231 ---- // create a reader for a certain document ! String propFilename = "../../OscarDocument/" + getProjectName() + "/form/" + template; ! PdfReader reader = null; ! try { ! reader = new PdfReader(propFilename); ! } catch (Exception dex) { ! System.out.println("change path to inside oscar from :" + propFilename); ! reader = new PdfReader("/oscar/form/prop/" + template); ! } ! // retrieve the total number of pages int n = reader.getNumberOfPages(); *************** *** 429,448 **** protected Properties getCfgProp(String cfgFilename) { Properties ret = new Properties(); ! //ClassLoader cLoader = getClass().getClassLoader(); ! //System.out.println(getServletContext().getRealPath("/WEB-INF/classes/"+ ! // cfgFilename)); ! String propPath = "/WEB-INF/classes/" + "oscar/form/prop/"; try { ! InputStream is = getServletContext().getResourceAsStream(propPath + cfgFilename); if (is != null) { ret.load(is); is.close(); } } catch (Exception e) { ! e.printStackTrace(); } return ret; } } \ No newline at end of file --- 437,474 ---- protected Properties getCfgProp(String cfgFilename) { Properties ret = new Properties(); ! String propFilename = "../../OscarDocument/" + getProjectName() + "/form/" + cfgFilename; try { ! System.out.println("1Can't find the prop file! " + propFilename); ! InputStream is = new FileInputStream(propFilename); //getServletContext().getResourceAsStream(propFilename); ! System.out.println("2Can't find the prop file! " + cfgFilename); if (is != null) { + System.out.println("3Can't find the prop file! " + cfgFilename); ret.load(is); is.close(); + } else { + System.out.println("4Can't find the prop file! " + cfgFilename); } } catch (Exception e) { ! try { ! String propPath = "/WEB-INF/classes/" + "oscar/form/prop/"; ! InputStream is = getServletContext().getResourceAsStream(propPath + cfgFilename); ! if (is != null) { ! ret.load(is); ! is.close(); ! } ! } catch (Exception ee) { ! System.out.println("Can't find the prop file! " + cfgFilename); ! } } return ret; } + private String getProjectName() { + String propPath = "" + this.getClass().getClassLoader().getResource("/"); + propPath = propPath.substring(0, propPath.lastIndexOf("/WEB-INF")); + String propFilename = propPath.substring(propPath.lastIndexOf("/") + 1); + return propFilename; + } + } \ No newline at end of file |
|
From: Yi Li <yi...@us...> - 2005-05-01 17:30:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28563/oscarEncounter/oscarConsultationRequest Modified Files: ConsultationFormPrint.jsp Log Message: update for specialist to display 'Doctor' instead of 'Family Doctor' Index: ConsultationFormPrint.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormPrint.jsp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** ConsultationFormPrint.jsp 9 Feb 2005 05:43:32 -0000 1.12 --- ConsultationFormPrint.jsp 1 May 2005 17:30:09 -0000 1.13 *************** *** 1015,1019 **** Physician ! <% } else { %> <bean:message key="oscarEncounter.oscarConsultationRequest.consultationFormPrint.msgFamilyDoc"/> --- 1015,1021 ---- Physician ! <% } else if(props.getProperty("isSpecialist", "").startsWith("true")) { %> ! Doctor ! <% } else { %> <bean:message key="oscarEncounter.oscarConsultationRequest.consultationFormPrint.msgFamilyDoc"/> |
|
From: Jay G. <jay...@us...> - 2005-04-30 00:26:43
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19329 Modified Files: WriteScript.jsp Log Message: changed value for grams from g to gm Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** WriteScript.jsp 28 Apr 2005 20:52:08 -0000 1.6 --- WriteScript.jsp 30 Apr 2005 00:26:33 -0000 1.7 *************** *** 314,318 **** //Replace units and frequency Unit //TODO Pull this from Database ! var findUnitRegExp = /(Tabs|mL|Squirts|g|mg|µg|Drops|Patch|Puffs)/; var findU = findUnitRegExp.exec(betweenFirstAndSecondDigit); if (findU){ --- 314,318 ---- //Replace units and frequency Unit //TODO Pull this from Database ! var findUnitRegExp = /(Tabs|mL|Squirts|gm|mg|µg|Drops|Patch|Puffs)/; var findU = findUnitRegExp.exec(betweenFirstAndSecondDigit); if (findU){ *************** *** 338,342 **** } ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|g|mg|µg|Drops|Patch|Puffs)/,frm.unit.options[frm.unit.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1Month|Q3Month)/,frm.frequencyCode.value); --- 338,342 ---- } ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|gm|mg|µg|Drops|Patch|Puffs)/,frm.unit.options[frm.unit.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1Month|Q3Month)/,frm.frequencyCode.value); *************** *** 949,953 **** <html:option value="mL">mL</html:option> <html:option value="sqrt">Squirts</html:option> ! <html:option value="g" >gm</html:option> <html:option value="mg">mg</html:option> <html:option value="micg">µg</html:option> --- 949,953 ---- <html:option value="mL">mL</html:option> <html:option value="sqrt">Squirts</html:option> ! <html:option value="gm" >gm</html:option> <html:option value="mg">mg</html:option> <html:option value="micg">µg</html:option> |
|
From: Jay G. <jay...@us...> - 2005-04-28 20:52:18
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11144 Modified Files: WriteScript.jsp Log Message: Added Puffs and patch to units Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** WriteScript.jsp 21 Apr 2005 15:27:25 -0000 1.5 --- WriteScript.jsp 28 Apr 2005 20:52:08 -0000 1.6 *************** *** 314,318 **** //Replace units and frequency Unit //TODO Pull this from Database ! var findUnitRegExp = /(Tabs|mL|Squirts|g|mg|µg|Drops)/; var findU = findUnitRegExp.exec(betweenFirstAndSecondDigit); if (findU){ --- 314,318 ---- //Replace units and frequency Unit //TODO Pull this from Database ! var findUnitRegExp = /(Tabs|mL|Squirts|g|mg|µg|Drops|Patch|Puffs)/; var findU = findUnitRegExp.exec(betweenFirstAndSecondDigit); if (findU){ *************** *** 338,343 **** } ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|g|mg|µg|Drops)/,frm.unit.options[frm.unit.selectedIndex].text); ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|PATCH|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1Month|Q3Month)/,frm.frequencyCode.value); --- 338,343 ---- } ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|g|mg|µg|Drops|Patch|Puffs)/,frm.unit.options[frm.unit.selectedIndex].text); ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1Month|Q3Month)/,frm.frequencyCode.value); *************** *** 953,956 **** --- 953,958 ---- <html:option value="micg">µg</html:option> <html:option value="drop">Drops</html:option> + <html:option value="patc">Patch</html:option> + <html:option value="puff">Puffs</html:option> </html:select> *************** *** 959,964 **** <html:option value="SL">SL</html:option> <html:option value="IM">IM</html:option> ! <html:option value="SC">SC</html:option> ! <html:option value="PATCH">PATCH</html:option> <html:option value="TOP">TOP.</html:option> <html:option value="INH">INH</html:option> --- 961,965 ---- <html:option value="SL">SL</html:option> <html:option value="IM">IM</html:option> ! <html:option value="SC">SC</html:option> <html:option value="TOP">TOP.</html:option> <html:option value="INH">INH</html:option> |
|
From: Yi Li <yi...@us...> - 2005-04-25 17:17:27
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15594/report Modified Files: reportonbilleddxgrp.jsp reportonbilledphcp.jsp Log Message: update Index: reportonbilleddxgrp.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilleddxgrp.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** reportonbilleddxgrp.jsp 11 Jan 2005 22:37:32 -0000 1.1 --- reportonbilleddxgrp.jsp 25 Apr 2005 17:16:59 -0000 1.2 *************** *** 1,25 **** ! <!-- /* ! * * 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 */ --> --- 1,25 ---- ! <!-- /* ! * * 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 */ --> *************** *** 56,64 **** String level1 = request.getParameter("level1"); String level2 = request.getParameter("level2"); ! String sql = "insert into dxphcpgroup(dxcode, level1, level2, description) values(" + dxcode + ", '" + ! StringEscapeUtils.escapeSql(level1.trim()) + "', '" + StringEscapeUtils.escapeSql(level2) + "', '" + StringEscapeUtils.escapeSql(description.trim()) + "')"; dbObj.updateDBRecord(sql); } } --- 56,74 ---- String level1 = request.getParameter("level1"); String level2 = request.getParameter("level2"); ! String sql = "insert into dxphcpgroup(dxcode, level1, level2, description) values(" + dxcode + ", '" + ! StringEscapeUtils.escapeSql(level1.trim()) + "', '" + StringEscapeUtils.escapeSql(level2.trim()) + "', '" + StringEscapeUtils.escapeSql(description.trim()) + "')"; dbObj.updateDBRecord(sql); + } else { + String description = request.getParameter("description"); + String level1 = request.getParameter("level1"); + String level2 = request.getParameter("level2"); + String sql = "update dxphcpgroup set level1='" + StringEscapeUtils.escapeSql(level1.trim()) + + "', level2='" + StringEscapeUtils.escapeSql(level2.trim()) + + "', description='" + StringEscapeUtils.escapeSql(description.trim()) + + "' where dxcode=" + dxcode ; + + dbObj.updateDBRecord(sql); } } *************** *** 71,75 **** <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css"> <script language="JavaScript"> ! <!-- function setfocus() { --- 81,85 ---- <link rel="stylesheet" href="../receptionist/receptionistapptstyle.css"> <script language="JavaScript"> ! <!-- function setfocus() { *************** *** 80,86 **** form.submit(); } //--> ! </script> </head> --- 90,102 ---- form.submit(); } + function fillIn(dxcode, level1, level2, description) { + document.forms[0].dxcode.value=dxcode; + document.forms[0].level1.value=level1; + document.forms[0].level2.value=level2; + document.forms[0].description.value=description; + } //--> ! </script> </head> *************** *** 128,132 **** for (int i = 0; i < vec.size(); i++) { boolean bNewCat = false; ! String curCatName = ((Properties)vec.get(i)).getProperty("level1", "").toUpperCase() + " - " + ((Properties)vec.get(i)).getProperty("level2", ""); --- 144,148 ---- for (int i = 0; i < vec.size(); i++) { boolean bNewCat = false; ! String curCatName = ((Properties)vec.get(i)).getProperty("level1", "").toUpperCase() + " - " + ((Properties)vec.get(i)).getProperty("level2", ""); *************** *** 154,158 **** %> <tr bgcolor="<%=color%>"> ! <td align="right"> <%= ((Properties)vec.get(i)).getProperty("dxcode", "") %> </td> --- 170,175 ---- %> <tr bgcolor="<%=color%>"> ! <td align="right" ! onClick="fillIn('<%= ((Properties)vec.get(i)).getProperty("dxcode", "") %>', '<%= StringEscapeUtils.escapeJavaScript(((Properties)vec.get(i)).getProperty("level1", "")) %>','<%= StringEscapeUtils.escapeJavaScript(((Properties)vec.get(i)).getProperty("level2", "")) %>','<%= StringEscapeUtils.escapeJavaScript(((Properties)vec.get(i)).getProperty("description", "")) %>')"> <%= ((Properties)vec.get(i)).getProperty("dxcode", "") %> </td> Index: reportonbilledphcp.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportonbilledphcp.jsp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** reportonbilledphcp.jsp 13 Apr 2005 22:19:37 -0000 1.5 --- reportonbilledphcp.jsp 25 Apr 2005 17:16:59 -0000 1.6 *************** *** 40,43 **** --- 40,44 ---- String providerNo = null; String providerName = ""; + int[] total = {0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0}; String[] providerNoName = {"providerNoDoctor", "providerNoResident", "providerNoNP", "providerNoSW"}; *************** *** 131,136 **** </tr> </table> - <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1"> <form name="myform" action="reportonbilledphcp.jsp" method="POST" onSubmit="return ( onSub());"> <tr bgcolor="lightsteelblue"> <td> --- 132,137 ---- </tr> </table> <form name="myform" action="reportonbilledphcp.jsp" method="POST" onSubmit="return ( onSub());"> + <table width="100%" border="0" bgcolor="ivory" cellspacing="1" cellpadding="1"> <tr bgcolor="lightsteelblue"> <td> *************** *** 151,158 **** <td nowrap> start ! <input type="text" name="startDate" id="startDate" value="" size="10" readonly> <img src="../images/cal.gif" id="startDate_cal"> end ! <input type="text" name="endDate" id="endDate" value="" size="10" readonly> <img src="../images/cal.gif" id="endDate_cal"> </td> --- 152,159 ---- <td nowrap> start ! <input type="text" name="startDate" id="startDate" value="<%=startDate!=null?startDate:""%>" size="10" readonly> <img src="../images/cal.gif" id="startDate_cal"> end ! <input type="text" name="endDate" id="endDate" value="<%=endDate!=null?endDate:""%>" size="10" readonly> <img src="../images/cal.gif" id="endDate_cal"> </td> *************** *** 224,229 **** </td> </tr> - </form> </table> <% out.flush(); --- 225,230 ---- </td> </tr> </table> + </form> <% out.flush(); *************** *** 944,948 **** <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis71_" + vServiceDesc.get(i)), 21)%></td> </tr> ! <% } %> <tr bgcolor="<%=tdTitleColor%>"> <TH colspan="2" width="10%"> --- 945,974 ---- <td><%=getNumAndCalTotal(props.getProperty(vServiceCode.get(i) + "vis71_" + vServiceDesc.get(i)), 21)%></td> </tr> ! <% ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat" + vServiceDesc.get(i)), 0); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis" + vServiceDesc.get(i)), 1); ! ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "patSexF" + vServiceDesc.get(i)), 2); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "visSexF" + vServiceDesc.get(i)), 3); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "patSexM" + vServiceDesc.get(i)), 4); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "visSexM" + vServiceDesc.get(i)), 5); ! ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat0_1" + vServiceDesc.get(i)), 6); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis0_1" + vServiceDesc.get(i)), 7); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat2_11" + vServiceDesc.get(i)), 8); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis2_11" + vServiceDesc.get(i)), 9); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat12_20" + vServiceDesc.get(i)), 10); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis12_20" + vServiceDesc.get(i)), 11); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat21_34" + vServiceDesc.get(i)), 12); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis21_34" + vServiceDesc.get(i)), 13); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat35_50" + vServiceDesc.get(i)), 14); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis35_50" + vServiceDesc.get(i)), 15); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat51_64" + vServiceDesc.get(i)), 16); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis51_64" + vServiceDesc.get(i)), 17); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat65_70" + vServiceDesc.get(i)), 18); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis65_70" + vServiceDesc.get(i)), 19); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "pat71_" + vServiceDesc.get(i)), 20); ! total=getNumAndCalTotal(total,props.getProperty(vServiceCode.get(i) + "vis71_" + vServiceDesc.get(i)), 21); ! } %> <tr bgcolor="<%=tdTitleColor%>"> <TH colspan="2" width="10%"> *************** *** 1058,1066 **** </tr> <tr align="center"> ! <td colspan="2" align="right">Total:</td> <% for(int i=0; i<total.length; i++) { %> <td><%=total[i]%></td> <% } %> </tr> </table> <% --- 1084,1098 ---- </tr> <tr align="center"> ! <td colspan="2" align="right">Sub. Total:</td> <% for(int i=0; i<total.length; i++) { %> <td><%=total[i]%></td> <% } %> </tr> + <!--tr align="center"> + <td colspan="2" align="right">Total:</td> + < %for(int i=0; i<total1.length; i++) { %> + <td>< %=total1[i]%></td> + < % } %> + </tr--> </table> <% *************** *** 1072,1083 **** </script> </body> ! <%! int[] total = {0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0}; %> <%! String getNumAndCalTotal(String str, int i) { String ret = str; int j = Integer.parseInt(str); ! total[i] += j; return ret; } %> </html:html> --- 1104,1122 ---- </script> </body> ! <%! int[] total1 = {0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0,0,0,0, 0,0}; %> <%! String getNumAndCalTotal(String str, int i) { String ret = str; int j = Integer.parseInt(str); ! total1[i] += j; return ret; } + + int[] getNumAndCalTotal(int[] sTotal, String str, int i) { + //String ret = str; + int j = Integer.parseInt(str); + sTotal[i] += j; + return sTotal; + } %> </html:html> |
|
From: Ivy C. <ic...@us...> - 2005-04-23 03:17:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8519/WEB-INF/classes/src/oscar/eform Modified Files: EfmDataOpt.java EfmPrepData.java Log Message: added provider_name field can be called by: <input type="text" name="provider_name" oscarDB=provider_name> Index: EfmDataOpt.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/EfmDataOpt.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EfmDataOpt.java 6 Apr 2005 04:26:46 -0000 1.8 --- EfmDataOpt.java 23 Apr 2005 03:17:12 -0000 1.9 *************** *** 491,493 **** --- 491,512 ---- return temp; } + + public String getProviderName(int provider_no){ + String temp = new String(); + try { + System.out.println("The Provider No. is:" + provider_no); + DBHandler db = new DBHandler(DBHandler.OSCAR_DATA); + ResultSet rs = db.GetSQL("select last_name, first_name from provider where provider_no ='"+ provider_no + "'") ; + if (rs.next()){ + temp = rs.getString("last_name") + ", " + rs.getString("first_name"); + System.out.println("the referral doctor is: " + temp); + rs.close(); + } + db.CloseConn(); + } catch(Exception ex) { + System.err.println("aq.select form_html: " + ex.getMessage()); + } + return temp; + + } } Index: EfmPrepData.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/eform/EfmPrepData.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** EfmPrepData.java 6 Apr 2005 04:27:04 -0000 1.8 --- EfmPrepData.java 23 Apr 2005 03:17:12 -0000 1.9 *************** *** 32,35 **** --- 32,36 ---- public class EfmPrepData { private String patient_name; + private String provider_name; private String today; private String label ; *************** *** 60,63 **** --- 61,65 ---- private String reminders ; + private int provider_no; private int demographic_no ; private int fid ; *************** *** 67,71 **** String [][] tagSymbol = new String[][] { {"input", ""}, {"textarea",">"}, {"checkbox",""}, {"form",""} }; ! public EfmPrepData(int demographic_no1, int fid1, String form_name1) { demographic_no = demographic_no1 ; form_name = form_name1 ; --- 69,74 ---- String [][] tagSymbol = new String[][] { {"input", ""}, {"textarea",">"}, {"checkbox",""}, {"form",""} }; ! public EfmPrepData(int provider_no1, int demographic_no1, int fid1, String form_name1) { ! provider_no = provider_no1; demographic_no = demographic_no1 ; form_name = form_name1 ; *************** *** 90,98 **** setClinicAddress(); setEChartAcc(); createDemoAcc(); ! meta = new String[] {"oscarDB=patient_name","action=","oscarDB=today","oscarDB=label","oscarDB=address","oscarDB=addressLine","oscarDB=doctor","oscarDB=DOB","oscarDB=NameAddress","oscarDB=Email","oscarDB=HIN","oscarDB=clinic_name","oscarDB=clinic_phone","oscarDB=clinic_fax","oscarDB=clinic_label","oscarDB=clinic_addressLine","oscarDB=clinic_address","oscarDB=Problem_List","oscarDB=Medication","oscarDB=Family_Social_History","oscarDB=Alert","oscarDB=Social_Family_History","oscarDB=Other_Medications_History","oscarDB=Medical_History","oscarDB=OngoingConcerns","oscarDB=Reminders", "oscarDB=age", "oscarDB=sex" }; try { ! value = new String[] {patient_name," \"savemyform.jsp?demographic_no="+demographic_no+"&fid="+fid+"&form_name="+URLEncoder.encode(form_name,"UTF-8")+"\"", today, label, address, addressLine, doctor, DOB, NameAddress, Email, HIN, clinic_name, clinic_phone, clinic_fax, clinic_label, clinic_addressLine, clinic_address, Problem_List, Medication, Family_Social_History,Alert,socialFamilyHistory ,otherMedications ,medicalHistory ,ongoingConcerns ,reminders, age, sex }; } catch(Exception ex) { System.err.println(" : " + ex.getMessage()); --- 93,102 ---- setClinicAddress(); setEChartAcc(); + setProviderName(); createDemoAcc(); ! meta = new String[] {"oscarDB=patient_name","action=","oscarDB=today","oscarDB=label","oscarDB=address","oscarDB=addressLine","oscarDB=doctor","oscarDB=DOB","oscarDB=NameAddress","oscarDB=Email","oscarDB=HIN","oscarDB=clinic_name","oscarDB=clinic_phone","oscarDB=clinic_fax","oscarDB=clinic_label","oscarDB=clinic_addressLine","oscarDB=clinic_address","oscarDB=Problem_List","oscarDB=Medication","oscarDB=Family_Social_History","oscarDB=Alert","oscarDB=Social_Family_History","oscarDB=Other_Medications_History","oscarDB=Medical_History","oscarDB=OngoingConcerns","oscarDB=Reminders", "oscarDB=age", "oscarDB=sex" , "oscarDB=provider_name"}; try { ! value = new String[] {patient_name," \"savemyform.jsp?demographic_no="+demographic_no+"&fid="+fid+"&form_name="+URLEncoder.encode(form_name,"UTF-8")+"\"", today, label, address, addressLine, doctor, DOB, NameAddress, Email, HIN, clinic_name, clinic_phone, clinic_fax, clinic_label, clinic_addressLine, clinic_address, Problem_List, Medication, Family_Social_History,Alert,socialFamilyHistory ,otherMedications ,medicalHistory ,ongoingConcerns ,reminders, age, sex, provider_name }; } catch(Exception ex) { System.err.println(" : " + ex.getMessage()); *************** *** 219,223 **** public void setAge() { age = " value=\"" + (new EfmDataOpt()).getAge(demographic_no) + "\""; ! System.out.println("age: " + age); } public void setSex() { --- 223,227 ---- public void setAge() { age = " value=\"" + (new EfmDataOpt()).getAge(demographic_no) + "\""; ! //System.out.println("age: " + age); } public void setSex() { *************** *** 237,240 **** --- 241,247 ---- } + public void setProviderName(){ + provider_name = " value=\"" + (new EfmDataOpt()).getProviderName(provider_no) + "\""; + } public String[] getMeta() { |
|
From: Ivy C. <ic...@us...> - 2005-04-23 03:17:22
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8519/eform Modified Files: makemyform.jsp Log Message: added provider_name field can be called by: <input type="text" name="provider_name" oscarDB=provider_name> Index: makemyform.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/eform/makemyform.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** makemyform.jsp 20 Jul 2004 15:00:42 -0000 1.2 --- makemyform.jsp 23 Apr 2005 03:17:11 -0000 1.3 *************** *** 3,6 **** --- 3,7 ---- int fid =new Integer(request.getParameter("fid")).intValue(); int demographic_no = new Integer(request.getParameter("demographic_no")).intValue(); + int provider_no = new Integer((String) session.getValue("user")).intValue(); String subject = request.getParameter("subject") ; String form_name = request.getParameter("form_name"); *************** *** 50,55 **** ResultSet rs = myFormBean.queryResults(fid, "search_formhtml"); if (rs.next()){ ! String theStr = rs.getString("form_html"); ! EfmPrepData prepData = new EfmPrepData(demographic_no, fid, form_name) ; out.clear(); --- 51,56 ---- ResultSet rs = myFormBean.queryResults(fid, "search_formhtml"); if (rs.next()){ ! String theStr = rs.getString("form_html"); ! EfmPrepData prepData = new EfmPrepData(provider_no, demographic_no, fid, form_name) ; out.clear(); |
|
From: Jay G. <jay...@us...> - 2005-04-21 15:27:37
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7945 Modified Files: WriteScript.jsp Log Message: changed bug with Q1month to Q1Month same with Q3month Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** WriteScript.jsp 21 Apr 2005 03:22:24 -0000 1.4 --- WriteScript.jsp 21 Apr 2005 15:27:25 -0000 1.5 *************** *** 330,334 **** } ! var findFreqRegExp = /(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1month|Q3month)/; var findFreq = findFreqRegExp.exec(betweenFirstAndSecondDigit); if (findFreq){ --- 330,334 ---- } ! var findFreqRegExp = /(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1Month|Q3Month)/; var findFreq = findFreqRegExp.exec(betweenFirstAndSecondDigit); if (findFreq){ *************** *** 340,344 **** betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|g|mg|µg|Drops)/,frm.unit.options[frm.unit.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|PATCH|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1month|Q3month)/,frm.frequencyCode.value); //Replace Days Weeks or Months --- 340,344 ---- betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|g|mg|µg|Drops)/,frm.unit.options[frm.unit.selectedIndex].text); betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|PATCH|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); ! betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1Month|Q3Month)/,frm.frequencyCode.value); //Replace Days Weeks or Months |
|
From: Jay G. <jay...@us...> - 2005-04-21 03:22:48
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26014 Modified Files: WriteScript.jsp Log Message: Redraw button now works Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WriteScript.jsp 21 Apr 2005 02:07:25 -0000 1.3 --- WriteScript.jsp 21 Apr 2005 03:22:24 -0000 1.4 *************** *** 1124,1128 **** <td valign=top> <html:textarea property="special" cols="50" rows="5" /> ! <input type=button value="RD" title="Redraw"/> <div id="warningDiv" style="display: none;"> <ul id="warningList"> --- 1124,1128 ---- <td valign=top> <html:textarea property="special" cols="50" rows="5" /> ! <input type=button value="RD" title="Redraw" onclick="javascript:first = false; writeScriptDisplay();"/> <div id="warningDiv" style="display: none;"> <ul id="warningList"> |
|
From: Jay G. <jay...@us...> - 2005-04-21 02:07:36
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20903 Modified Files: WriteScript.jsp Log Message: Big Changes. added new fields route method unit. Also changed the javascript handling of writing the free text prescription. now uses regular expression This attempts to change the old way of wipeing out free text notes when a parameter in the prescription changes Index: WriteScript.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WriteScript.jsp 1 Feb 2005 23:24:29 -0000 1.2 --- WriteScript.jsp 21 Apr 2005 02:07:25 -0000 1.3 *************** *** 68,71 **** --- 68,72 ---- var orig = null; var first = true; + var warningArray = new Array (); var calcQtyflag = true; *************** *** 136,139 **** --- 137,172 ---- } } + + function changeDuration(){ + var frm = document.forms.RxWriteScriptForm; + var freqId = frm.frequencyCode.selectedIndex; + + var dailyMin = freqMin[freqId]; + + if (dailyMin < 1){ + var minDays = 1/dailyMin; + var bySeven = minDays / 7; + var byThirty = minDays / 30; + var currentDur = frm.cmbDuration.value; + + if (Math.floor(bySeven) == bySeven ){ //no remainder + frm.durationUnit.value = 'W'; + if (currentDur < bySeven){ + frm.cmbDuration.value = bySeven; + } + //alert (bySeven); + }else { + if (Math.floor(byThirty) == byThirty ){ //no remainder + frm.durationUnit.value = 'M'; + if (currentDur < byThirty){ + frm.cmbDuration.value = byThirty; + } + //alert (byThirty); + } + } + + } + return true; + } function calcQty(){ *************** *** 171,185 **** } } ! // calculate quantity var minQty = (takeMin * dailyMin * dur); var maxQty = (takeMax * dailyMax * dur); ! if(isNaN(minQty) || isNaN(maxQty)){ alert('The value entered is invalid.'); }else{ frm.sugQtyMin.value = minQty; frm.sugQtyMax.value = maxQty; ! setQuantity(); } --- 204,221 ---- } } ! // calculate quantity var minQty = (takeMin * dailyMin * dur); var maxQty = (takeMax * dailyMax * dur); ! if(isNaN(minQty) || isNaN(maxQty)){ alert('The value entered is invalid.'); }else{ + + minQty = Math.ceil(minQty); + maxQty = Math.ceil(maxQty); frm.sugQtyMin.value = minQty; frm.sugQtyMax.value = maxQty; ! frm.quantity.value = frm.sugQtyMax.value; setQuantity(); } *************** *** 193,197 **** } ! frm.repeat.value = frm.txtRepeat.value; if (calcQtyflag){ writeScriptDisplay(); --- 229,234 ---- } ! frm.repeat.value = frm.txtRepeat.value; ! //alert ("q"+calcQtyflag); if (calcQtyflag){ writeScriptDisplay(); *************** *** 207,213 **** writeScriptDisplay(); } ! function writeScriptDisplay(){ if (first == false){ --- 244,485 ---- writeScriptDisplay(); } + function regexDebug(regRet){ + alert(regRet.input+"\n"+regRet.index+" " +(regRet.index+regRet[0].length)+" "+regRet[0]); + } + + function replaceScriptDisplay(){ + var frm = document.forms.RxWriteScriptForm; + var orig = frm.special.value; + var nameRegExp = /.*\n/i; + var a = nameRegExp.exec(orig); + + clearWarning(); + if (a){ //Find the title and shorten the string + //regexDebug(a); + origMinusName = orig.substring(a.index+a[0].length); + origMinusName = origMinusName.replace(/Q12H/,"OD"); //KLUDGE the 2 get picked up as the second digit + origMinusName = origMinusName.replace(/Q1-2H/,"OD"); //KLUDGE the 2 get picked up as the second digit + origMinusName = origMinusName.replace(/Q3-4H/,"OD"); //KLUDGE the 2 get picked up as the second digit + origMinusName = origMinusName.replace(/Q4-6H/,"OD"); //KLUDGE the 2 get picked up as the second digit + origMinusName = removePRNifNeeded(origMinusName); + origMinusName = removeNoSubsifNeeded(origMinusName); + + drugName = orig.substring(0,a.index+a[0].length); + var beforeFirstDigit = ""; + + //find first digit + var firstDigitRegExp = /[0-9][0-9,\/,-]*/; + var b = firstDigitRegExp.exec(origMinusName); + if (b) { + //regexDebug(b); + if(b.index == 0){ //frequency is at the start of the line + //TODO should I add method if it is not there?? + addWarning(frm.method.options[frm.method.selectedIndex].text+ " Not Added"); + }else{ // frequency is not at the start of the line words come before + var beforeFirstDigit = origMinusName.substring(0,b.index); + var findMethodRegExp = /(Take|Apply|Rub well in)/; + var c = findMethodRegExp.exec(beforeFirstDigit); + if (c){ + //regexDebug(c); + beforeFirstDigit = beforeFirstDigit.replace(/(Take|Apply|Rub well in)/,frm.method.options[frm.method.selectedIndex].text); + }else{ + addWarning("Could not replace word for "+frm.method.options[frm.method.selectedIndex].text); + } + } + var firstDigitStringLen = b.index+b[0].length; + + if(origMinusName.substring(b.index+b[0].length,b.index+b[0].length+1) == '.'){ //Another Kludge, \. does not seem to work correctly t get values 0.5 + firstDigitStringLen++; + var afterDot = /[0-9][0-9]*/; + var afterDotResult = afterDot.exec(origMinusName.substring(firstDigitStringLen)); + if (afterDotResult){ + + //regexDebug(afterDotResult); + if(afterDotResult.index == 0){ + firstDigitStringLen = firstDigitStringLen + afterDotResult.index+afterDotResult[0].length; + } + } + } + + var afterFirstDigit = origMinusName.substring(firstDigitStringLen); + + //Find Next Digit + var secondDigitRegExp = /[^Q,-,0-9][0-9][0-9,\/,-]*/; //This will ignore digits starting with Q and - need for frequencies like Q3-4H + var d = secondDigitRegExp.exec(afterFirstDigit); + if(d){ + //regexDebug(d); + var betweenFirstAndSecondDigit = afterFirstDigit.substring(0,d.index+1); + var afterSecondDigit = afterFirstDigit.substring(d.index+d[0].length); + + //Replace units and frequency Unit //TODO Pull this from Database + + var findUnitRegExp = /(Tabs|mL|Squirts|g|mg|µg|Drops)/; + var findU = findUnitRegExp.exec(betweenFirstAndSecondDigit); + if (findU){ + //todo make it like !findU + }else{ + addWarning("Could not find place to put "+frm.unit.options[frm.unit.selectedIndex].text); + } + + var findUnitRegExp = /(PO|SL|IM|SC|PATCH|TOP.|INH|SUPP)/; + var findU = findUnitRegExp.exec(betweenFirstAndSecondDigit); + if (findU){ + //todo make it like !findU + }else{ + addWarning("Could not find place to put "+frm.route.options[frm.route.selectedIndex].text); + } + + var findFreqRegExp = /(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1month|Q3month)/; + var findFreq = findFreqRegExp.exec(betweenFirstAndSecondDigit); + if (findFreq){ + //todo make it like !findFreq + }else{ + addWarning("Could not find place to put "+frm.frequencyCode.value); + } + + betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(Tabs|mL|Squirts|g|mg|µg|Drops)/,frm.unit.options[frm.unit.selectedIndex].text); + betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(PO|SL|IM|SC|PATCH|TOP.|INH|SUPP)/,frm.route.options[frm.route.selectedIndex].text); + betweenFirstAndSecondDigit = betweenFirstAndSecondDigit.replace(/(OD|BID|TID|QID|Q1H|Q2H|Q1-2H|Q3-4H|Q4H|Q4-6H|Q6H|Q8H|Q12H|QAM|QPM|QHS|Q1Week|Q2Week|Q1month|Q3month)/,frm.frequencyCode.value); + + //Replace Days Weeks or Months + + afterSecondDigit = afterSecondDigit.replace(/(Days|Weeks|Months)/,getDurationUnit()); + + var findDurationRegExp = /(Days|Weeks|Months)/; + var e = findDurationRegExp.exec(afterSecondDigit); + if (e){ + //todo make it like !e + }else{ + addWarning("Could not find place to put "+getDurationUnit()); + } + + //Replace Qty + var f = firstDigitRegExp.exec(afterSecondDigit); ! if(f){ ! //regexDebug(f) ! var betweenSecondDigitandQuantity = afterSecondDigit.substring(0,f.index); ! var afterQuantity = afterSecondDigit.substring(f.index+f[0].length); + var g = firstDigitRegExp.exec(afterQuantity); + if(g){ + //regexDebug(g); + var betweenQtyandRepeat = afterQuantity.substring(0,g.index); + var afterRepeat = afterQuantity.substring(g.index+g[0].length); + var b4final =drugName+beforeFirstDigit+getTakeValue()+betweenFirstAndSecondDigit+getDurationValue()+betweenSecondDigitandQuantity+frm.quantity.value+betweenQtyandRepeat+frm.txtRepeat.value+afterRepeat; + var newStr = drugName+beforeFirstDigit+getTakeValue()+betweenFirstAndSecondDigit+getPRN(b4final)+getDurationValue()+betweenSecondDigitandQuantity+frm.quantity.value+betweenQtyandRepeat+frm.txtRepeat.value+getNoSubs(b4final)+afterRepeat; + + frm.special.value = newStr; + //alert(newStr); + }else{ + addWarning("Could not find value to replace Repeat Value"); + } + }else{ + addWarning("Could not find value to replace Qty Value"); + } + }else{ + addWarning("Could not find value to replace Duration Value"); + } + }else{ + addWarning("Could not find value frequency value"); + } + }else{ + addWarning("Name of Drug could not be found"); + } + fillWarnings(); + } + + function removePRNifNeeded(str){ + var frm = document.forms.RxWriteScriptForm; + var retval = str; + if (frm.prn.checked == false){ + retval = str.replace(/PRN/,""); + } + return retval; + } + + function removeNoSubsifNeeded(str){ + var frm = document.forms.RxWriteScriptForm; + var retval = str; + if (frm.nosubs.checked == false){ + retval = str.replace(/No Subs/,""); + } + return retval; + } + function getPRN(str){ + var retval = ""; + var frm = document.forms.RxWriteScriptForm; + if (frm.prn.checked){//is PRN CHECKED? + var prnFindRegExp = /PRN/; + var p = prnFindRegExp.exec(str); + if(p){ + //PRN found leave it + }else{ + retval = "PRN "; + } + } + return retval; + } + + function getNoSubs(str){ + var retval = ""; + var frm = document.forms.RxWriteScriptForm; + if (frm.nosubs.checked){//is PRN CHECKED? + var noSubFindRegExp = /No Subs/; + var p = noSubFindRegExp.exec(str); + if(p){ + //No Subs found leave it + }else{ + retval = " No Subs "; + } + } + return retval; + } + + function getTakeValue(){ + var frm = document.forms.RxWriteScriptForm; + var retval = ""; + if(frm.take.value != 'Other'){ + retval = frm.take.value; + }else{ + retval = frm.takeOther.value; + } + return retval; + } + + function getDurationValue(){ + var frm = document.forms.RxWriteScriptForm; + var retval = ""; + if(frm.cmbDuration.value == 'Other'){ + retval = frm.txtDuration.value; + }else{ + retval = frm.cmbDuration.value; + } + return retval; + } + + function getDurationUnit(){ + var frm = document.forms.RxWriteScriptForm; + var retval = ""; + switch(frm.durationUnit.value){ + case 'D':{ + retval = "Days"; + break; + } + case 'W':{ + retval = "Weeks"; + break; + } + case 'M':{ + retval = "Months"; + break; + } + } + return retval; + } + + function writeScriptDisplay(){ + // alert ("f"+first); + if (first == false){ *************** *** 224,227 **** --- 496,501 ---- } + preStr = preStr + frm2.method.options[frm2.method.selectedIndex].text +" "; + if(frm2.take.value != 'Other'){ preStr = preStr+frm2.take.value; *************** *** 229,240 **** preStr = preStr+frm2.takeOther.value; } preStr = preStr +" "+ frm2.frequencyCode.value+" "; ! if (frm2.prn.checked){ ! preStr = preStr +"PRN"; } ///////////////////// ! preStr = preStr + " "; if(frm2.cmbDuration.value == 'Other'){ preStr = preStr + frm2.txtDuration.value; --- 503,519 ---- preStr = preStr+frm2.takeOther.value; } + + preStr = preStr +" "+ frm2.unit.options[frm2.unit.selectedIndex].text; + + preStr = preStr +" "+ frm2.route.options[frm2.route.selectedIndex].text; + preStr = preStr +" "+ frm2.frequencyCode.value+" "; ! if (frm2.prn.checked){ ! preStr = preStr +"PRN "; } ///////////////////// ! preStr = preStr + "for "; if(frm2.cmbDuration.value == 'Other'){ preStr = preStr + frm2.txtDuration.value; *************** *** 257,262 **** break; } } - ///////////////////// preStr = preStr + "\n"; --- 536,544 ---- break; } + } + + if ( "" == frm2.quantity.value ){ + frm2.quantity.value = "0"; } ///////////////////// preStr = preStr + "\n"; *************** *** 268,276 **** preStr = preStr +"\n"; frm.special.value = preStr; } ! first = false; } </script> --- 550,593 ---- preStr = preStr +"\n"; frm.special.value = preStr; + first = true; + }else{ + replaceScriptDisplay(); } ! //first = false; } + function clearWarning(){ + warningArray = new Array(); + } + function addWarning(addit){ + warningArray[warningArray.length] = addit; + } + + function fillWarnings(){ + //warningDiv + // warningList + + var warningDiv = document.getElementById("warningDiv"); + var warningList = document.getElementById("warningList"); + + while (warningList.hasChildNodes()){ + warningList.removeChild(warningList.firstChild); + } + for(i=0;i<warningArray.length;i++){ + var newText = document.createTextNode(warningArray[i]); + var newNode = document.createElement("li"); + newNode.appendChild(newText); + warningList.appendChild(newNode); + } + + if(warningArray.length == 0){ + warningDiv.style.display = 'None'; + }else{ + warningDiv.style.display = ''; + } + + } + </script> *************** *** 368,373 **** oscar.oscarRx.data.RxDrugData drugData = new oscar.oscarRx.data.RxDrugData(); thisForm.setDemographicNo(bean.getDemographicNo()); ! thisForm.setRxDate(oscar.oscarRx.util.RxUtil.DateToString(rx.getRxDate())); thisForm.setEndDate(oscar.oscarRx.util.RxUtil.DateToString(rx.getEndDate())); if(! rx.isCustom()){ --- 685,696 ---- oscar.oscarRx.data.RxDrugData drugData = new oscar.oscarRx.data.RxDrugData(); thisForm.setDemographicNo(bean.getDemographicNo()); ! ! thisForm.setRxDate(oscar.oscarRx.util.RxUtil.DateToString(rx.getRxDate(),"yyyy-MM-dd") ); ! thisForm.setEndDate(oscar.oscarRx.util.RxUtil.DateToString(rx.getEndDate())); + + try{ + System.out.println(oscar.oscarRx.util.RxUtil.DateToString(rx.getRxDate(),"yyyy-MM-dd") ); + }catch(Exception e){ e.printStackTrace(); } if(! rx.isCustom()){ *************** *** 395,398 **** --- 718,725 ---- thisForm.setAtcCode(rx.getAtcCode()); thisForm.setRegionalIdentifier(rx.getRegionalIdentifier()); + thisForm.setUnit(rx.getUnit()); + thisForm.setMethod(rx.getMethod()); + thisForm.setRoute(rx.getRoute()); + System.out.println("route "+rx.getRoute()); } *************** *** 555,562 **** <tr> <td colspan=2> ! </td> <td colspan=2> ! </td> <!--<td > --- 882,889 ---- <tr> <td colspan=2> ! Start Date: </td> <td colspan=2> ! <html:text property="rxDate" /> </td> <!--<td > *************** *** 589,595 **** <% } /* Custom */ %> ! <html:hidden property="rxDate" /> <tr> ! <td colspan=2>Take:</td> <td colspan=2> <select name="take" style="width:72px" onChange="javascript:takeChg();"> --- 916,928 ---- <% } /* Custom */ %> ! <tr> ! <td colspan=2> ! <html:select property="method" style="width:90px" onchange="calcQty();"> ! <html:option value="Take">Take</html:option> ! <html:option value="Apply">Apply</html:option> ! <html:option value="Rub">Rub well in</html:option> ! </html:select> ! </td> <td colspan=2> <select name="take" style="width:72px" onChange="javascript:takeChg();"> *************** *** 612,616 **** </select> <input type=text name="takeOther" style="display:none" size="5" onChange="javascript:takeChg();" /> ! <html:select property="frequencyCode" style="width:72px" onchange="javascript:calcQty();"> <%for(i=0; i<freq.length; i++){%> <html:option value="<%= freq[i].getFreqCode() %>"> --- 945,970 ---- </select> <input type=text name="takeOther" style="display:none" size="5" onChange="javascript:takeChg();" /> ! <html:select property="unit" style="width:80px" onchange="calcQty();"> ! <html:option value="tab">Tabs</html:option> ! <html:option value="mL">mL</html:option> ! <html:option value="sqrt">Squirts</html:option> ! <html:option value="g" >gm</html:option> ! <html:option value="mg">mg</html:option> ! <html:option value="micg">µg</html:option> ! <html:option value="drop">Drops</html:option> ! </html:select> ! ! <html:select property="route" style="width:80px" onchange="calcQty();"> ! <html:option value="PO">PO</html:option> ! <html:option value="SL">SL</html:option> ! <html:option value="IM">IM</html:option> ! <html:option value="SC">SC</html:option> ! <html:option value="PATCH">PATCH</html:option> ! <html:option value="TOP">TOP.</html:option> ! <html:option value="INH">INH</html:option> ! <html:option value="SUPP">SUPP</html:option> ! </html:select> ! ! <html:select property="frequencyCode" style="width:80px" onchange="javascript:changeDuration();calcQty();"> <%for(i=0; i<freq.length; i++){%> <html:option value="<%= freq[i].getFreqCode() %>"> *************** *** 666,670 **** </select> <input type=text name="txtDuration" size="4" onchange="javascript:calcQty();" style="display:none" /> ! <html:select property="durationUnit" style="width:72px" onchange="javascript:calcQty();"> <html:option value="D">Days</html:option> <html:option value="W">Weeks</html:option> --- 1020,1024 ---- </select> <input type=text name="txtDuration" size="4" onchange="javascript:calcQty();" style="display:none" /> ! <html:select property="durationUnit" style="width:80px" onchange="javascript:calcQty();"> <html:option value="D">Days</html:option> <html:option value="W">Weeks</html:option> *************** *** 695,699 **** </td> <td colspan=2 width=65%> ! <html:text property="quantity" size="8" onchange="javascript:writeScriptDisplay();" /> <input type=button value="<<" onclick="javascript:useQtyMax();" /> --- 1049,1053 ---- </td> <td colspan=2 width=65%> ! <html:text property="quantity" size="8" onchange="javascript:writeScriptDisplay();" /> <input type=button value="<<" onclick="javascript:useQtyMax();" /> *************** *** 703,720 **** <script language="javascript"> function setQuantity(){ ! if (frm.sugQtyMin.value != frm.sugQtyMax.value){ ! //document.all.namedItem() ! document.getElementById('lblSugQty').innerText ! = frm.sugQtyMin.value + ' - ' + frm.sugQtyMax.value; ! }else{ ! if(frm.sugQtyMin.value > 0){ ! document.getElementById('lblSugQty').innerText ! = frm.sugQtyMin.value; ! } ! } } setQuantity(); </script> </td> <!--<td> --- 1057,1074 ---- <script language="javascript"> function setQuantity(){ ! var sugQtyLbl = document.getElementById('lblSugQty'); ! while (sugQtyLbl.hasChildNodes()){ ! sugQtyLbl.removeChild(sugQtyLbl.firstChild); ! } ! var newSugQty = frm.sugQtyMin.value; ! if (frm.sugQtyMin.value != frm.sugQtyMax.value){ ! newSugQty = frm.sugQtyMin.value + ' - ' + frm.sugQtyMax.value; ! } ! sugQtyLbl.appendChild(document.createTextNode(newSugQty)); } setQuantity(); </script> + </td> <!--<td> *************** *** 770,776 **** --- 1124,1137 ---- <td valign=top> <html:textarea property="special" cols="50" rows="5" /> + <input type=button value="RD" title="Redraw"/> + <div id="warningDiv" style="display: none;"> + <ul id="warningList"> + <li>warning</li> + </ul> + </div> </td> <td valign=center> <input type=button name="cmdSpecial" value="<<" onclick="javascript:cmdSpecial_click();" /> + </td> *************** *** 791,806 **** <input type=button class="ControlPushButton" style="width:200px" onclick="javascript:submitForm('updateAddAnother');" value="Update and Get New Drug" /> <input type=button class="ControlPushButton" style="width:200px" onclick="javascript:submitForm('updateAndPrint');" value="Update, Print and Save" /> ! ! ! <br> ! <!-- peice Went Here ! <div style="background-color:yellow;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ACETAMINOPHEN inhibits BENZODIAZEPINE, long acting SIGNIFICANCE = MINOR EVIDENCE = POOR </div> <div style="background-color:red;margin-right:100px;margin-left:20px;margin-top:1px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ACETAMINOPHEN inhibits BENZODIAZEPINE, long acting SIGNIFICANCE = MINOR EVIDENCE = POOR ! </div> ! --> <script language=javascript> function submitPending(stashId, action){ --- 1152,1178 ---- <input type=button class="ControlPushButton" style="width:200px" onclick="javascript:submitForm('updateAddAnother');" value="Update and Get New Drug" /> <input type=button class="ControlPushButton" style="width:200px" onclick="javascript:submitForm('updateAndPrint');" value="Update, Print and Save" /> ! <!-- input type=button class="ControlPushButton" style="width:200px" onclick="javascript:replaceScriptDisplay();" value="REPLACE" /> ! <input type=button class="ControlPushButton" style="width:200px" onclick="javascript:fillWarnings();" value="RunWarning" / ! <input type=button class="ControlPushButton" style="width:200px" onclick="javascript:addWarning();" value="FillWarning" /--> <br> ! <!-- peice Went Here --> ! <%RxDrugData.Interaction[] interactions = (RxDrugData.Interaction[]) bean.getInteractions(); ! if (interactions != null && interactions.length > 0){ ! System.out.println("interactions.length "+interactions.length); ! for (int i = 0 ; i < interactions.length; i++){ %> ! <div style="background-color:<%=sigColor(interactions[i].significance)%>;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ! <%=interactions[i].affectingdrug%> <%=effect(interactions[i].effect)%> <%=interactions[i].affecteddrug%> SIGNIFICANCE = <%=significance(interactions[i].significance)%> EVIDENCE = <%=evidence(interactions[i].evidence)%> ! </div> ! <% } ! } ! %> ! ! <!--<div style="background-color:yellow;margin-right:100px;margin-left:20px;margin-top:10px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ACETAMINOPHEN inhibits BENZODIAZEPINE, long acting SIGNIFICANCE = MINOR EVIDENCE = POOR </div> <div style="background-color:red;margin-right:100px;margin-left:20px;margin-top:1px;padding-left:10px;padding-top:10px;padding-bottom:5px;border-bottom: 2px solid gray;border-right: 2px solid #999;border-top: 1px solid #CCC;border-left: 1px solid #CCC;"> ACETAMINOPHEN inhibits BENZODIAZEPINE, long acting SIGNIFICANCE = MINOR EVIDENCE = POOR ! </div>--> ! <script language=javascript> function submitPending(stashId, action){ *************** *** 910,914 **** out.write("first=false;"); }else{ ! out.write("calcQtyflag=false;"); }%> --- 1282,1286 ---- out.write("first=false;"); }else{ ! //out.write("calcQtyflag=false;"); }%> *************** *** 923,924 **** --- 1295,1352 ---- </body> </html:html> + <%! + + String effect(String s){ + Hashtable h = new Hashtable(); + h.put("a","augments (no clinical effect)"); + h.put("A","augments"); + h.put("i","inhibts (no clinical effect)"); + h.put("I","inhibits"); + h.put("n","has no effect on"); + h.put("N","has no effect on"); + h.put(" ","unknown effect on"); + + String retval = (String) h.get(s); + if (retval == null) {retval = "unknown effect on";} + return retval; + } + + String significance(String s){ + Hashtable h = new Hashtable(); + h.put("1","minor"); + h.put("2","moderate"); + h.put("3","major"); + h.put(" ","unknown"); + + String retval = (String) h.get(s); + if (retval == null) {retval = "unknown";} + return retval; + } + + String evidence(String s){ + Hashtable h = new Hashtable(); + h.put("P","poor"); + h.put("F","fair"); + h.put("G","good"); + h.put(" ","unknown"); + + String retval = (String) h.get(s); + if (retval == null) {retval = "unknown";} + return retval; + } + + + String sigColor(String s){ + Hashtable h = new Hashtable(); + h.put("1","yellow"); + h.put("2","orange"); + h.put("3","red"); + h.put(" ","greenyellow"); + + String retval = (String) h.get(s); + if (retval == null) {retval = "greenyellow";} + return retval; + } + + + %> |
|
From: Jay G. <jay...@us...> - 2005-04-20 21:09:57
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20460 Modified Files: AddReaction.jsp Log Message: changed to handle new fields in allergy.. ageOfOnset, severityOfReaction, onSetOfReaction Index: AddReaction.jsp =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/AddReaction.jsp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** AddReaction.jsp 5 Feb 2004 19:26:41 -0000 1.1 --- AddReaction.jsp 20 Apr 2005 21:09:45 -0000 1.2 *************** *** 99,102 **** --- 99,138 ---- </td> </tr> + + <tr valign="center"> + + <td colspan="2"> + Age Of Onset: <html:text property="ageOfOnset" size="4" maxlength="4"/> + </td> + + </tr> + + <tr valign="center"> + + <td colspan="2"> + Severity Of Reation : + <html:select property="severityOfReaction" > + <html:option value="1">Mild</html:option> + <html:option value="2">Moderate</html:option> + <html:option value="3">Severe</html:option> + </html:select> + </td> + + </tr> + + <tr valign="center"> + + <td colspan="2"> + Onset Of Reaction: + <html:select property="onSetOfReaction" > + <html:option value="1">Immediate</html:option> + <html:option value="2">Gradual</html:option> + <html:option value="3">Slow</html:option> + </html:select> + </td> + + </tr> + + <tr> <td colspan="2"> |
|
From: Jay G. <jay...@us...> - 2005-04-20 21:08:34
|
Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19675 Modified Files: RxAddReactionAction.java Log Message: changed to handle new fields in allergy.. ageOfOnset, severityOfReaction, onSetOfReaction Index: RxAddReactionAction.java =================================================================== RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxAddReactionAction.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** RxAddReactionAction.java 28 Dec 2004 18:55:00 -0000 1.2 --- RxAddReactionAction.java 20 Apr 2005 21:08:25 -0000 1.3 *************** *** 61,67 **** --- 61,69 ---- String type = request.getParameter("type"); + request.setAttribute("allergyId",id); request.setAttribute("name",name); request.setAttribute("type", type); + return (mapping.findForward("success")); |
