oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data MDSResultsData.java,1.7,1.8

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13029

Modified Files:
	MDSResultsData.java 
Log Message:
Added Methods
populateCMLResultsData
populateMDSResultsData2

populateMDSResultsData will be depricated populateCMLResultsData will move to another class soon



Index: MDSResultsData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data/MDSResultsData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MDSResultsData.java	26 Nov 2004 20:24:17 -0000	1.7
--- MDSResultsData.java	10 May 2005 03:26:14 -0000	1.8
***************
*** 28,31 ****
--- 28,32 ----
  import java.util.*;
  import java.sql.*;
+ import oscar.oscarLab.ca.on.*;
  
  
***************
*** 44,47 ****
--- 45,161 ----
     public ArrayList reportStatus;
     
+    
+    public ArrayList labResults;
+      
+    
+    public ArrayList populateCMLResultsData(String providerNo, String demographicNo, String patientFirstName, String patientLastName, String patientHealthNumber, String status) {
+       if ( providerNo == null) { providerNo = ""; }
+       if ( patientFirstName == null) { patientFirstName = ""; }
+       if ( patientLastName == null) { patientLastName = ""; }
+       if ( patientHealthNumber == null) { patientHealthNumber = ""; }
+       if ( status == null ) { status = ""; }
+       
+       
+       labResults =  new ArrayList();
+       // select lpp.patient_health_num, concat(lpp.patient_last_name,',',lpp.patient_first_name), lpp.patient_sex, lpp.doc_name, lpp.collection_date, lpp.lab_status from labPatientPhysicianInfo lpp;
+       String sql = "";
+       try {
+          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
+          if ( demographicNo == null) {
+             // note to self: lab reports not found in the providerLabRouting table will not show up - need to ensure every lab is entered in providerLabRouting, with '0'
+             // for the provider number if unable to find correct provider
+             
+             //sql = "select lpp.id, lpp.patient_health_num, concat(lpp.patient_last_name,',',lpp.patient_first_name) as patientName, lpp.patient_sex, lpp.doc_name, lpp.collection_date, lpp.lab_status, providerLabRouting.status "
+             //+" from labPatientPhysicianInfo lpp, providerLabRouting "
+             //+"where providerLabRouting.status like '%"+status+"%' AND providerLabRouting.provider_no like '"+(providerNo.equals("")?"%":providerNo)+"'" +
+             //"AND lpp.patient_last_name like '"+patientLastName+"%' and lpp.patient_first_name like  '"+patientFirstName+"%' AND lpp.patient_health_num like '%"+patientHealthNumber+"%' "; //group by mdsMSH.segmentID";
+             
+             sql = "select lpp.id, lpp.patient_health_num, concat(lpp.patient_last_name,',',lpp.patient_first_name) as patientName, lpp.patient_sex, lpp.doc_name, lpp.collection_date, lpp.lab_status, providerLabRouting.status "
+                  +" from labPatientPhysicianInfo lpp, providerLabRouting "
+                  +" where providerLabRouting.status like '%"+status+"%' AND providerLabRouting.provider_no like '"+(providerNo.equals("")?"%":providerNo)+"'" 
+                  +" AND providerLabRouting.lab_type = 'CML' "
+                  +" AND lpp.patient_last_name like '"+patientLastName+"%' and lpp.patient_first_name like  '"+patientFirstName+"%' AND lpp.patient_health_num like '%"+patientHealthNumber+"%' and providerLabRouting.lab_no = lpp.id";
+          } else {
+                                    
+             sql = "select lpp.id, lpp.patient_health_num, concat(lpp.patient_last_name,',',lpp.patient_first_name) as patientName, lpp.patient_sex, lpp.doc_name, lpp.collection_date, lpp.lab_status "
+             +" from labPatientPhysicianInfo lpp, patientLabRouting "
+             +" where patientLabRouting.lab_type = 'CML' and lpp.id = patientLabRouting.lab_no and patientLabRouting.demographic_no='"+demographicNo+"' "; //group by mdsMSH.segmentID";
+          }
+          
+          System.out.println("sql "+sql);
+          
+          ResultSet rs = db.GetSQL(sql);
+          while(rs.next()){
+             LabResultData lbData = new LabResultData(LabResultData.CML);
+             
+             lbData.labType = LabResultData.CML;
+             
+             lbData.segmentID = rs.getString("id");
+             
+             if (demographicNo == null && !providerNo.equals("0")) {
+                lbData.acknowledgedStatus = rs.getString("status");
+             } else {
+                lbData.acknowledgedStatus ="U";
+             }
+             
+             if (findCMLAdnormalResults(lbData.segmentID) > 0){
+                lbData.abn= true;
+             }
+             
+             lbData.healthNumber = rs.getString("patient_health_num");
+             lbData.patientName = rs.getString("patientName");
+             lbData.sex = rs.getString("patient_sex");
+             
+             
+             lbData.resultStatus = "0"; //TODO                        
+             // solve lbData.resultStatus.add(rs.getString("abnormalFlag"));
+             
+             lbData.dateTime = rs.getString("collection_date");
+             
+             //priority
+             lbData.priority = "----";
+             
+             lbData.requestingClient = rs.getString("doc_name");
+             lbData.reportStatus =  rs.getString("lab_status");
+             
+             //if ( rs.getString("reportGroupDesc").startsWith("MICRO") ) {
+             //   discipline.add("Microbiology");
+             //} else if ( rs.getString("reportGroupDesc").startsWith("DIAGNOSTIC IMAGING") ) {
+             //   discipline.add("Diagnostic Imaging");
+             //} else {
+                lbData.discipline = "Hem/Chem/Other";
+             //}
+             
+             labResults.add(lbData);
+          }
+          rs.close();
+          db.CloseConn();
+       }catch(Exception e){
+          System.out.println("exception in CMLPopulate:"+e);                  
+          e.printStackTrace();
+       }
+       
+       return labResults;
+    }
+    
+    public int findCMLAdnormalResults(String labId){
+       int count = 0;
+       try {
+          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
+                   
+          String sql = "select id from labTestResults where abn = 'A' and labPatientPhysicianInfo_id = '"+labId+"'";
+          
+          ResultSet rs = db.GetSQL(sql);
+          while(rs.next()){
+          count++;
+          }
+          rs.close();
+          db.CloseConn();
+       }catch(Exception e){
+          System.out.println("exception in MDSResultsData:"+e);                  
+       }
+       return count;
+    }
+    
     public void populateMDSResultsData(String providerNo, String demographicNo, String patientFirstName, String patientLastName, String patientHealthNumber, String status) {
        
***************
*** 138,141 ****
--- 252,352 ----
     }
     
+    
+    //////
+    
+    public ArrayList populateMDSResultsData2(String providerNo, String demographicNo, String patientFirstName, String patientLastName, String patientHealthNumber, String status) {
+       
+       if ( providerNo == null) { providerNo = ""; }
+       if ( patientFirstName == null) { patientFirstName = ""; }
+       if ( patientLastName == null) { patientLastName = ""; }
+       if ( patientHealthNumber == null) { patientHealthNumber = ""; }
+       if ( status == null ) { status = ""; }
+       
+       labResults = new ArrayList();            
+       String sql = "";
+       
+       try {
+          DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
+          if ( demographicNo == null) {
+             // note to self: lab reports not found in the providerLabRouting table will not show up - need to ensure every lab is entered in providerLabRouting, with '0'
+             // for the provider number if unable to find correct provider
+             sql = "SELECT mdsMSH.segmentID, providerLabRouting.status, mdsPID.patientName, mdsPID.healthNumber, " +
+             "mdsPID.sex, max(mdsZFR.abnormalFlag) as abnormalFlag, mdsMSH.dateTime, mdsOBR.quantityTiming, mdsPV1.refDoctor, " +
+             "min(mdsZFR.reportFormStatus) as reportFormStatus, mdsZRG.reportGroupDesc " +
+             "FROM mdsMSH,mdsPID,providerLabRouting,mdsPV1,mdsZFR,mdsOBR,mdsZRG where " +
+             "mdsMSH.segmentID=mdsPID.segmentID AND mdsMSH.segmentID=providerLabRouting.lab_no " +
+             "AND mdsMSH.segmentID=mdsPV1.segmentID AND mdsMSH.segmentID=mdsZFR.segmentID " +
+             "AND mdsMSH.segmentID=mdsOBR.segmentID AND mdsMSH.segmentID=mdsZRG.segmentID " +
+             "AND providerLabRouting.lab_type = 'MDS' " +
+             "AND providerLabRouting.status like '%"+status+"%' AND providerLabRouting.provider_no like '"+(providerNo.equals("")?"%":providerNo)+"'" +
+             "AND mdsPID.patientName like '"+patientLastName+"%^"+patientFirstName+"%^%' AND mdsPID.healthNumber like '%"+patientHealthNumber+"%' group by mdsMSH.segmentID";
+          } else {
+             sql = "SELECT mdsMSH.segmentID, mdsPID.patientName, mdsPID.healthNumber, " +
+             "mdsPID.sex, max(mdsZFR.abnormalFlag) as abnormalFlag, mdsMSH.dateTime, mdsOBR.quantityTiming, mdsPV1.refDoctor, " +
+             "min(mdsZFR.reportFormStatus) as reportFormStatus, mdsZRG.reportGroupDesc " +
+             "FROM mdsMSH,mdsPID,patientLabRouting,mdsPV1,mdsZFR,mdsOBR,mdsZRG where " +
+             "mdsMSH.segmentID=mdsPID.segmentID AND mdsMSH.segmentID=patientLabRouting.lab_no " +
+             "AND patientLabRouting.lab_type = 'MDS' " +
+             "AND mdsMSH.segmentID=mdsPV1.segmentID AND mdsMSH.segmentID=mdsZFR.segmentID " +
+             "AND mdsMSH.segmentID=mdsOBR.segmentID AND mdsMSH.segmentID=mdsZRG.segmentID " +
+             "AND patientLabRouting.demographic_no='"+demographicNo+"' group by mdsMSH.segmentID";
+          }
+          
+          ResultSet rs = db.GetSQL(sql);
+          while(rs.next()){
+             LabResultData lData = new LabResultData(LabResultData.MDS);
+             lData.segmentID = Integer.toString(rs.getInt("segmentID"));
+             
+             if (demographicNo == null && !providerNo.equals("0")) {
+                lData.acknowledgedStatus = rs.getString("status");
+             } else {
+                lData.acknowledgedStatus = "U";
+             }
+             
+             lData.healthNumber = rs.getString("healthNumber");
+             lData.patientName = beautifyName(rs.getString("patientName"));
+             lData.sex = rs.getString("sex");
+             lData.resultStatus = rs.getString("abnormalFlag");
+             lData.dateTime = rs.getString("dateTime");
+             
+             switch ( rs.getString("quantityTiming").charAt(0) ) {
+                case 'C' : lData.priority = "Critical"; break;
+                case 'S' : lData.priority = "Stat\\Urgent"; break;
+                case 'U' : lData.priority = "Unclaimed"; break;
+                case 'A' : if ( rs.getString("quantityTiming").startsWith("AL") ) {
+                   lData.priority = "Alert";
+                } else {
+                   lData.priority = "ASAP";
+                }
+                break;
+                default: lData.priority = "Routine"; break;
+             }
+             
+             lData.requestingClient = ProviderData.beautifyProviderName(rs.getString("refDoctor"));
+             lData.reportStatus = rs.getString("reportFormStatus");
+             
+             if ( !lData.resultStatus.equals("0") ){
+                lData.abn = true;
+             }
+             
+             if ( rs.getString("reportGroupDesc").startsWith("MICRO") ) {
+                lData.discipline = "Microbiology";
+             } else if ( rs.getString("reportGroupDesc").startsWith("DIAGNOSTIC IMAGING") ) {
+                lData.discipline = "Diagnostic Imaging";
+             } else {
+                lData.discipline = "Hem/Chem/Other";
+             }
+          }
+          rs.close();
+          db.CloseConn();
+       }catch(Exception e){
+          System.out.println("exception in MDSResultsData:"+e);
+          e.printStackTrace();
+       }
+       return labResults;
+    }
+    //////
+    
+    
     private String beautifyName(String name) {
        try {
***************
*** 157,161 ****
              // handles the case where it is
              sql = "update providerLabRouting set status='"+status+"', comment=? where provider_no='"+providerNo+"' and lab_no='"+labNo+"'";
!             db.queryExecute(sql, new String[] { comment });
           } else {
              sql = "delete from providerLabRouting where provider_no='0' and lab_no=?";
--- 368,372 ----
              // handles the case where it is
              sql = "update providerLabRouting set status='"+status+"', comment=? where provider_no='"+providerNo+"' and lab_no='"+labNo+"'";
!              db.queryExecute(sql, new String[] { comment });
           } else {
              sql = "delete from providerLabRouting where provider_no='0' and lab_no=?";

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarMDS SegmentDisplay.jsp,1.9,1.10

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12501

Modified Files:
	SegmentDisplay.jsp 
Log Message:
Updated to send labType MDS 



Index: SegmentDisplay.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMDS/SegmentDisplay.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SegmentDisplay.jsp	26 Nov 2004 20:06:40 -0000	1.9
--- SegmentDisplay.jsp	10 May 2005 03:23:13 -0000	1.10
***************
*** 183,186 ****
--- 183,187 ----
                          <input type="hidden" name="status" value="A">
                          <input type="hidden" name="comment" value="">
+                         <input type="hidden" name="labType" value="MDS"/>
                          <% if ( request.getParameter("providerNo") != null && ! mDSSegmentData.getAcknowledgedStatus(request.getParameter("providerNo")) ) { %>
                          <input type="submit" value="<bean:message key="oscarMDS.segmentDisplay.btnAcknowledge"/>" onclick="getComment()">
***************
*** 191,195 ****
                              <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()">
                          <% } else { // we were called from lab module %>
!                             <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(pd.getPatientName())%>', 'searchPatientWindow')">
                          <% } %>
                      </td>
--- 192,196 ----
                              <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()">
                          <% } else { // we were called from lab module %>
!                             <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?labType=MDS&segmentID=<%= request.getParameter("segmentID")%>&name=<%=java.net.URLEncoder.encode(pd.getPatientName())%>', 'searchPatientWindow')">
                          <% } %>
                      </td>
***************
*** 231,235 ****
                                                                      <a href="javascript:window.close()">
                                                                  <% } else { // we were called from lab module %>
!                                                                     <a href="javascript:popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')">
                                                                  <% } %>
                                                                      <%=pd.getPatientName()%>
--- 232,236 ----
                                                                      <a href="javascript:window.close()">
                                                                  <% } else { // we were called from lab module %>
!                                                                     <a href="javascript:popupStart(360, 680, 'SearchPatient.do?labType=MDS&segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')">
                                                                  <% } %>
                                                                      <%=pd.getPatientName()%>
***************
*** 743,747 ****
                              <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()">
                          <% } else { // we were called from lab module %>
!                             <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')">
                          <% } %>
                      </td>
--- 744,748 ----
                              <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="window.close()">
                          <% } else { // we were called from lab module %>
!                             <input type="button" value=" <bean:message key="oscarMDS.segmentDisplay.btnEChart"/> " onClick="popupStart(360, 680, 'SearchPatient.do?labType=MDS&segmentID=<%= request.getParameter("segmentID")%>', 'searchPatientWindow')">
                          <% } %>
                      </td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportnewedblist.jsp,1.11,1.12

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25412/report

Modified Files:
	reportnewedblist.jsp 
Log Message:
fix the edb date bug

Index: reportnewedblist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportnewedblist.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** reportnewedblist.jsp	7 May 2005 17:48:16 -0000	1.11
--- reportnewedblist.jsp	8 May 2005 04:43:26 -0000	1.12
***************
*** 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
   */
  -->
***************
*** 30,41 ****
    String curUser_no = (String) session.getAttribute("user");
    String deepcolor = "#CCCCFF", weakcolor = "#EEEEFF";
!   
    String strLimit1="0";
!   String strLimit2="1500";  
!   if(request.getParameter("limit1")!=null) strLimit1 = request.getParameter("limit1");  
    if(request.getParameter("limit2")!=null) strLimit2 = request.getParameter("limit2");
  
    String startDate =null, endDate=null;
!   if(request.getParameter("startDate")!=null) startDate = request.getParameter("startDate");  
    if(request.getParameter("endDate")!=null) endDate = request.getParameter("endDate");
  %>
--- 30,41 ----
    String curUser_no = (String) session.getAttribute("user");
    String deepcolor = "#CCCCFF", weakcolor = "#EEEEFF";
! 
    String strLimit1="0";
!   String strLimit2="1500";
!   if(request.getParameter("limit1")!=null) strLimit1 = request.getParameter("limit1");
    if(request.getParameter("limit2")!=null) strLimit2 = request.getParameter("limit2");
  
    String startDate =null, endDate=null;
!   if(request.getParameter("startDate")!=null) startDate = request.getParameter("startDate");
    if(request.getParameter("endDate")!=null) endDate = request.getParameter("endDate");
  %>
***************
*** 44,57 ****
  <jsp:useBean id="providerNameBean" class="java.util.Properties" scope="page" />
  <%@ include file="../admin/dbconnection.jsp" %>
! <% 
!   String [][] dbQueries=new String[][] { 
! {"select_formar", "select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ? order by ID desc limit ? offset ?"  }, 
  {"select_backwardscompatible", "(select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ?) union " +
!                                "(select demographic_no, edb as c_finalEDB, patient_name as c_pName, age as pg1_age, gravida as c_gravida, term as c_term, phone as pg1_homePhone, provider_no from edbrept where edb >= ? and edb <= ?) order by c_finalEDB desc limit ? offset ?"  }, 
! {"search_provider", "select provider_no, last_name, first_name from provider order by last_name"}, 
    };
    reportMainBean.doConfigure(dbParams,dbQueries);
  %>
!  
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
--- 44,58 ----
  <jsp:useBean id="providerNameBean" class="java.util.Properties" scope="page" />
  <%@ include file="../admin/dbconnection.jsp" %>
! <%
!   String [][] dbQueries=new String[][] {
! {"select_maxformar_id", "select max(ID) from formAR where c_finalEDB >= ? and c_finalEDB <= ? group by demographic_no"  },
! {"select_formar", "select ID, demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ? order by c_finalEDB desc limit ? offset ?"  },
  {"select_backwardscompatible", "(select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ?) union " +
!                                "(select demographic_no, edb as c_finalEDB, patient_name as c_pName, age as pg1_age, gravida as c_gravida, term as c_term, phone as pg1_homePhone, provider_no from edbrept where edb >= ? and edb <= ?) order by c_finalEDB desc limit ? offset ?"  },
! {"search_provider", "select provider_no, last_name, first_name from provider order by last_name"},
    };
    reportMainBean.doConfigure(dbParams,dbQueries);
  %>
! 
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
***************
*** 79,84 ****
  </table>
  
! <CENTER><table width="100%" border="0" bgcolor="silver" cellspacing="2" cellpadding="2"> 
! <tr bgcolor='<%=deepcolor%>'> 
  <TH align="center" ><b>#</b></TH>
  <TH align="center" width="10%" nowrap><b><bean:message key="report.reportnewdblist.msgEDB"/></b></TH>
--- 80,85 ----
  </table>
  
! <CENTER><table width="100%" border="0" bgcolor="silver" cellspacing="2" cellpadding="2">
! <tr bgcolor='<%=deepcolor%>'>
  <TH align="center" ><b>#</b></TH>
  <TH align="center" width="10%" nowrap><b><bean:message key="report.reportnewdblist.msgEDB"/></b></TH>
***************
*** 94,111 ****
    ResultSet rs=null ;
    rs = reportMainBean.queryResults("search_provider");
!   while (rs.next()) { 
      providerNameBean.setProperty(rs.getString("provider_no"), new String( rs.getString("last_name")+","+rs.getString("first_name") ));
    }
!     
    Properties demoProp = new Properties();
!   
    String[] param =new String[2];
!   param[0]=startDate; //"0001-01-01"; 
!   param[1]=endDate; //"0001-01-01"; 
    String[] paramb = new String[4];
!   paramb[0]=startDate; //"0001-01-01"; 
!   paramb[1]=endDate; //"0001-01-01"; 
!   paramb[2]=startDate; //"0001-01-01"; 
!   paramb[3]=endDate; //"0001-01-01"; 
    int[] itemp1 = new int[2];
    itemp1[1] = Integer.parseInt(strLimit1);
--- 95,127 ----
    ResultSet rs=null ;
    rs = reportMainBean.queryResults("search_provider");
!   while (rs.next()) {
      providerNameBean.setProperty(rs.getString("provider_no"), new String( rs.getString("last_name")+","+rs.getString("first_name") ));
    }
!   Properties arMaxId = new Properties();
!   String[] paramI =new String[2];
! String DATE_FORMAT = "yyyy-MM-dd";
! java.text.SimpleDateFormat sdf = new java.text.SimpleDateFormat(DATE_FORMAT);
! Calendar cal = Calendar.getInstance();
! cal.set(Integer.parseInt(startDate.substring(0,4)), Integer.parseInt(startDate.substring(5,startDate.lastIndexOf('-'))) , Integer.parseInt(startDate.substring(startDate.lastIndexOf('-')+1)) );
! cal.add(Calendar.YEAR,-1);
!   paramI[0]=sdf.format(cal.getTime()); //"0001-01-01";
! cal.set(Integer.parseInt(endDate.substring(0,4)), Integer.parseInt(endDate.substring(5,endDate.lastIndexOf('-'))) , Integer.parseInt(endDate.substring(endDate.lastIndexOf('-')+1)) );
! cal.add(Calendar.YEAR, 1);
!   paramI[1]=sdf.format(cal.getTime()); //"0001-01-01";
!   rs = reportMainBean.queryResults(paramI, "select_maxformar_id");
!   while (rs.next()) {
!     arMaxId.setProperty(""+rs.getInt("max(ID)"), "1");
!   }
! 
    Properties demoProp = new Properties();
! 
    String[] param =new String[2];
!   param[0]=startDate; //"0001-01-01";
!   param[1]=endDate; //"0001-01-01";
    String[] paramb = new String[4];
!   paramb[0]=startDate; //"0001-01-01";
!   paramb[1]=endDate; //"0001-01-01";
!   paramb[2]=startDate; //"0001-01-01";
!   paramb[3]=endDate; //"0001-01-01";
    int[] itemp1 = new int[2];
    itemp1[1] = Integer.parseInt(strLimit1);
***************
*** 114,126 ****
    int nItems=0;
    try {  // First try the version which also checks the edbrept table.  This will throw an exception if the edbrept table does not exist...
!       rs = reportMainBean.queryResults(paramb,itemp1, "select_backwardscompatible");     
    } catch (Exception e) {  // ...in which case we go with the standard version
        rs = reportMainBean.queryResults(param,itemp1, "select_formar");
    }
    while (rs.next()) {
      if (demoProp.containsKey(rs.getString("demographic_no")) ) continue;
      else demoProp.setProperty(rs.getString("demographic_no"), "1");
      bodd=bodd?false:true; //for the color of rows
!     nItems++; 
  %>
  <tr bgcolor="<%=bodd?weakcolor:"white"%>">
--- 130,143 ----
    int nItems=0;
    try {  // First try the version which also checks the edbrept table.  This will throw an exception if the edbrept table does not exist...
!       rs = reportMainBean.queryResults(paramb,itemp1, "select_backwardscompatible");
    } catch (Exception e) {  // ...in which case we go with the standard version
        rs = reportMainBean.queryResults(param,itemp1, "select_formar");
    }
    while (rs.next()) {
+     if (!arMaxId.containsKey(""+rs.getInt("ID")) ) continue;
      if (demoProp.containsKey(rs.getString("demographic_no")) ) continue;
      else demoProp.setProperty(rs.getString("demographic_no"), "1");
      bodd=bodd?false:true; //for the color of rows
!     nItems++;
  %>
  <tr bgcolor="<%=bodd?weakcolor:"white"%>">
***************
*** 138,142 ****
    }
    reportMainBean.closePstmtConn();
! %> 
  
  </table>
--- 155,159 ----
    }
    reportMainBean.closePstmtConn();
! %>
  
  </table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx Preview.jsp,1.7,1.8

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13221/oscarRx

Modified Files:
	Preview.jsp 
Log Message:
update for displaying clinic name

Index: Preview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/Preview.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Preview.jsp	7 May 2005 17:45:33 -0000	1.7
--- Preview.jsp	8 May 2005 03:33:12 -0000	1.8
***************
*** 93,97 ****
   			title="Print in a half letter size paper" onclick="javascript:return onPrint();">
  			<input type="hidden" name="printPageSize" value="PageSize.A6"/>
! 			<% 	String clinicTitle = provider.getClinicName() + "<br>" ;
  			 	clinicTitle += provider.getClinicAddress() + "<br>" ;
  			 	clinicTitle += provider.getClinicCity() + "   " + provider.getClinicPostal()  ;
--- 93,97 ----
   			title="Print in a half letter size paper" onclick="javascript:return onPrint();">
  			<input type="hidden" name="printPageSize" value="PageSize.A6"/>
! 			<% 	String clinicTitle = provider.getClinicName().replaceAll("\\(\\d{6}\\)","") + "<br>" ;
  			 	clinicTitle += provider.getClinicAddress() + "<br>" ;
  			 	clinicTitle += provider.getClinicCity() + "   " + provider.getClinicPostal()  ;
***************
*** 113,117 ****
          <td valign=top height="100px">
              <b><%=doctorName %></b><br>
!             <%= provider.getClinicName() %><br>
              <%= provider.getClinicAddress() %><br>
              <%= provider.getClinicCity() %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
--- 113,117 ----
          <td valign=top height="100px">
              <b><%=doctorName %></b><br>
!             <%= provider.getClinicName().replaceAll("\\(\\d{6}\\)","") %><br>
              <%= provider.getClinicAddress() %><br>
              <%= provider.getClinicCity() %>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportnewedblist.jsp,1.10,1.11

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16691/report

Modified Files:
	reportnewedblist.jsp 
Log Message:
debug for edb report, but the report is not shown in edb date order, may sombody can do it.

Index: reportnewedblist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportnewedblist.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** reportnewedblist.jsp	30 Mar 2005 15:27:54 -0000	1.10
--- reportnewedblist.jsp	7 May 2005 17:48:16 -0000	1.11
***************
*** 46,50 ****
  <% 
    String [][] dbQueries=new String[][] { 
! {"select_formar", "select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ? order by c_finalEDB desc limit ? offset ?"  }, 
  {"select_backwardscompatible", "(select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ?) union " +
                                 "(select demographic_no, edb as c_finalEDB, patient_name as c_pName, age as pg1_age, gravida as c_gravida, term as c_term, phone as pg1_homePhone, provider_no from edbrept where edb >= ? and edb <= ?) order by c_finalEDB desc limit ? offset ?"  }, 
--- 46,50 ----
  <% 
    String [][] dbQueries=new String[][] { 
! {"select_formar", "select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ? order by ID desc limit ? offset ?"  }, 
  {"select_backwardscompatible", "(select demographic_no, c_finalEDB, c_pName, pg1_age, c_gravida, c_term, pg1_homePhone, provider_no from formAR where c_finalEDB >= ? and c_finalEDB <= ?) union " +
                                 "(select demographic_no, edb as c_finalEDB, patient_name as c_pName, age as pg1_age, gravida as c_gravida, term as c_term, phone as pg1_homePhone, provider_no from edbrept where edb >= ? and edb <= ?) order by c_finalEDB desc limit ? offset ?"  }, 

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx Preview.jsp,1.6,1.7

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16003/oscarRx

Modified Files:
	Preview.jsp 
Log Message:
update for displaying hin and provider's billing number

Index: Preview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/Preview.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Preview.jsp	25 Mar 2005 20:42:20 -0000	1.6
--- Preview.jsp	7 May 2005 17:45:33 -0000	1.7
***************
*** 5,8 ****
--- 5,9 ----
  <%@ page import="oscar.oscarProvider.data.*"%>
  <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
+ <%@ page import="oscar.*"%>
  <% response.setHeader("Cache-Control","no-cache");%>
  
***************
*** 79,82 ****
--- 80,87 ----
     doctorName = (provider.getFirstName() + ' ' + provider.getSurname());
  }
+ 
+ doctorName = doctorName.replaceAll("\\d{6}","");
+ doctorName = doctorName.replaceAll("\\-","");
+ OscarProperties props = OscarProperties.getInstance();
  %>
  <html:form action="/form/formname">
***************
*** 127,131 ****
--- 132,138 ----
                          <%= patient.getPhone() %><br>
                          <b>
+                         <% if(!props.getProperty("showRxHin", "").equals("false")) { %>
                          <bean:message key="oscar.oscarRx.hin"/><%= patient.getHin() %>
+ 						<% } %>
                        </b>
                      </td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmSetupFormAction.java,1.21,1.22

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23888

Modified Files:
	FrmSetupFormAction.java 
Log Message:
changed to get demographic no from query string if available



Index: FrmSetupFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** FrmSetupFormAction.java	15 Feb 2005 18:37:04 -0000	1.21
--- FrmSetupFormAction.java	6 May 2005 20:29:01 -0000	1.22
***************
*** 81,92 ****
          String formId = request.getParameter("formId");
          frm.setValue("formId", formId==null?"0":formId);
!         String demo = null;
          String providerNo = (String) session.getValue("user");
!         if (bean!=null){
              request.getSession().setAttribute("EctSessionBean", bean);
              demo = (String) bean.getDemographicNo();
!             chartBean.setEChartBean(demo);	        
          }
          
          String ongoingConcern = chartBean.ongoingConcerns;
          String formName = (String) request.getParameter("formName");        
--- 81,96 ----
          String formId = request.getParameter("formId");
          frm.setValue("formId", formId==null?"0":formId);
!         String demo = request.getParameter("demographic_no");
          String providerNo = (String) session.getValue("user");
!         if (demo == null || bean!=null){
              request.getSession().setAttribute("EctSessionBean", bean);
              demo = (String) bean.getDemographicNo();
!             
          }
          
+         if ( demo != null){
+            chartBean.setEChartBean(demo);	                   
+         }                
+                 
          String ongoingConcern = chartBean.ongoingConcerns;
          String formName = (String) request.getParameter("formName");        

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data ProviderData.java,1.2,1.3

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13056

Modified Files:
	ProviderData.java 
Log Message:
order providers alphabetically in list



Index: ProviderData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMDS/data/ProviderData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ProviderData.java	21 Jul 2004 15:14:05 -0000	1.2
--- ProviderData.java	6 May 2005 19:46:39 -0000	1.3
***************
*** 70,74 ****
              ArrayList result = new ArrayList();
              
!             String sql = "select provider_no, first_name, last_name from provider where provider_type='doctor'";
              ResultSet rs = db.GetSQL(sql);            
              while ( rs.next() ) {
--- 70,97 ----
              ArrayList result = new ArrayList();
              
!             String sql = "select provider_no, first_name, last_name from provider where provider_type='doctor' order by last_name , first_name";
!             ResultSet rs = db.GetSQL(sql);            
!             while ( rs.next() ) {
!                 ArrayList provider = new ArrayList();
!                 provider.add(rs.getString("provider_no"));
!                 provider.add(rs.getString("first_name"));
!                 provider.add(rs.getString("last_name"));
!                 result.add(provider);
!             }
!             db.CloseConn();            
!             return result;
!         }catch(Exception e){
!             System.out.println("exception in ProviderData:"+e);
!             return null;
!         }        
!     }
!     
!     
!     public static ArrayList getProviderListWithLabNo () {
!         try {            
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             ArrayList result = new ArrayList();
!             
!             String sql = "select provider_no, first_name, last_name from provider where provider_type='doctor'  and ohip_no != '' order by last_name , first_name";
              ResultSet rs = db.GetSQL(sql);            
              while ( rs.next() ) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form/study formVascularTracker.jsp,1.1,1.2

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/study
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12189

Modified Files:
	formVascularTracker.jsp 
Log Message:
changed to redirect to E-Chart.  also set a popupUrl to pop up the tracker from the EChart



Index: formVascularTracker.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/study/formVascularTracker.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** formVascularTracker.jsp	2 May 2005 20:13:07 -0000	1.1
--- formVascularTracker.jsp	6 May 2005 19:43:58 -0000	1.2
***************
*** 25,28 ****
--- 25,29 ----
  --%>
  
+ <%@ page import="java.util.*, java.sql.*, java.net.*,java.text.DecimalFormat, oscar.oscarProvider.data.* " %>
  
  <%
***************
*** 30,38 ****
      response.sendRedirect("../../logout.jsp");
  
  //../form/SetupForm.do?formName=VTForm&demographic_no=10091&formId=0&provNo=999998
  String demo = request.getParameter("demographic_no") ;
  String study_no = request.getParameter("demographic_no"); 
  String prov_no = (String) session.getAttribute("user");
! String url = "../../form/SetupForm.do?formName=VTForm&demographic_no="+demo+"&study_no="+study_no+"&provNo="+prov_no+"&formId=0";
  System.out.println(url);
  response.sendRedirect(url );
--- 31,56 ----
      response.sendRedirect("../../logout.jsp");
  
+ GregorianCalendar now=new GregorianCalendar();
+ int curYear = now.get(Calendar.YEAR);
+ int curMonth = (now.get(Calendar.MONTH)+1);
+ int curDay = now.get(Calendar.DAY_OF_MONTH);
+ 
  //../form/SetupForm.do?formName=VTForm&demographic_no=10091&formId=0&provNo=999998
  String demo = request.getParameter("demographic_no") ;
  String study_no = request.getParameter("demographic_no"); 
  String prov_no = (String) session.getAttribute("user");
! 
! oscar.oscarProvider.data.ProviderData pd = new oscar.oscarProvider.data.ProviderData(prov_no);
! //pd.getProviderName(prov_no);
! 
! String userfirstname = pd.getFirst_name(); 
! String userlastname  = pd.getLast_name();
! 
! 
! String popupUrl = "../form/SetupForm.do?formName=VTForm&demographic_no="+demo+"&study_no="+study_no+"&provNo="+prov_no+"&formId=0";
! 
! String url = "../../oscarEncounter/IncomingEncounter.do?providerNo="+prov_no+"&appointmentNo=&demographicNo="+demo+"&curProviderNo=&reason="+URLEncoder.encode("Vascular Study")+"&userName="+URLEncoder.encode( userfirstname+" "+userlastname)+"&curDate="+curYear+"-"+curMonth+"-"+curDay+"&appointmentDate=&startTime=&status=&popupUrl="+URLEncoder.encode(popupUrl);
! System.out.println("url "+url);
! 
  System.out.println(url);
  response.sendRedirect(url );

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/dms adddocument.jsp,1.10,1.11

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27225/dms

Modified Files:
	adddocument.jsp 
Log Message:
change javascript

Index: adddocument.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/adddocument.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** adddocument.jsp	5 May 2005 01:56:42 -0000	1.10
--- adddocument.jsp	6 May 2005 18:35:20 -0000	1.11
***************
*** 106,109 ****
--- 106,111 ----
    theForm = sel.form;
    theForm.docdesc.value = theForm.doctype.value;
+   theForm.docdesc.focus();
+   theForm.docdesc.select();
  }
  //-->

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.41,1.42

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13909

Modified Files:
	formVTForm.jsp 
Log Message:
- now checking of no Pathology for foot exam does not auto check "no referal made"

- remove element of pathology in the eye section.  



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** formVTForm.jsp	21 Mar 2005 18:53:10 -0000	1.41
--- formVTForm.jsp	6 May 2005 17:46:20 -0000	1.42
***************
*** 431,435 ****
          document.forms[0].elements[ftInId].checked= true;
          document.forms[0].elements[ftOtId].checked= true;
!         document.forms[0].elements[ftReId].checked= true;
          
          //alert("disable all foot exam checkboxes");
--- 431,435 ----
          document.forms[0].elements[ftInId].checked= true;
          document.forms[0].elements[ftOtId].checked= true;
!         //document.forms[0].elements[ftReId].checked= true;
          
          //alert("disable all foot exam checkboxes");
***************
*** 1389,1410 ****
                                                      <textarea name="iComments" wrap="hard" cols="24" style="height:80"><logic:present name="iExComments"><%=request.getAttribute("iExComments")%></logic:present></textarea>
                                                  </td>
!                                             </tr>
!                                             <tr>
!                                                 <td class="dataEntryTable"><%=request.getAttribute("iExDesc")%></td>   
!                                                 <td class="dataEntryTable" align="center">
!                                                     <table cellpadding='0' cellspacing='0' border="0">         
!                                                     <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iExLDDate")%></td></tr>
!                                                     <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iExLastData")%></td></tr>
!                                                     </table>
!                                                 </td>
!                                                 <td class="dataEntryTable" align="center">
!                                                     <html:radio property="value(iExValue)" onclick="javascript:controlEyeExam();" value="yes"/>Yes
!                                                     <html:radio property="value(iExValue)" onclick="javascript:controlEyeExam();" value="no"/>No
!                                                     <a title="clear all" href="javascript:clearAll(eyeExId, eyeExId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                 </td>
!                                                 <td class="dataEntryTable" rowspan="7" valign="top" align="center">&nbsp;</td>
!                                                     <html:hidden property="value(iExDate)" />
!                                                     <html:hidden property="value(iExComments)" />
!                                             </tr>
                                              <tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td>
--- 1389,1393 ----
                                                      <textarea name="iComments" wrap="hard" cols="24" style="height:80"><logic:present name="iExComments"><%=request.getAttribute("iExComments")%></logic:present></textarea>
                                                  </td>
!                                             </tr>                                            
                                              <tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td>
***************
*** 1484,1488 ****
  
                                  <tr>                                            
!                                     <th class="title" widht="98%" colspan="2">
                                          <span id="labsLabel" style="display:none;"><a href="javascript: showHideItem('labs');" >Labs >> </a></span>
                                      </th>
--- 1467,1471 ----
  
                                  <tr>                                            
!                                     <th class="title" width="98%" colspan="2">
                                          <span id="labsLabel" style="display:none;"><a href="javascript: showHideItem('labs');" >Labs >> </a></span>
                                      </th>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil RxSessionBean.java,1.3,1.4

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31741

Modified Files:
	RxSessionBean.java 
Log Message:
Now calls on the Interaction cache to get Interaction values. Interactions are attempted to be preloaded when they are added to the stash



Index: RxSessionBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxSessionBean.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** RxSessionBean.java	2 May 2005 14:57:54 -0000	1.3
--- RxSessionBean.java	6 May 2005 05:35:01 -0000	1.4
***************
*** 124,127 ****
--- 124,128 ----
          else {
              stash.add(item);
+             preloadInteractions();
              return this.getStashSize()-1;
          }
***************
*** 152,163 ****
--- 153,185 ----
      }
      
+     private void preloadInteractions(){
+        RxInteractionData interact = RxInteractionData.getInstance();
+        interact.preloadInteraction(this.getAtcCodes());
+     }
+     
+     public Vector getAtcCodes(){
+        RxPrescriptionData rxData = new RxPrescriptionData();                    
+        Vector atcCodes = rxData.getCurrentATCCodesByPatient(this.getDemographicNo());      
+        RxPrescriptionData.Prescription rx;                
+        for(int i=0;i<this.getStashSize(); i++) {
+           rx = this.getStashItem(i);
+           atcCodes.add(rx.getAtcCode());
+        }
+        return atcCodes;
+     }
      
      public RxDrugData.Interaction[] getInteractions(){
         RxDrugData.Interaction[] interactions = null;
+        long start = System.currentTimeMillis();
+        long start2 = 0;
+        long end2 = 0;
         try{
+        start2 = System.currentTimeMillis();
            RxPrescriptionData rxData = new RxPrescriptionData();
            RxDrugData drugData = new RxDrugData();
+           RxInteractionData rxInteract =  RxInteractionData.getInstance();
            Vector atcCodes = rxData.getCurrentATCCodesByPatient(this.getDemographicNo());
  
+           System.out.println("atccode "+atcCodes.hashCode());
            RxPrescriptionData.Prescription rx;                
            for(int i=0;i<this.getStashSize(); i++) {
***************
*** 165,170 ****
               atcCodes.add(rx.getAtcCode());
            }
            try{        
!              interactions = drugData.getInteractions(atcCodes);
            }catch(Exception e){
               e.printStackTrace();
--- 187,194 ----
               atcCodes.add(rx.getAtcCode());
            }
+           System.out.println("atccode 2"+atcCodes.hashCode());
            try{        
!              interactions = rxInteract.getInteractions(atcCodes);
!              //interactions = drugData.getInteractions(atcCodes);
            }catch(Exception e){
               e.printStackTrace();
***************
*** 176,180 ****
--- 200,209 ----
            //interactions = 
            Arrays.sort(interactions);
+        end2 = System.currentTimeMillis() - start2;         
         }catch(Exception e2){}                 
+        long end = System.currentTimeMillis() - start;      
+        
+        
+        System.out.println("took "+end+ "milliseconds vs "+end2);
         return interactions;
      }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data RxInteractionWorker.java,NONE,1.1

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31410

Added Files:
	RxInteractionWorker.java 
Log Message:
Thread for searching drug to drug interactions.
This is launched from RxInteractionData.  it will return search results to a cache of drug to drug interactions




--- NEW FILE: RxInteractionWorker.java ---
/**
 * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
 * This software is published under the GPL GNU General Public License.
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version. *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
 *
 * Jason Gallagher
 *
 * This software was written for the
 * Department of Family Medicine
 * McMaster University
 * Hamilton
 * Ontario, Canada   Creates a new instance of RxInteractionWorker
 * 
 *
 * RxInteractionWorker.java
 *
 * Created on May 5, 2005, 6:54 PM
 */

package oscar.oscarRx.data;

import java.util.*;

/**
 *
 * @author Jay Gallagher
 */
public class RxInteractionWorker extends Thread {
   RxInteractionData interactionData = null;
   Vector atcCodes = null;
   
   public RxInteractionWorker() {
   }
   
   public RxInteractionWorker(RxInteractionData rxInt,Vector v){
      atcCodes = v;
      interactionData = rxInt;
   }
   
   public void run() {
      System.out.println("STARTING THREAD");
      long start = System.currentTimeMillis(); 
      
          RxDrugData.Interaction[] interactions = null;                 
          try{   
             if (atcCodes != null && interactionData != null){
                RxDrugData drugData = new RxDrugData();
                interactions = drugData.getInteractions(atcCodes);
                if (interactions != null){
                   interactionData.addToHash(atcCodes,interactions);
                   interactionData.removeFromWorking(atcCodes);
                }else{
                   System.out.println("What to do");
                   System.out.println("atc codes "+atcCodes);
                }
             }
          }catch(Exception e){
             e.printStackTrace();
          }
      long end = System.currentTimeMillis() - start;
      System.out.println("THREAD ENDING "+end);
   }
   
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data RxInteractionData.java,NONE,1.1

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30731

Added Files:
	RxInteractionData.java 
Log Message:
A singleton class that handles for cache drug to drug interactions



--- NEW FILE: RxInteractionData.java ---
/**
 * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
 * This software is published under the GPL GNU General Public License.
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version. *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
 * 
 * Jason Gallagher
 * 
 * This software was written for the
 * Department of Family Medicine
 * McMaster University
 * Hamilton
 * Ontario, Canada   Creates a new instance of RxInteractionData
 *
 *
 * RxInteractionData.java
 *
 * Created on May 5, 2005, 6:30 PM
 */

package oscar.oscarRx.data;

import java.util.*;

/**
 *
 * @author Jay Gallagher
 */
public class RxInteractionData {
   static RxInteractionData rxInteractionData= new RxInteractionData();
   static Hashtable  htable = new Hashtable();
   public static RxInteractionData getInstance() {
      return rxInteractionData;
   }
	
   static Hashtable working = new Hashtable();
	
   
   private RxInteractionData() {
   }
   
   public void preloadInteraction(Vector atccodes){
      //launch thread that searches database for them
      System.out.println("PRELOADING"+atccodes.hashCode());
      if (!htable.containsKey(new Integer(atccodes.hashCode())) ){
         RxInteractionWorker worker = new RxInteractionWorker(rxInteractionData,atccodes);
         worker.start();
         addToWorking(atccodes,worker);
      }            
   }
   
   public void addToHash(Vector atccodes,RxDrugData.Interaction[] interact ){
      htable.put(new Integer(atccodes.hashCode()), interact);
   }
   
   public void addToWorking(Vector atccodes,RxInteractionWorker worker){
      working.put(new Integer(atccodes.hashCode()), worker);
   }
   public void removeFromWorking(Vector atccodes){
      working.remove(new Integer(atccodes.hashCode()));
   }
   
   public RxDrugData.Interaction[] getInteractions(Vector atccodes){
      RxDrugData.Interaction[] interact = null;
      System.out.println("h table size "+htable.size()+"RxInteractionData.getInteraction atc code val  "+atccodes.hashCode());
      Integer i = new Integer(atccodes.hashCode());
      if (htable.containsKey(i) ){
         System.out.println("Already been searched!");
         interact = (RxDrugData.Interaction[]) htable.get(i);
      }else if(working.contains(i) ){
         System.out.println("Already been searched but not finished !");
         RxInteractionWorker worker = (RxInteractionWorker) working.get(i);
         if (worker != null){
             try {
                worker.join();
                System.out.println("Already been searched now finished!");
                // Finished
             } catch (InterruptedException e) {
                // Thread was interrupted
                System.out.println("Already been searched PROBLEM!");
                e.printStackTrace();
             }
            
             
         }
         interact = (RxDrugData.Interaction[]) htable.get(i);
      
      }else{
         System.out.println("NEW ATC CODES");
         try{        
            RxDrugData drugData = new RxDrugData();
            interact = drugData.getInteractions(atccodes);
            if (interact != null){
               addToHash(atccodes,interact);
            }
         }catch(Exception e){
             e.printStackTrace();
         }         
      }
      return interact;
   }
   
   
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx WriteScript.jsp,1.11,1.12

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29272

Modified Files:
	WriteScript.jsp 
Log Message:
added debug outputs



Index: WriteScript.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** WriteScript.jsp	5 May 2005 17:05:48 -0000	1.11
--- WriteScript.jsp	6 May 2005 05:21:33 -0000	1.12
***************
*** 6,9 ****
--- 6,10 ----
  <% response.setHeader("Cache-Control","no-cache");%>
  
+ <%long start = System.currentTimeMillis();%>
  
  <!--  
***************
*** 1212,1216 ****
                          <!-- peice Went Here -->
                          <%if (!isCustom) {
!                              RxDrugData.Interaction[] interactions =  (RxDrugData.Interaction[]) bean.getInteractions();
                               if (interactions != null && interactions.length > 0){ 
                                  System.out.println("interactions.length "+interactions.length);
--- 1213,1217 ----
                          <!-- peice Went Here -->
                          <%if (!isCustom) {
!                              RxDrugData.Interaction[] interactions = (RxDrugData.Interaction[]) bean.getInteractions();
                               if (interactions != null && interactions.length > 0){ 
                                  System.out.println("interactions.length "+interactions.length);
***************
*** 1366,1369 ****
--- 1367,1372 ----
  </body>
  </html:html>
+ <%long end  = System.currentTimeMillis() -start; System.out.println("millis "+end);%>
+ 
  <%!
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil MsgDisplayMessagesBean.java,1.9,1.10

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25043

Modified Files:
	MsgDisplayMessagesBean.java 
Log Message:
fixed bug with sent message display.  added  m as an alias for the table because order statement 
refered to table as "m"



Index: MsgDisplayMessagesBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarMessenger/pageUtil/MsgDisplayMessagesBean.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** MsgDisplayMessagesBean.java	2 May 2005 01:19:30 -0000	1.9
--- MsgDisplayMessagesBean.java	5 May 2005 17:39:05 -0000	1.10
***************
*** 510,515 ****
          java.sql.ResultSet rs;
  
!         String sql = new String("select messageid as status,messageid as message, thedate,  thesubject, sentby, attachment from messagetbl where sentbyNo = '"+ providerNo+"' and sentByLocation = '"+getCurrentLocationId()+"' order by "+getOrderBy(orderby));
! 
  
          rs = db.GetSQL(sql);
--- 510,514 ----
          java.sql.ResultSet rs;
  
!         String sql = new String("select messageid as status, messageid as message , thedate,  thesubject, sentby, attachment from messagetbl m where sentbyNo = '"+ providerNo+"' and sentByLocation = '"+getCurrentLocationId()+"' order by "+getOrderBy(orderby));                
  
          rs = db.GetSQL(sql);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarMessenger DisplayMessages.jsp,1.7,1.8

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24146

Modified Files:
	DisplayMessages.jsp 
Log Message:
fixed deleted message bug  Added "break;" in switch statement



Index: DisplayMessages.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/DisplayMessages.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DisplayMessages.jsp	2 May 2005 01:18:58 -0000	1.7
--- DisplayMessages.jsp	5 May 2005 17:36:44 -0000	1.8
***************
*** 322,325 ****
--- 322,326 ----
                                          theMessages2 = DisplayMessagesBeanId.estDeletedInbox(orderby);
                                          // System.out.println("deleted messages");
+                                     break;
                                      case 3:
                                          theMessages2 = DisplayMessagesBeanId.estDemographicInbox(orderby,demographic_no);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx WriteScript.jsp,1.10,1.11

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16191

Modified Files:
	WriteScript.jsp 
Log Message:
interactions is not shown in custom drug. 

bug fixed with startDate.  was not shown in a custom drug



Index: WriteScript.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** WriteScript.jsp	5 May 2005 01:42:39 -0000	1.10
--- WriteScript.jsp	5 May 2005 17:05:48 -0000	1.11
***************
*** 61,64 ****
--- 61,65 ----
  int specialStringLen = 0;
  String quan = "";
+ boolean isCustom = true;
  %>
  
***************
*** 772,776 ****
  }
  
! boolean isCustom = thisForm.getGCN_SEQNO() == 0;
  int drugId = thisForm.getGCN_SEQNO();
  
--- 773,777 ----
  }
  
! isCustom = thisForm.getGCN_SEQNO() == 0;
  int drugId = thisForm.getGCN_SEQNO();
  
***************
*** 928,943 ****
                              </tr>
  
!                             <tr>
!                                 <td colspan=2>
!                                   Start Date:
!                                 </td>
!                                 <td colspan=2>
!                                   <html:text property="rxDate" />
!                                 </td>
!                                 <!--<td >
!                                   &nbsp;
!                                 </td>-->
!                             </tr>
! 
                          <% } else { /* Custom Drug Entry */%>
  
--- 929,933 ----
                              </tr>
  
!                             
                          <% } else { /* Custom Drug Entry */%>
  
***************
*** 964,967 ****
--- 954,969 ----
                          <% } /* Custom */ %>
  
+                             <tr>
+                                 <td colspan=2>
+                                   Start Date:
+                                 </td>
+                                 <td colspan=2>
+                                   <html:text property="rxDate" />
+                                 </td>
+                                 <!--<td >
+                                   &nbsp;
+                                 </td>-->
+                             </tr>
+ 
                              
                              <tr>
***************
*** 1209,1224 ****
                          <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%> &nbsp;&nbsp;&nbsp;&nbsp;SIGNIFICANCE = <%=significance(interactions[i].significance)%> &nbsp;&nbsp;&nbsp;EVIDENCE = <%=evidence(interactions[i].evidence)%>
-                              </div>
-                         <%   }
-                           }else if(interactions == null){ %>
-                           <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;">
--- 1211,1230 ----
                          <br>
                          <!-- peice Went Here -->
+                         <%if (!isCustom) {
+                              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%> &nbsp;&nbsp;&nbsp;&nbsp;SIGNIFICANCE = <%=significance(interactions[i].significance)%> &nbsp;&nbsp;&nbsp;EVIDENCE = <%=evidence(interactions[i].evidence)%>
+                                  </div>
+                         <%      }
+                              
+                              }else if(interactions == null){ %>
+                                 <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;">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON billingOB.jsp,1.15,1.16

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30693/billing/CA/ON

Modified Files:
	billingOB.jsp 
Log Message:
change to show a ref. doc default value

Index: billingOB.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingOB.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** billingOB.jsp	4 Apr 2005 15:07:09 -0000	1.15
--- billingOB.jsp	5 May 2005 02:02:15 -0000	1.16
***************
*** 1,3 ****
! <%      
  if(session.getAttribute("user") == null) response.sendRedirect("../../../logout.jsp");
  String user_no = (String) session.getAttribute("user");
--- 1,3 ----
! <%
  if(session.getAttribute("user") == null) response.sendRedirect("../../../logout.jsp");
  String user_no = (String) session.getAttribute("user");
***************
*** 7,10 ****
--- 7,13 ----
  String premiumFlag="";
  String service_form="";
+ 
+ OscarProperties props = OscarProperties.getInstance();
+ 
  %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
***************
*** 22,48 ****
  String visitType = oscarVariables.getProperty("visit_type", "");
  %>
! <!--  
  /*
!  * 
   * 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 
   */
  -->
--- 25,51 ----
  String visitType = oscarVariables.getProperty("visit_type", "");
  %>
! <!--
  /*
!  *
   * 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
   */
  -->
***************
*** 55,59 ****
  A, BODY, INPUT, OPTION ,SELECT , TABLE, TEXTAREA, TD, TR {font-family: Arial, Verdana, Helvetica, tahoma,sans-serif; font-size:10px;}
  -->
! </style>  
  <script language="JavaScript">
  <!--
--- 58,62 ----
  A, BODY, INPUT, OPTION ,SELECT , TABLE, TEXTAREA, TD, TR {font-family: Arial, Verdana, Helvetica, tahoma,sans-serif; font-size:10px;}
  -->
! </style>
  <script language="JavaScript">
  <!--
***************
*** 63,67 ****
  	//document.serviceform.xml_diagnostic_code.select();
  }
! /*		
  function RecordAttachments(Files, File0, File1, File2) {
  	window.document.serviceform.elements["File0Data"].value = File0;
--- 66,70 ----
  	//document.serviceform.xml_diagnostic_code.select();
  }
! /*
  function RecordAttachments(Files, File0, File1, File2) {
  	window.document.serviceform.elements["File0Data"].value = File0;
***************
*** 164,168 ****
  <%
  boolean bNew = false; //Is that a new file?
! if( request.getParameter("bNewForm")!=null ) 
  	bNew = request.getParameter("bNewForm").compareTo("0")==0 ? false : true ;
  
--- 167,171 ----
  <%
  boolean bNew = false; //Is that a new file?
! if( request.getParameter("bNewForm")!=null )
  	bNew = request.getParameter("bNewForm").compareTo("0")==0 ? false : true ;
  
***************
*** 172,179 ****
  if (hotclick.compareTo("gel") == 0) {
  	content = "<xml_k990>checked</xml_k990><xml_a007>checked</xml_a007>";
! }  
  if( !bNew ) {
  	content = (String) session.getAttribute("content");
! %>    
  <xml id="xml_list">
  <billing>
--- 175,182 ----
  if (hotclick.compareTo("gel") == 0) {
  	content = "<xml_k990>checked</xml_k990><xml_a007>checked</xml_a007>";
! }
  if( !bNew ) {
  	content = (String) session.getAttribute("content");
! %>
  <xml id="xml_list">
  <billing>
***************
*** 199,203 ****
  int ctlCount = 0;
  String assgProvider_no = "", assgProvider_name="";
!     
  ResultSet rsPatient = apptMainBean.queryResults(demo_no, "search_demographic_details");
  while(rsPatient.next()){
--- 202,206 ----
  int ctlCount = 0;
  String assgProvider_no = "", assgProvider_name="";
! 
  ResultSet rsPatient = apptMainBean.queryResults(demo_no, "search_demographic_details");
  while(rsPatient.next()){
***************
*** 225,231 ****
  <body bgcolor="#FFFFFF" text="#000000" rightmargin="0" leftmargin="0" topmargin="10" marginwidth="0" marginheight="0" onLoad="setfocus();showHideLayers('Layer1','','hide')">
  
! <div id="Layer2" style="position:absolute; left:362px; top:26px; width:332px; height:600px; z-index:2; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden"> 
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
! 	<tr> 
  		<td width="18%"><b><font size="-2">Dx Code</font></b></td>
  		<td width="76%"><b><font size="-2">Description</font></b></td>
--- 228,234 ----
  <body bgcolor="#FFFFFF" text="#000000" rightmargin="0" leftmargin="0" topmargin="10" marginwidth="0" marginheight="0" onLoad="setfocus();showHideLayers('Layer1','','hide')">
  
! <div id="Layer2" style="position:absolute; left:362px; top:26px; width:332px; height:600px; z-index:2; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
! 	<tr>
  		<td width="18%"><b><font size="-2">Dx Code</font></b></td>
  		<td width="76%"><b><font size="-2">Description</font></b></td>
***************
*** 233,237 ****
  	</tr>
  
! <% 
  String ctldiagcode="", ctldiagcodename="";
  ctlCount = 0;
--- 236,240 ----
  	</tr>
  
! <%
  String ctldiagcode="", ctldiagcodename="";
  ctlCount = 0;
***************
*** 242,250 ****
  	ctldiagcodename = rsdiagcode.getString("des");
  %>
! 	<tr bgcolor=<%=ctlCount%2==0 ? "#FFFFFF" : "#EEEEFF"%>> 
  		<td width="18%"><b><font size="-2" color="#7A388D"><a href="#" onClick="document.serviceform.xml_diagnostic_detail.value='<%=ctldiagcode%>|<%=ctldiagcodename%>';showHideLayers('Layer2','','hide');return false;"><%=ctldiagcode%></a></font></b></td>
  		<td colspan="2"><font size="-2" color="#7A388D">
  		<%=ctldiagcodename.length() < 56 ? ctldiagcodename : ctldiagcodename.substring(0,55)%></font></td>
! 	</tr>  
  <%
  }
--- 245,253 ----
  	ctldiagcodename = rsdiagcode.getString("des");
  %>
! 	<tr bgcolor=<%=ctlCount%2==0 ? "#FFFFFF" : "#EEEEFF"%>>
  		<td width="18%"><b><font size="-2" color="#7A388D"><a href="#" onClick="document.serviceform.xml_diagnostic_detail.value='<%=ctldiagcode%>|<%=ctldiagcodename%>';showHideLayers('Layer2','','hide');return false;"><%=ctldiagcode%></a></font></b></td>
  		<td colspan="2"><font size="-2" color="#7A388D">
  		<%=ctldiagcodename.length() < 56 ? ctldiagcodename : ctldiagcodename.substring(0,55)%></font></td>
! 	</tr>
  <%
  }
***************
*** 257,263 ****
  
  <table width="100%" border="0" cellspacing="0" cellpadding="0">
! <tr bgcolor="#000000"> 
  	<td height="42" width="10%">&nbsp; </td>
! 	<td width="90%"> 
  	<p><font color="#FFFFFF" size="3"><b>oscarBilling</b></font></p>
  	</td>
--- 260,266 ----
  
  <table width="100%" border="0" cellspacing="0" cellpadding="0">
! <tr bgcolor="#000000">
  	<td height="42" width="10%">&nbsp; </td>
! 	<td width="90%">
  	<p><font color="#FFFFFF" size="3"><b>oscarBilling</b></font></p>
  	</td>
***************
*** 265,276 ****
  </table>
  
! <div id="Layer1" style="position:absolute; left:1px; top:159px; width:410px; height:200px; z-index:1; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden"> 
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
! 	<tr bgcolor="#393764"> 
  		<td width="96%" height="7" bgcolor="#FFCC00"><font size="-2" face="Geneva, Arial, Helvetica, san-serif" color="#000000"><b>Billing Form</b></font></td>
  		<td width="3%" bgcolor="#FFCC00" height="7"><b><a href="#" onClick="showHideLayers('Layer1','','hide');return false;">X</a></b></font></td>
  	</tr>
  
! <% 
  ResultSet rs3= null;
  ctlCount = 0;
--- 268,279 ----
  </table>
  
! <div id="Layer1" style="position:absolute; left:1px; top:159px; width:410px; height:200px; z-index:1; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
! 	<tr bgcolor="#393764">
  		<td width="96%" height="7" bgcolor="#FFCC00"><font size="-2" face="Geneva, Arial, Helvetica, san-serif" color="#000000"><b>Billing Form</b></font></td>
  		<td width="3%" bgcolor="#FFCC00" height="7"><b><a href="#" onClick="showHideLayers('Layer1','','hide');return false;">X</a></b></font></td>
  	</tr>
  
! <%
  ResultSet rs3= null;
  ctlCount = 0;
***************
*** 284,288 ****
  	ctlCount++;
  %>
! 	<tr bgcolor=<%=ctlCount%2==0 ? "#FFFFFF" : "#EEEEFF"%>> 
  		<td colspan="2"><b><font size="-2" color="#7A388D"><a href="billingOB.jsp?billForm=<%=ctlcode%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=request.getParameter("appointment_no")%>&demographic_name=<%=URLEncoder.encode(demoname)%>&demographic_no=<%=request.getParameter("demographic_no")%>&user_no=<%=user_no%>&apptProvider_no=<%=request.getParameter("apptProvider_no")%>&providerview=<%=request.getParameter("apptProvider_no")%>&appointment_date=<%=request.getParameter("appointment_date")%>&status=<%=request.getParameter("status")%>&start_time=<%=request.getParameter("start_time")%>&bNewForm=1" onClick="showHideLayers('Layer1','','hide');"><%=ctlcodename%></a></font></b></td>
  	</tr>
--- 287,291 ----
  	ctlCount++;
  %>
! 	<tr bgcolor=<%=ctlCount%2==0 ? "#FFFFFF" : "#EEEEFF"%>>
  		<td colspan="2"><b><font size="-2" color="#7A388D"><a href="billingOB.jsp?billForm=<%=ctlcode%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=request.getParameter("appointment_no")%>&demographic_name=<%=URLEncoder.encode(demoname)%>&demographic_no=<%=request.getParameter("demographic_no")%>&user_no=<%=user_no%>&apptProvider_no=<%=request.getParameter("apptProvider_no")%>&providerview=<%=request.getParameter("apptProvider_no")%>&appointment_date=<%=request.getParameter("appointment_date")%>&status=<%=request.getParameter("status")%>&start_time=<%=request.getParameter("start_time")%>&bNewForm=1" onClick="showHideLayers('Layer1','','hide');"><%=ctlcodename%></a></font></b></td>
  	</tr>
***************
*** 294,301 ****
  </div>
  
! <form name="serviceform" id="serviceform" action="billingReview.jsp"  method="POST" onSubmit="return(checkData());"> 
  <table width="100%" border="0" cellspacing="0" cellpadding="0" <%=bNew?"":"datasrc='#xml_list'"%>>
! <tr> 
! 	<td valign="top" height="221"> 
  
  	<table width="107%" border="0" cellspacing="0" cellpadding="0">
--- 297,304 ----
  </div>
  
! <form name="serviceform" id="serviceform" action="billingReview.jsp"  method="POST" onSubmit="return(checkData());">
  <table width="100%" border="0" cellspacing="0" cellpadding="0" <%=bNew?"":"datasrc='#xml_list'"%>>
! <tr>
! 	<td valign="top" height="221">
  
  	<table width="107%" border="0" cellspacing="0" cellpadding="0">
***************
*** 303,327 ****
  		<td width="12%"><font size="-2"><b>Patient</b>:</font></td>
  		<td><font size="-2"><u><%=demoname%></u><%=billingdatetime%></font></td>
! 		<td><font size="-2"><b>Patient 
! 		Status</b>:</font><font size="1"><%=DemoStatus%> 
  		&nbsp;&nbsp;&nbsp;&nbsp; <b>Roster Status: <%=DemoRoster%></b></font></td>
! 		<td width="19%"><font size="1" ><strong>Assigned 
  		Physician</strong></font></td>
  		<td width="24%"><%=assgProvider_name%></td>
! 	</tr><tr> 
  		<td width="12%"><b><font size="1">Age:</font></b></td>
  		<td><b><font size="1"><%=age%></font></b></td>
  		<td><b><font size="1" >
  		<a href="#" onClick="showHideLayers('Layer1','','show');return false;">Billing form</a>:</font></b>
! <% 
  rsctlcode = apptMainBean.queryResults(ctlBillForm, "search_ctlbillservice");
  while (rsctlcode.next()){
  	ctlcode = rsctlcode.getString("servicetype");
  	ctlcodename = rsctlcode.getString("servicetype_name");
! } 
  rsctlcode.close();
  %>
  <%=ctlcodename.length()<30 ? ctlcodename : ctlcodename.substring(0,30)%>
! 		</td><td width="19%"><font size="-2"> 
  <%
  /*
--- 306,330 ----
  		<td width="12%"><font size="-2"><b>Patient</b>:</font></td>
  		<td><font size="-2"><u><%=demoname%></u><%=billingdatetime%></font></td>
! 		<td><font size="-2"><b>Patient
! 		Status</b>:</font><font size="1"><%=DemoStatus%>
  		&nbsp;&nbsp;&nbsp;&nbsp; <b>Roster Status: <%=DemoRoster%></b></font></td>
! 		<td width="19%"><font size="1" ><strong>Assigned
  		Physician</strong></font></td>
  		<td width="24%"><%=assgProvider_name%></td>
! 	</tr><tr>
  		<td width="12%"><b><font size="1">Age:</font></b></td>
  		<td><b><font size="1"><%=age%></font></b></td>
  		<td><b><font size="1" >
  		<a href="#" onClick="showHideLayers('Layer1','','show');return false;">Billing form</a>:</font></b>
! <%
  rsctlcode = apptMainBean.queryResults(ctlBillForm, "search_ctlbillservice");
  while (rsctlcode.next()){
  	ctlcode = rsctlcode.getString("servicetype");
  	ctlcodename = rsctlcode.getString("servicetype_name");
! }
  rsctlcode.close();
  %>
  <%=ctlcodename.length()<30 ? ctlcodename : ctlcodename.substring(0,30)%>
! 		</td><td width="19%"><font size="-2">
  <%
  /*
***************
*** 330,341 ****
  		billingdatetime = now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH)+ " " + now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE);
  	}
! } 
  */
  %>
  		<b>Billing Physician</b> </font></td>
! 		<td width="24%"><font size="-2"> 
  		<select name="xml_provider" datafld='xml_provider'>
  			<option value="000000" <%=providerview.equals("000000")?"selected":""%>><b>Select Provider</b></option>
! <% 
  // Retrieving Provider
  String proFirst="", proLast="", proOHIP="";
--- 333,344 ----
  		billingdatetime = now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH)+ " " + now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE);
  	}
! }
  */
  %>
  		<b>Billing Physician</b> </font></td>
! 		<td width="24%"><font size="-2">
  		<select name="xml_provider" datafld='xml_provider'>
  			<option value="000000" <%=providerview.equals("000000")?"selected":""%>><b>Select Provider</b></option>
! <%
  // Retrieving Provider
  String proFirst="", proLast="", proOHIP="";
***************
*** 347,358 ****
  %>
  			<option value="<%=proOHIP%>" <%=providerview.equals(proOHIP)?"selected":""%>><b><%=proLast%>, <%=proFirst%></b></option>
! <% 
! }  
  rslocal.close();
  %>
  		</select></font></td>
! 	</tr><tr> 
  		<td width="12%"><font size="-2"><b>Billing Type</b> </font></td>
! 		<td width="12%"><font size="-2"> 
  		<select name="xml_billtype" datafld='xml_billtype' >
  			<option value="ODP | Bill OHIP" selected>Bill OHIP</option>
--- 350,361 ----
  %>
  			<option value="<%=proOHIP%>" <%=providerview.equals(proOHIP)?"selected":""%>><b><%=proLast%>, <%=proFirst%></b></option>
! <%
! }
  rslocal.close();
  %>
  		</select></font></td>
! 	</tr><tr>
  		<td width="12%"><font size="-2"><b>Billing Type</b> </font></td>
! 		<td width="12%"><font size="-2">
  		<select name="xml_billtype" datafld='xml_billtype' >
  			<option value="ODP | Bill OHIP" selected>Bill OHIP</option>
***************
*** 362,380 ****
  		</select>
  		</font></td>
! 		<td width="33%"><font size="-2"> 
! <% 
  if (appt_no.compareTo("0") == 0) {
  %>
! 		<a href="#" onClick='rs("billingcalendar","billingCalendarPopup.jsp?year=<%=curYear%>&month=<%=curMonth%>&type=service","380","300","0"); return false;'> Service Date:</a> 
  		<input type="text" name="xml_appointment_date" readonly value="<%=now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH)%>" size="12" datafld='xml_appointment_date'>
  <%
! } else { 
  %>
! 		<b>Service Date:</b> 
  		<input type="text" name="xml_appointment_date" readonly value="<%=request.getParameter("appointment_date")%>" size="12" datafld='xml_appointment_date'>
  <%} %>
  		</font></td>
  		<td width="19%"><font size="-2" ><b>Visit Type</b> </font></td>
! 		<td width="24%"> <font size="-2" > 
  		<select name="xml_visittype" datafld='xml_visittype'>
  			<option value="00| Clinic Visit" <%=visitType.equals("Clinic Visit")?"selected":""%>>00 | Clinic Visit</option>
--- 365,383 ----
  		</select>
  		</font></td>
! 		<td width="33%"><font size="-2">
! <%
  if (appt_no.compareTo("0") == 0) {
  %>
! 		<a href="#" onClick='rs("billingcalendar","billingCalendarPopup.jsp?year=<%=curYear%>&month=<%=curMonth%>&type=service","380","300","0"); return false;'> Service Date:</a>
  		<input type="text" name="xml_appointment_date" readonly value="<%=now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH)%>" size="12" datafld='xml_appointment_date'>
  <%
! } else {
  %>
! 		<b>Service Date:</b>
  		<input type="text" name="xml_appointment_date" readonly value="<%=request.getParameter("appointment_date")%>" size="12" datafld='xml_appointment_date'>
  <%} %>
  		</font></td>
  		<td width="19%"><font size="-2" ><b>Visit Type</b> </font></td>
! 		<td width="24%"> <font size="-2" >
  		<select name="xml_visittype" datafld='xml_visittype'>
  			<option value="00| Clinic Visit" <%=visitType.equals("Clinic Visit")?"selected":""%>>00 | Clinic Visit</option>
***************
*** 386,395 ****
  		</select>
  		</font></td>
! 	</tr><tr> 
  		<td width="12%"><font size="-2">
  		<b>Visit Location</b> </font></td>
! 		<td colspan="2"><font size="-2"> 
  		<select name="xml_location" datafld='xml_location'>
! <% 
  String clinic_location="", clinic_code="";
  ResultSet rsclinic = apptMainBean.queryResults("1", "search_clinic_location");
--- 389,398 ----
  		</select>
  		</font></td>
! 	</tr><tr>
  		<td width="12%"><font size="-2">
  		<b>Visit Location</b> </font></td>
! 		<td colspan="2"><font size="-2">
  		<select name="xml_location" datafld='xml_location'>
! <%
  String clinic_location="", clinic_code="";
  ResultSet rsclinic = apptMainBean.queryResults("1", "search_clinic_location");
***************
*** 404,425 ****
  %>
  		</select>
! 		<input type="checkbox" name="xml_referral" value="checked" <%=bNew?"":"datafld='xml_referral'"%>>
  		<b>Referral ?</b></font></td>
! 		<td width="19%"><font size="-2"> 
  		<a href="#" onClick='rs("billingcalendar","billingCalendarPopup.jsp?year=<%=curYear%>&month=<%=curMonth%>&type=admission","380","300","0");return false;'>
  		Admission Date:</a> </font></td>
! 		<td width="24%"><font size="-2"> 
  
  <%
! String inPatient = oscarVariables.getProperty("inPatient");                
! String admissionDate = ""; 
! try{                    
  	if(inPatient != null && inPatient.trim().equalsIgnoreCase("YES")){
  		oscar.oscarDemographic.data.DemographicData demoData = new oscar.oscarDemographic.data.DemographicData();
  		admissionDate = demoData.getDemographicDateJoined(demo_no);
! 	} 
  }catch(Exception inPatientEx){
  	inPatientEx.printStackTrace();
! 	admissionDate = ""; 
  }
  %>
--- 407,428 ----
  %>
  		</select>
! 		<input type="checkbox" name="xml_referral" value="checked" <%=bNew?(props.getProperty("billingRefBoxDefault", "").startsWith("checked")?"checked":""):"datafld='xml_referral'"%> >
  		<b>Referral ?</b></font></td>
! 		<td width="19%"><font size="-2">
  		<a href="#" onClick='rs("billingcalendar","billingCalendarPopup.jsp?year=<%=curYear%>&month=<%=curMonth%>&type=admission","380","300","0");return false;'>
  		Admission Date:</a> </font></td>
! 		<td width="24%"><font size="-2">
  
  <%
! String inPatient = oscarVariables.getProperty("inPatient");
! String admissionDate = "";
! try{
  	if(inPatient != null && inPatient.trim().equalsIgnoreCase("YES")){
  		oscar.oscarDemographic.data.DemographicData demoData = new oscar.oscarDemographic.data.DemographicData();
  		admissionDate = demoData.getDemographicDateJoined(demo_no);
! 	}
  }catch(Exception inPatientEx){
  	inPatientEx.printStackTrace();
! 	admissionDate = "";
  }
  %>
***************
*** 431,439 ****
  
  	<table width="100%" border="0" cellspacing="0" cellpadding="0" height="137">
! 	<tr> 
! 		<td valign="top" width="33%"> 
  
  		<table width="100%" border="1" cellspacing="0" cellpadding="0" height="0">
! <% 
  String serviceCode, serviceDesc, serviceValue, servicePercentage, serviceType,serviceDisp="";
  String headerTitle="";
--- 434,442 ----
  
  	<table width="100%" border="0" cellspacing="0" cellpadding="0" height="137">
! 	<tr>
! 		<td valign="top" width="33%">
  
  		<table width="100%" border="1" cellspacing="0" cellpadding="0" height="0">
! <%
  String serviceCode, serviceDesc, serviceValue, servicePercentage, serviceType,serviceDisp="";
  String headerTitle="";
***************
*** 462,472 ****
  	if (CountService == 0) {
  %>
! 		<tr bgcolor="#CCCCFF"> 
! 			<td width="15%" nowrap><font size="1" color="#000000"><b><%=headerTitle%> 
  			</b></font>
  			</td>
  			<td width="71%" bgcolor="#CCCCFF"><b><font size="1" color="#000000">Description</font></b></td>
! 			<td width="14%" align="right"> 
! 			<b><font size="1" color="#000000">$ 
  			Fee</font></b>
  			</td>
--- 465,475 ----
  	if (CountService == 0) {
  %>
! 		<tr bgcolor="#CCCCFF">
! 			<td width="15%" nowrap><font size="1" color="#000000"><b><%=headerTitle%>
  			</b></font>
  			</td>
  			<td width="71%" bgcolor="#CCCCFF"><b><font size="1" color="#000000">Description</font></b></td>
! 			<td width="14%" align="right">
! 			<b><font size="1" color="#000000">$
  			Fee</font></b>
  			</td>
***************
*** 478,491 ****
  	CountService++;
  %>
! 		<tr bgcolor=<%=CountService%2==0?"#FFFFFF":"#EEEEFF"%>> 
! 			<td width="15%"  nowrap> 
  			<input type="checkbox" name="xml_<%=serviceCode%>" value="checked"  <%=bNew?"":"datafld='xml_"+serviceCode+ "'"%>>
  			<b><font size="1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b> &nbsp;</td>
! 			<td width="71%"><font size="1" ><%=serviceDesc%> 
  			<input type="hidden" name="desc_xml_<%=serviceCode%>" value="<%=serviceDesc%>">
  			</font></td>
! 			<td width="14%" align="right"> 
! 			<font size="1" ><%=serviceDisp%></font> 
! 			 
  			<input type="hidden" name="price_xml_<%=serviceCode%>" value="<%=serviceDisp%>">
  			<input type="hidden" name="perc_xml_<%=serviceCode%>" value="<%=servicePercentage%>">
--- 481,494 ----
  	CountService++;
  %>
! 		<tr bgcolor=<%=CountService%2==0?"#FFFFFF":"#EEEEFF"%>>
! 			<td width="15%"  nowrap>
  			<input type="checkbox" name="xml_<%=serviceCode%>" value="checked"  <%=bNew?"":"datafld='xml_"+serviceCode+ "'"%>>
  			<b><font size="1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b> &nbsp;</td>
! 			<td width="71%"><font size="1" ><%=serviceDesc%>
  			<input type="hidden" name="desc_xml_<%=serviceCode%>" value="<%=serviceDesc%>">
  			</font></td>
! 			<td width="14%" align="right">
! 			<font size="1" ><%=serviceDisp%></font>
! 
  			<input type="hidden" name="price_xml_<%=serviceCode%>" value="<%=serviceDisp%>">
  			<input type="hidden" name="perc_xml_<%=serviceCode%>" value="<%=servicePercentage%>">
***************
*** 499,506 ****
  		</table>
  
! 		</td><td valign="top" width="31%"> 
! 		
  		<table width="100%" border="1" cellspacing="0" cellpadding="0">
! <% 
  param1[0]=ctlBillForm;
  param1[1]="Group2";
--- 502,509 ----
  		</table>
  
! 		</td><td valign="top" width="31%">
! 
  		<table width="100%" border="1" cellspacing="0" cellpadding="0">
! <%
  param1[0]=ctlBillForm;
  param1[1]="Group2";
***************
*** 524,537 ****
  	if (CountService == 0) { // first line
  %>
! 		<tr bgcolor="#CCCCFF"> 
! 			<td width="15%" nowrap><b></b> 
  			<font size="1"><b><%=headerTitle%></b></font>
  			</td>
  			<td width="71%"><b><font size="1" >Description</font></b></td>
! 			<td width="14%"> 
  			<div align="right"><b><font size="1" >$ Fee</font></b></div>
  			</td>
  		</tr>
! <% 
  		CountService = 1;
  	} else {
--- 527,540 ----
  	if (CountService == 0) { // first line
  %>
! 		<tr bgcolor="#CCCCFF">
! 			<td width="15%" nowrap><b></b>
  			<font size="1"><b><%=headerTitle%></b></font>
  			</td>
  			<td width="71%"><b><font size="1" >Description</font></b></td>
! 			<td width="14%">
  			<div align="right"><b><font size="1" >$ Fee</font></b></div>
  			</td>
  		</tr>
! <%
  		CountService = 1;
  	} else {
***************
*** 539,553 ****
  	}
  %>
! 		<tr bgcolor=<%=CountService%2==0 ? "#FFFFFF" : "#EEEEFF"%>> 
! 			<td width="15%" nowrap> 
  			<input type="checkbox" name="xml_<%=serviceCode%>" value="checked"  <%=bNew?"":"datafld='xml_"+serviceCode+ "'"%>>
  			<b><font size="1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>&nbsp;</td>
! 			<td width="71%"><font size="1" ><%=serviceDesc%></font> 
! 			 
  			<input type="hidden" name="desc_xml_<%=serviceCode%>" value="<%=serviceDesc%>">
  			</font></td>
! 			<td width="14%"> 
! 			<div align="right"><font size="1" ><%=serviceDisp%></font> 
! 			 
  			<input type="hidden" name="price_xml_<%=serviceCode%>" value="<%=serviceDisp%>">
  			<input type="hidden" name="perc_xml_<%=serviceCode%>" value="<%=servicePercentage%>">
--- 542,556 ----
  	}
  %>
! 		<tr bgcolor=<%=CountService%2==0 ? "#FFFFFF" : "#EEEEFF"%>>
! 			<td width="15%" nowrap>
  			<input type="checkbox" name="xml_<%=serviceCode%>" value="checked"  <%=bNew?"":"datafld='xml_"+serviceCode+ "'"%>>
  			<b><font size="1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>&nbsp;</td>
! 			<td width="71%"><font size="1" ><%=serviceDesc%></font>
! 
  			<input type="hidden" name="desc_xml_<%=serviceCode%>" value="<%=serviceDesc%>">
  			</font></td>
! 			<td width="14%">
! 			<div align="right"><font size="1" ><%=serviceDisp%></font>
! 
  			<input type="hidden" name="price_xml_<%=serviceCode%>" value="<%=serviceDisp%>">
  			<input type="hidden" name="perc_xml_<%=serviceCode%>" value="<%=servicePercentage%>">
***************
*** 562,573 ****
  
  		</table>
! 		
  		</td><td valign="top" width="36%">
! 		
  		<table width="100%" border="1" cellspacing="0" cellpadding="0" height="0">
! <% 
  param1[0]=ctlBillForm;
  param1[1]="Group3";
!             
  CountService = 0;
  rslocal = apptMainBean.queryResults(param1, "search_servicecode");
--- 565,576 ----
  
  		</table>
! 
  		</td><td valign="top" width="36%">
! 
  		<table width="100%" border="1" cellspacing="0" cellpadding="0" height="0">
! <%
  param1[0]=ctlBillForm;
  param1[1]="Group3";
! 
  CountService = 0;
  rslocal = apptMainBean.queryResults(param1, "search_servicecode");
***************
*** 589,598 ****
  	if (CountService == 0) {
  %>
! 		<tr bgcolor="#CCCCFF"> 
! 			<td width="15%" align="left"> 
  			<b><font size="1" color="#000000"><%=headerTitle%></b></font>
  			</td>
  			<td width="71%" bgcolor="#CCCCFF"><b><font size="1">Description</font></b></td>
! 			<td width="14%" align="right"> 
  			<b><font size="1" >$ Fee</font></b>
  			</td>
--- 592,601 ----
  	if (CountService == 0) {
  %>
! 		<tr bgcolor="#CCCCFF">
! 			<td width="15%" align="left">
  			<b><font size="1" color="#000000"><%=headerTitle%></b></font>
  			</td>
  			<td width="71%" bgcolor="#CCCCFF"><b><font size="1">Description</font></b></td>
! 			<td width="14%" align="right">
  			<b><font size="1" >$ Fee</font></b>
  			</td>
***************
*** 604,618 ****
  	}
  %>
! 		<tr bgcolor=<%=CountService%2==0 ? "#FFFFFF" : "#EEEEFF"%>> 
! 			<td width="15%" nowrap><b></b>  
  			<input type="checkbox" name="xml_<%=serviceCode%>" value="checked"  <%=bNew?"":"datafld='xml_"+serviceCode+ "'"%>>
  			<b><font size="1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>&nbsp;</td>
! 			<td width="71%"><font size="1" ><%=serviceDesc%></font> 
! 			 
  			<input type="hidden" name="desc_xml_<%=serviceCode%>" value="<%=serviceDesc%>">
  			</font></td>
! 			<td width="14%"> 
! 			<div align="right"><font size="1" ><%=serviceDisp%></font> 
! 			 
  			<input type="hidden" name="price_xml_<%=serviceCode%>" value="<%=serviceDisp%>">
  			<input type="hidden" name="perc_xml_<%=serviceCode%>" value="<%=servicePercentage%>">
--- 607,621 ----
  	}
  %>
! 		<tr bgcolor=<%=CountService%2==0 ? "#FFFFFF" : "#EEEEFF"%>>
! 			<td width="15%" nowrap><b></b>
  			<input type="checkbox" name="xml_<%=serviceCode%>" value="checked"  <%=bNew?"":"datafld='xml_"+serviceCode+ "'"%>>
  			<b><font size="1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>&nbsp;</td>
! 			<td width="71%"><font size="1" ><%=serviceDesc%></font>
! 
  			<input type="hidden" name="desc_xml_<%=serviceCode%>" value="<%=serviceDesc%>">
  			</font></td>
! 			<td width="14%">
! 			<div align="right"><font size="1" ><%=serviceDisp%></font>
! 
  			<input type="hidden" name="price_xml_<%=serviceCode%>" value="<%=serviceDisp%>">
  			<input type="hidden" name="perc_xml_<%=serviceCode%>" value="<%=servicePercentage%>">
***************
*** 626,665 ****
  %>
  
! 		<tr bgcolor="#CCCCFF"> 
! 			<td align="center" valign="top" height="71" colspan="3"> 
! 			
  			<table width="100%" border="0" cellspacing="2" cellpadding="2">
! 			<tr> 
! 				<td width="91%"> 
  
  				<table width="100%" border="0" cellspacing="0" cellpadding="0" height="67" bgcolor="#EEEEFF">
! 				<tr> 
  					<td><b><font size="1" >
  					Other service/procedure/premium codes</font></b></td>
  					<td><b><font size="1" >
  					# units</font></b></td>
! 				</tr><tr> 
! 					<td><font size="1"> 
  					<input type="text" name="xml_other1" size="40" datafld='xml_other1'>
  					</font></td>
! 					<td><font size="1"> 
  					<input type="text" name="xml_other1_unit" size="5" maxlength="2" datafld='xml_other1_unit'>
  					</font></td>
! 				</tr><tr> 
! 					<td><font size="1"> 
  					<input type="text" name="xml_other2" size="40" datafld='xml_other2'>
  					</font></td>
! 					<td><font size="1"> 
  					<input type="text" name="xml_other2_unit" size="5" maxlength="2" datafld='xml_other2_unit'>
  					</font></td>
  					</tr>
! 					<tr> 
! 					<td><font size="1"> 
  					<input type="text" name="xml_other3" size="40"  datafld='xml_other3'>
  					</font></td>
! 					<td><font size="1"> 
  					<input type="text" name="xml_other3_unit" size="5" maxlength="2" datafld='xml_other3_unit'>
  					</font></td>
! 				</tr><tr> 
  					<td colspan="2"><a href="javascript:OtherScriptAttach()"><img src="images/search_code.jpg" border="0"></a></td>
  				</tr>
--- 629,668 ----
  %>
  
! 		<tr bgcolor="#CCCCFF">
! 			<td align="center" valign="top" height="71" colspan="3">
! 
  			<table width="100%" border="0" cellspacing="2" cellpadding="2">
! 			<tr>
! 				<td width="91%">
  
  				<table width="100%" border="0" cellspacing="0" cellpadding="0" height="67" bgcolor="#EEEEFF">
! 				<tr>
  					<td><b><font size="1" >
  					Other service/procedure/premium codes</font></b></td>
  					<td><b><font size="1" >
  					# units</font></b></td>
! 				</tr><tr>
! 					<td><font size="1">
  					<input type="text" name="xml_other1" size="40" datafld='xml_other1'>
  					</font></td>
! 					<td><font size="1">
  					<input type="text" name="xml_other1_unit" size="5" maxlength="2" datafld='xml_other1_unit'>
  					</font></td>
! 				</tr><tr>
! 					<td><font size="1">
  					<input type="text" name="xml_other2" size="40" datafld='xml_other2'>
  					</font></td>
! 					<td><font size="1">
  					<input type="text" name="xml_other2_unit" size="5" maxlength="2" datafld='xml_other2_unit'>
  					</font></td>
  					</tr>
! 					<tr>
! 					<td><font size="1">
  					<input type="text" name="xml_other3" size="40"  datafld='xml_other3'>
  					</font></td>
! 					<td><font size="1">
  					<input type="text" name="xml_other3_unit" size="5" maxlength="2" datafld='xml_other3_unit'>
  					</font></td>
! 				</tr><tr>
  					<td colspan="2"><a href="javascript:OtherScriptAttach()"><img src="images/search_code.jpg" border="0"></a></td>
  				</tr>
***************
*** 672,676 ****
  
  			<table width="100%" border="0" cellspacing="2" cellpadding="2">
! 			<tr bgcolor="#CCCCFF"> 
  				<td colspan="4"><b><font size="1" color="#000000">
  				Diagnostic Codes</font></b></td>
--- 675,679 ----
  
  			<table width="100%" border="0" cellspacing="2" cellpadding="2">
! 			<tr bgcolor="#CCCCFF">
  				<td colspan="4"><b><font size="1" color="#000000">
  				Diagnostic Codes</font></b></td>
***************
*** 694,705 ****
  			<input type="hidden" name="clinic_no" value="<%=clinicNo%>">
  			<input type="hidden" name="billForm" value="<%=ctlBillForm%>">
!            
! 			<tr bgcolor="#EEEEFF"> 
  				<td align="left" colspan="4" height="9"> <b><font size="1">
  				<a href="#" onClick="showHideLayers('Layer2','','show','Layer1','','hide'); return false;">
! 				Diagnostic </a></font></b> <font size="1"> 
  				<input name="xml_diagnostic_detail" value="" size="25" datafld='xml_diagnostic_detail'>
! 				<a href="javascript:ScriptAttach()"><img src="images/search_dx_code.jpg" border="0"></a> 
! 				&nbsp; &nbsp; 
  				<input type="hidden" name="xml_dig_search1" >
  				</font></td>
--- 697,708 ----
  			<input type="hidden" name="clinic_no" value="<%=clinicNo%>">
  			<input type="hidden" name="billForm" value="<%=ctlBillForm%>">
! 
! 			<tr bgcolor="#EEEEFF">
  				<td align="left" colspan="4" height="9"> <b><font size="1">
  				<a href="#" onClick="showHideLayers('Layer2','','show','Layer1','','hide'); return false;">
! 				Diagnostic </a></font></b> <font size="1">
  				<input name="xml_diagnostic_detail" value="" size="25" datafld='xml_diagnostic_detail'>
! 				<a href="javascript:ScriptAttach()"><img src="images/search_dx_code.jpg" border="0"></a>
! 				&nbsp; &nbsp;
  				<input type="hidden" name="xml_dig_search1" >
  				</font></td>
***************
*** 711,716 ****
  		</table>
  		<table width="100%" border="0" cellspacing="0" cellpadding="0">
! 		<tr> 
! 			<td align="right"> 
  			<input type="submit" name="Submit" value="Continue">
  			<input type="button" name="Button" value="Cancel" onClick="window.close();">
--- 714,719 ----
  		</table>
  		<table width="100%" border="0" cellspacing="0" cellpadding="0">
! 		<tr>
! 			<td align="right">
  			<input type="submit" name="Submit" value="Continue">
  			<input type="button" name="Button" value="Cancel" onClick="window.close();">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/dms adddocument.jsp,1.9,1.10

[Yi Li <yi...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29627/dms

Modified Files:
	adddocument.jsp 
Log Message:
change to display correctly on firefox and add some javascripts

Index: adddocument.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/adddocument.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** adddocument.jsp	10 Aug 2004 15:48:26 -0000	1.9
--- adddocument.jsp	5 May 2005 01:56:42 -0000	1.10
***************
*** 1,29 ****
! <!--  
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
!  * along with this program; if not, write to the Free Software 
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
!  * 
   * <OSCAR TEAM>
!  * 
!  * This software was written for the 
!  * Department of Family Medicine 
!  * McMaster Unviersity 
!  * Hamilton 
!  * Ontario, Canada 
   */
  -->
  <%
! if(session.getValue("user") == null) response.sendRedirect("../logout.htm");
  %>
  
--- 1,29 ----
! <!--
  /*
!  *
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License.
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version. *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
!  *
   * <OSCAR TEAM>
!  *
!  * This software was written for the
!  * Department of Family Medicine
!  * McMaster Unviersity
!  * Hamilton
!  * Ontario, Canada
   */
  -->
  <%
! if(session.getAttribute("user") == null) response.sendRedirect("../logout.jsp");
  %>
  
***************
*** 34,44 ****
  
  <%@ include file="../admin/dbconnection.jsp" %>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> 
  <%@ include file="dbDMS.jsp" %>
! <%   
! if(session.getValue("user") == null) response.sendRedirect("../logout.jsp");
  String user_no = (String) session.getAttribute("user");
  String docdownload = oscarVariables.getProperty("project_home") ;;
! session.setAttribute("homepath", docdownload);      
  %>
  <%
--- 34,46 ----
  
  <%@ include file="../admin/dbconnection.jsp" %>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  <%@ include file="dbDMS.jsp" %>
! <%
  String user_no = (String) session.getAttribute("user");
  String docdownload = oscarVariables.getProperty("project_home") ;;
! session.setAttribute("homepath", docdownload);
! 
! OscarProperties props = OscarProperties.getInstance();
! 
  %>
  <%
***************
*** 47,54 ****
    int curMonth = (now.get(Calendar.MONTH)+1);
    int curDay = now.get(Calendar.DAY_OF_MONTH);
!   
    String nowDate = String.valueOf(curYear)+"/"+String.valueOf(curMonth) + "/" + String.valueOf(curDay)+ " " +now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE) + ":"+now.get(Calendar.SECOND);
       //                String docdownload = oscarVariables.getProperty("project_home") ;;
!      //    session.setAttribute("homepath", docdownload);      
  
    String proFirst="", proLast="", proOHIP="", proNo="";
--- 49,56 ----
    int curMonth = (now.get(Calendar.MONTH)+1);
    int curDay = now.get(Calendar.DAY_OF_MONTH);
! 
    String nowDate = String.valueOf(curYear)+"/"+String.valueOf(curMonth) + "/" + String.valueOf(curDay)+ " " +now.get(Calendar.HOUR_OF_DAY)+":"+now.get(Calendar.MINUTE) + ":"+now.get(Calendar.SECOND);
       //                String docdownload = oscarVariables.getProperty("project_home") ;;
!      //    session.setAttribute("homepath", docdownload);
  
    String proFirst="", proLast="", proOHIP="", proNo="";
***************
*** 58,62 ****
     rslocal = apptMainBean.queryResults(user_no, "search_provider_name");
     while(rslocal.next()){
!    
     proFirst = rslocal.getString("first_name");
     proLast = rslocal.getString("last_name");
--- 60,64 ----
     rslocal = apptMainBean.queryResults(user_no, "search_provider_name");
     while(rslocal.next()){
! 
     proFirst = rslocal.getString("first_name");
     proLast = rslocal.getString("last_name");
***************
*** 64,67 ****
--- 66,72 ----
  }
  %>
+ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+   "http://www.w3.org/TR/html4/loose.dtd">
+ 
  <html:html locale="true">
  <head>
***************
*** 97,100 ****
--- 102,110 ----
    awnd.focus();
  }
+ 
+ function checkSel(sel){
+   theForm = sel.form;
+   theForm.docdesc.value = theForm.doctype.value;
+ }
  //-->
  </script>
***************
*** 108,127 ****
    </tr>
  </table>
  <table BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C4D9E7"  >
!   <FORM NAME="aDoc" ACTION="dbDocument.jsp" METHOD="POST">
!     <tr valign="top"> 
!       <td rowspan="2" ALIGN="right" valign="middle"> 
!         <div align="center"> 
            <p>&nbsp;</p>
            <table width="80%" border="1" cellspacing="0" cellpadding="0">
!             <tr> 
                <td colspan="3"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"></font></td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgFunction"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
                  <input type="text" name="function" value="<%=request.getParameter("function")%> " size="20">
                  </font></td>
!               <td rowspan="8" width="31%" valign="middle"> 
                  <p><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000066"><bean:message key="dms.addDocument.msgInstructionTitle"/><br>
                    <bean:message key="dms.addDocument.msgInstructions"/></font></p>
--- 118,137 ----
    </tr>
  </table>
+ <FORM NAME="aDoc" ACTION="dbDocument.jsp" METHOD="POST">
  <table BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C4D9E7"  >
!     <tr valign="top">
!       <td rowspan="2" ALIGN="right" valign="middle">
!         <div align="center">
            <p>&nbsp;</p>
            <table width="80%" border="1" cellspacing="0" cellpadding="0">
!             <tr>
                <td colspan="3"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"></font></td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgFunction"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
                  <input type="text" name="function" value="<%=request.getParameter("function")%> " size="20">
                  </font></td>
!               <td rowspan="8" width="31%" valign="middle">
                  <p><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000066"><bean:message key="dms.addDocument.msgInstructionTitle"/><br>
                    <bean:message key="dms.addDocument.msgInstructions"/></font></p>
***************
*** 130,179 ****
                  </td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgID"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
                  <input type="text" name="functionid" value="<%=request.getParameter("functionid")%>" size="20">
                  </font></td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgDocType"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
!                 <select name="doctype">
                    <option value=""><bean:message key="dms.addDocument.formSelect"/></option>
                    <%
                      ResultSet rsdemo2 = null;
! 		  	   
! 		  		 	          	     String[] param4=new String[1];
! 		  		 	          	    	 
! 		  		 	          	    	   
! 		  		 	          	    		   param4[0] = request.getParameter("function");
! 		  					        
! 		  		 	          
! 		  		 	          	    rsdemo2 = apptMainBean.queryResults(param4, "search_doctype_by_module");
! 		  		 	             while (rsdemo2.next()) {   
  		  		 	 %>
! 		  		 	   <option value="<%=rsdemo2.getString("doctype")%>"><%=rsdemo2.getString("doctype")%></option>
  		  		 	 <%
! 		 	          }
                    %>
                  </select>
                  </font></td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.formDocDesc"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
!                 <input type="text" name="docdesc"  size="20">
                  </font></td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgDate"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
                  <input type="text" name="docdate" readonly value="<%=nowDate%>" size="20" >
                  </font></td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" color="#000000" size="1"><bean:message key="dms.addDocument.msgCreator"/>
                  </font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
                  <input type="text" name="dispcreator"  readonly value="<%=proLast%>, <%=proFirst%>" size="20">
                  <input type="hidden" name="doccreator" value="<%=user_no%>" size="20">
--- 140,184 ----
                  </td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgID"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
                  <input type="text" name="functionid" value="<%=request.getParameter("functionid")%>" size="20">
                  </font></td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgDocType"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
!                 <select name="doctype" onchange="checkSel(this)">
                    <option value=""><bean:message key="dms.addDocument.formSelect"/></option>
                    <%
                      ResultSet rsdemo2 = null;
! 					String[] param4=new String[1];
! 					param4[0] = request.getParameter("function");
! 					rsdemo2 = apptMainBean.queryResults(param4, "search_doctype_by_module");
! 					while (rsdemo2.next()) {
  		  		 	 %>
! 		  		 	   <option value="<%=rsdemo2.getString("doctype")%>" <%=props.getProperty("eDocAddTypeDefault", "").startsWith(rsdemo2.getString("doctype"))?"selected":""%> ><%=rsdemo2.getString("doctype")%></option>
  		  		 	 <%
! 					}
                    %>
                  </select>
                  </font></td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.formDocDesc"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
!                 <input type="text" name="docdesc"  size="20" value="<%=props.getProperty("eDocAddTypeDefault", "")%>" >
                  </font></td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgDate"/></font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
                  <input type="text" name="docdate" readonly value="<%=nowDate%>" size="20" >
                  </font></td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" color="#000000" size="1"><bean:message key="dms.addDocument.msgCreator"/>
                  </font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
                  <input type="text" name="dispcreator"  readonly value="<%=proLast%>, <%=proFirst%>" size="20">
                  <input type="hidden" name="doccreator" value="<%=user_no%>" size="20">
***************
*** 181,192 ****
                  </font></td>
              </tr>
!             <tr> 
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgFileName" /> </font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1"> 
                  <input type="text" name="docfilename" value=""  size="20" >
                  <a href=javascript:ScriptAttach()><bean:message key="dms.addDocument.btnUpload"/></a></font></td>
              </tr>
!             <tr> 
!               <td colspan="2"><font face="Verdana, Arial, Helvetica, sans-serif" color="#0000FF" size="1"><b><i> 
                  <input type="SUBMIT" name="Submit" value="<bean:message key="dms.addDocument.btnSubmit"/>">
                  <input type="button" name="Button" value="<bean:message key="global.btnCancel"/>" onclick="self.close();">
--- 186,197 ----
                  </font></td>
              </tr>
!             <tr>
                <td width="19%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1" color="#000000"><bean:message key="dms.addDocument.msgFileName" /> </font></td>
!               <td width="50%"><font face="Verdana, Arial, Helvetica, sans-serif" size="1">
                  <input type="text" name="docfilename" value=""  size="20" >
                  <a href=javascript:ScriptAttach()><bean:message key="dms.addDocument.btnUpload"/></a></font></td>
              </tr>
!             <tr>
!               <td colspan="2"><font face="Verdana, Arial, Helvetica, sans-serif" color="#0000FF" size="1"><b><i>
                  <input type="SUBMIT" name="Submit" value="<bean:message key="dms.addDocument.btnSubmit"/>">
                  <input type="button" name="Button" value="<bean:message key="global.btnCancel"/>" onclick="self.close();">
***************
*** 199,204 ****
        </td>
      </tr>
-   </form>
  </table>
  </body>
  </html:html>
--- 204,209 ----
        </td>
      </tr>
  </table>
+ </form>
  </body>
  </html:html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx WriteScript.jsp,1.9,1.10

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26933

Modified Files:
	WriteScript.jsp 
Log Message:
Added auto Quantity checkbox



Index: WriteScript.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** WriteScript.jsp	2 May 2005 14:51:21 -0000	1.9
--- WriteScript.jsp	5 May 2005 01:42:39 -0000	1.10
***************
*** 60,63 ****
--- 60,64 ----
  oscar.oscarRx.pageUtil.RxSessionBean bean = (oscar.oscarRx.pageUtil.RxSessionBean)pageContext.findAttribute("bean");
  int specialStringLen = 0;
+ String quan = "";
  %>
  
***************
*** 169,173 ****
--- 170,214 ----
         return true;
      }
+     
+     
+     function calculateDuration(durUnit,durValue){
+        var dur = 1;
+        switch(durUnit){
+             case 'D':{
+                 dur = durValue;
+                 break;
+             }
+             case 'W':{
+                 dur = (durValue * 7);
+                 break;
+             }
+             case 'M':{
+                 dur = (durValue * 30);
+                 break;
+             }
+         }
+         return dur;
+     }
  
+     function calcQuantity(){       
+         var frm = document.forms.RxWriteScriptForm;        
+         var takeMax = frm.takeMax.value;
+         
+         var dailyMax = freqMax[frm.frequencyCode.selectedIndex];
+         var dur = 1;
+                
+         // calculate duration units        
+         dur = calculateDuration(frm.durationUnit.value,frm.duration.value);
+                                         
+         var maxQty = (takeMax * dailyMax * dur);
+                 
+         if(isNaN(maxQty)){
+             
+         }else{                        
+             maxQty = Math.ceil(maxQty);                        
+             return maxQty;
+         }
+     }
+     
      function calcQty(){
          var frm = document.forms.RxWriteScriptForm;
***************
*** 190,208 ****
  
          // calculate duration units
!         switch(frm.durationUnit.value){
!             case 'D':{
!                 dur = frm.duration.value;
!                 break;
!             }
!             case 'W':{
!                 dur = (frm.duration.value * 7);
!                 break;
!             }
!             case 'M':{
!                 dur = (frm.duration.value * 30);
!                 break;
!             }
!         }
!                 
          // calculate quantity
          var minQty = (takeMin * dailyMin * dur);
--- 231,236 ----
  
          // calculate duration units
!         dur = calculateDuration(frm.durationUnit.value,frm.duration.value);
!                         
          // calculate quantity
          var minQty = (takeMin * dailyMin * dur);
***************
*** 217,221 ****
--- 245,251 ----
              frm.sugQtyMin.value = minQty;
              frm.sugQtyMax.value = maxQty;
+             if (frm.autoQty.checked == true){
              frm.quantity.value = frm.sugQtyMax.value;
+             }
              setQuantity();
          }
***************
*** 231,237 ****
          frm.repeat.value = frm.txtRepeat.value;  
  //alert ("q"+calcQtyflag);
!         if (calcQtyflag){
!         writeScriptDisplay();
!         calcQtyflag=true;
          }
      }
--- 261,270 ----
          frm.repeat.value = frm.txtRepeat.value;  
  //alert ("q"+calcQtyflag);
!     //alert(frm.autoQty.checked);
!         if (frm.autoQty.checked == true){
!            if (calcQtyflag){
!               writeScriptDisplay();
!               calcQtyflag=true;
!            }
          }
      }
***************
*** 282,294 ****
                  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;
--- 315,329 ----
                  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{                                   
!                    if (frm.method.options[frm.method.selectedIndex].text != ""){
!                       addWarning("Could not replace word for "+frm.method.options[frm.method.selectedIndex].text);
!                    }
!                 }               
               }             
               var firstDigitStringLen = b.index+b[0].length;
***************
*** 324,328 ****
                    //todo make it like !findU
                  }else{                   
!                    addWarning("Could not find place to put "+frm.unit.options[frm.unit.selectedIndex].text);
                  }
                  
--- 359,365 ----
                    //todo make it like !findU
                  }else{                   
!                    if (frm.unit.options[frm.unit.selectedIndex].text != ""){
!                       addWarning("Could not find place to put "+frm.unit.options[frm.unit.selectedIndex].text);
!                    }
                  }
                  
***************
*** 331,336 ****
                  if (findU){
                    //todo make it like !findU
!                 }else{                   
!                    addWarning("Could not find place to put "+frm.route.options[frm.route.selectedIndex].text);
                  }
                                                  
--- 368,375 ----
                  if (findU){
                    //todo make it like !findU
!                 }else{
!                    if (frm.route.options[frm.route.selectedIndex].text != ""){
!                       addWarning("Could not find place to put "+frm.route.options[frm.route.selectedIndex].text);
!                    }
                  }
                                                  
***************
*** 374,378 ****
                        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);
--- 413,417 ----
                        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;
!                       //alert (betweenFirstAndSecondDigit);
                        frm.special.value = newStr;
                        //alert(newStr);
***************
*** 528,532 ****
  
              // calculate duration units
!             switch(frm2.durationUnit.value){
                  case 'D':{
                      preStr = preStr + " Days";
--- 567,571 ----
  
              // calculate duration units
!             /*switch(frm2.durationUnit.value){
                  case 'D':{
                      preStr = preStr + " Days";
***************
*** 541,545 ****
                      break;
                  }
!             }            
              
              if ( "" == frm2.quantity.value ){              
--- 580,586 ----
                      break;
                  }
!             } 
!            */
!            preStr = preStr + getDurationUnit();
              
              if ( "" == frm2.quantity.value ){              
***************
*** 711,714 ****
--- 752,756 ----
      }
  
+     quan = rx.getQuantity();
      thisForm.setTakeMin(rx.getTakeMinString());
      thisForm.setTakeMax(rx.getTakeMaxString());
***************
*** 717,720 ****
--- 759,763 ----
      thisForm.setDurationUnit(rx.getDurationUnit());
      thisForm.setQuantity(rx.getQuantity());
+     
      thisForm.setRepeat(rx.getRepeat());
      thisForm.setNosubs(rx.getNosubs());
***************
*** 924,931 ****
                              <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>
--- 967,975 ----
                              <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:option value=""></html:option>
                                      </html:select>
                                  </td>
***************
*** 950,954 ****
                                      </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>
--- 994,998 ----
                                      </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>
***************
*** 959,966 ****
                                          <html:option value="drop">Drops</html:option>                                        
                                          <html:option value="patc">Patch</html:option>
!                                         <html:option value="puff">Puffs</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>
--- 1003,1011 ----
                                          <html:option value="drop">Drops</html:option>                                        
                                          <html:option value="patc">Patch</html:option>
!                                         <html:option value="puff">Puffs</html:option>                     
!                                         <html:option value=""></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>
***************
*** 969,973 ****
                                          <html:option value="TOP">TOP.</html:option>
                                          <html:option value="INH">INH</html:option>                                        
!                                         <html:option value="SUPP">SUPP</html:option>                                        
                                      </html:select>
                                      
--- 1014,1019 ----
                                          <html:option value="TOP">TOP.</html:option>
                                          <html:option value="INH">INH</html:option>                                        
!                                         <html:option value="SUPP">SUPP</html:option>                       
!                                         <html:option value=""></html:option>
                                      </html:select>
                                      
***************
*** 1052,1059 ****
                              <tr>
                                  <td colspan=2>
!                                     Quantity:
                                  </td>
                                  <td colspan=2 width=65%>
!                                     <html:text property="quantity" size="8" onchange="javascript:writeScriptDisplay();"   />
  
                                      <input type=button value="<<" onclick="javascript:useQtyMax();" />
--- 1098,1105 ----
                              <tr>
                                  <td colspan=2>
!                                     Quantity: auto<input type="checkbox" name="autoQty" />
                                  </td>
                                  <td colspan=2 width=65%>
!                                     <html:text property="quantity" size="8" onchange="javascript:writeScriptDisplay(); customQty(this.value);" onkeypress="customQty(this.value);" />
  
                                      <input type=button value="<<" onclick="javascript:useQtyMax();" />
***************
*** 1130,1134 ****
                                              <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">
--- 1176,1180 ----
                                              <td valign=top>
                                                  <html:textarea property="special" cols="50" rows="5" />
!                                                 <input type=button value="RD" title="Redraw" onclick="javascript:first = false; writeScriptDisplay(); clearWarning(); fillWarnings();"/>
                                                  <div id="warningDiv" style="display: none;">
                                                     <ul id="warningList">
***************
*** 1291,1297 ****
            }else{  
                  //out.write("calcQtyflag=false;"); 
!           }%>
  
!         
            writeScriptDisplay();
          </script>
--- 1337,1354 ----
            }else{  
                  //out.write("calcQtyflag=false;"); 
!           }
  
!         if (quan == null || quan.equals("")){ quan = "null"; }
!         %>
!          
!          function customQty(quan) {           
!             if (calcQuantity() == quan || quan == null ){
!                 document.forms.RxWriteScriptForm.autoQty.checked = true;
!             }else{
!                 document.forms.RxWriteScriptForm.autoQty.checked = false;
!             }
!          }
!          
!          customQty(<%=quan%>);
            writeScriptDisplay();
          </script>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form/study formVascularTracker.jsp,NONE,1.1

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/study
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29751

Added Files:
	formVascularTracker.jsp 
Log Message:
used to pop up the vascular tracker for study patients



--- NEW FILE: formVascularTracker.jsp ---
<%--  
/*
 * 
 * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
 * This software is published under the GPL GNU General Public License. 
 * This program is free software; you can redistribute it and/or 
 * modify it under the terms of the GNU General Public License 
 * as published by the Free Software Foundation; either version 2 
 * of the License, or (at your option) any later version. * 
 * This program is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
 * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
 * along with this program; if not, write to the Free Software 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
 * 
 * <OSCAR TEAM>
 * 
 * This software was written for the 
 * Department of Family Medicine 
 * McMaster University 
 * Hamilton 
 * Ontario, Canada 
 */
--%>


<%
if(session.getAttribute("user") == null || !( ((String) session.getAttribute("userprofession")).equalsIgnoreCase("doctor") ))
    response.sendRedirect("../../logout.jsp");

//../form/SetupForm.do?formName=VTForm&demographic_no=10091&formId=0&provNo=999998
String demo = request.getParameter("demographic_no") ;
String study_no = request.getParameter("demographic_no"); 
String prov_no = (String) session.getAttribute("user");
String url = "../../form/SetupForm.do?formName=VTForm&demographic_no="+demo+"&study_no="+study_no+"&provNo="+prov_no+"&formId=0";
System.out.println(url);
response.sendRedirect(url );


%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil RxSessionBean.java,1.2,1.3

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15786

Modified Files:
	RxSessionBean.java 
Log Message:
Added try catch block to whole method, this will return null if a  connection to the internet can not be established



Index: RxSessionBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/pageUtil/RxSessionBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RxSessionBean.java	20 Apr 2005 20:46:36 -0000	1.2
--- RxSessionBean.java	2 May 2005 14:57:54 -0000	1.3
***************
*** 155,178 ****
      public RxDrugData.Interaction[] getInteractions(){
         RxDrugData.Interaction[] interactions = null;
!        RxPrescriptionData rxData = new RxPrescriptionData();
!        RxDrugData drugData = new RxDrugData();
!        Vector atcCodes = rxData.getCurrentATCCodesByPatient(this.getDemographicNo());
!        
!        RxPrescriptionData.Prescription rx;                
!        for(int i=0;i<this.getStashSize(); i++) {
!           rx = this.getStashItem(i);
!           atcCodes.add(rx.getAtcCode());
!        }
!        try{        
!           interactions = drugData.getInteractions(atcCodes);
!        }catch(Exception e){
!           e.printStackTrace();
!        }
!        System.out.println("interactions "+interactions.length);
!        for(int i =0 ; i < interactions.length;i++){
!           System.out.println(interactions[i].affectingatc+" "+interactions[i].effect+" "+interactions[i].affectedatc);
!        }
!        //interactions = 
!        Arrays.sort(interactions);
         return interactions;
      }
--- 155,180 ----
      public RxDrugData.Interaction[] getInteractions(){
         RxDrugData.Interaction[] interactions = null;
!        try{
!           RxPrescriptionData rxData = new RxPrescriptionData();
!           RxDrugData drugData = new RxDrugData();
!           Vector atcCodes = rxData.getCurrentATCCodesByPatient(this.getDemographicNo());
! 
!           RxPrescriptionData.Prescription rx;                
!           for(int i=0;i<this.getStashSize(); i++) {
!              rx = this.getStashItem(i);
!              atcCodes.add(rx.getAtcCode());
!           }
!           try{        
!              interactions = drugData.getInteractions(atcCodes);
!           }catch(Exception e){
!              e.printStackTrace();
!           }
!           System.out.println("interactions "+interactions.length);
!           for(int i =0 ; i < interactions.length;i++){
!              System.out.println(interactions[i].affectingatc+" "+interactions[i].effect+" "+interactions[i].affectedatc);
!           }
!           //interactions = 
!           Arrays.sort(interactions);
!        }catch(Exception e2){}                 
         return interactions;
      }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx WriteScript.jsp,1.8,1.9

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14237

Modified Files:
	WriteScript.jsp 
Log Message:
changed else to else if for checking if interactions service was done.
There was a bug that would give the message if interactions was 0



Index: WriteScript.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/WriteScript.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** WriteScript.jsp	2 May 2005 14:03:08 -0000	1.8
--- WriteScript.jsp	2 May 2005 14:51:21 -0000	1.9
***************
*** 1164,1168 ****
                          <!-- peice Went Here -->
                          
!                         <%RxDrugData.Interaction[] interactions =  (RxDrugData.Interaction[]) bean.getInteractions();                                                  
                            if (interactions != null && interactions.length > 0){ 
                                System.out.println("interactions.length "+interactions.length);
--- 1164,1168 ----
                          <!-- peice Went Here -->
                          
!                         <%RxDrugData.Interaction[] interactions =  (RxDrugData.Interaction[]) bean.getInteractions();
                            if (interactions != null && interactions.length > 0){ 
                                System.out.println("interactions.length "+interactions.length);
***************
*** 1172,1176 ****
                               </div>
                          <%   }
!                           }else{ %>
                            <div>Drug to Drug Interaction Service not available</div>                          
                          <%}%>  
--- 1172,1176 ----
                               </div>
                          <%   }
!                           }else if(interactions == null){ %>
                            <div>Drug to Drug Interaction Service not available</div>                          
                          <%}%>  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data RxPrescriptionData.java,1.7,1.8

[Jay G. <jay...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12578

Modified Files:
	RxPrescriptionData.java 
Log Message:
fixed sql update statement for favorites table.



Index: RxPrescriptionData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** RxPrescriptionData.java	20 Apr 2005 20:30:17 -0000	1.7
--- RxPrescriptionData.java	2 May 2005 14:45:47 -0000	1.8
***************
*** 1634,1645 ****
                  + "prn = " + this.getPrnInt() + ", "
                  + "special = '" + RxUtil.replace(this.getSpecial(), "'", "") + "', "
!                 + "GN = '"+this.getGN()+"', '"
!                 + "ATC = '"+this.getAtcCode()+"', '"
!                 + "regional_identifier = '"+this.getRegionalIdentifier()+"', '"
!                 + "unit = '"+this.getUnit()+"', '" 
                  + "method = '"+this.getMethod()+"', "
                  + "route = '"+this.getRoute()+"' "
                  + "WHERE favoriteid = " + this.getFavoriteId();
                  
                  db.RunSQL(sql);
                  
--- 1634,1646 ----
                  + "prn = " + this.getPrnInt() + ", "
                  + "special = '" + RxUtil.replace(this.getSpecial(), "'", "") + "', "
!                 + "GN = '"+this.getGN()+"', "
!                 + "ATC = '"+this.getAtcCode()+"', "
!                 + "regional_identifier = '"+this.getRegionalIdentifier()+"', "
!                 + "unit = '"+this.getUnit()+"', " 
                  + "method = '"+this.getMethod()+"', "
                  + "route = '"+this.getRoute()+"' "
                  + "WHERE favoriteid = " + this.getFavoriteId();
                  
+                 System.out.println(sql);
                  db.RunSQL(sql);