oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/appointment addappointment.jsp,1.14,1.15

[joel <jl...@us...>]

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

Modified Files:
	addappointment.jsp 
Log Message:
DIsabled booking of inactive,deceased, or fired patients

Index: addappointment.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/appointment/addappointment.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** addappointment.jsp	3 Oct 2004 14:08:32 -0000	1.14
--- addappointment.jsp	9 Feb 2005 07:31:40 -0000	1.15
***************
*** 1,402 ****
  <%
    if(session.getValue("user") == null)    response.sendRedirect("../logout.jsp");
    String curProvider_no = request.getParameter("provider_no");
    String curUser_no = (String) session.getAttribute("user");
    String userfirstname = (String) session.getAttribute("userfirstname");
    String userlastname = (String) session.getAttribute("userlastname");
    //String curDemoNo = request.getParameter("demographic_no")!=null?request.getParameter("demographic_no"):"";
    //String curDemoName = request.getParameter("demographic_name")!=null?request.getParameter("demographic_name"):"";  
    int everyMin=Integer.parseInt(((String) session.getAttribute("everymin")).trim());
  
    boolean bFirstDisp=true; //this is the first time to display the window
    boolean bFromWL=false; //this is from waiting list page
    if (request.getParameter("bFirstDisp")!=null) bFirstDisp= (request.getParameter("bFirstDisp")).equals("true");
    if (request.getParameter("demographic_no")!=null) bFromWL=true;
    String duration = request.getParameter("duration")!=null?(request.getParameter("duration").equals(" ")||request.getParameter("duration").equals("")||request.getParameter("duration").equals("null")?(""+everyMin) :request.getParameter("duration")):(""+everyMin) ;
  %>
  <%@ page import="java.util.*, java.sql.*, oscar.*, java.text.*, java.lang.*,java.net.*" errorPage="../appointment/errorpage.jsp" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
! <jsp:useBean id="addApptBean" class="oscar.AppointmentMainBean" scope="page" />
! <%@ include file="../admin/dbconnection.jsp" %>
  <% 
    String [][] dbQueries=new String[][] { 
      {"search_appt", "select count(appointment_no) AS n from appointment where appointment_date = ? and provider_no = ? and status !='C' and ((start_time>= ? and start_time<= ?) or (end_time>= ? and end_time<= ?) or (start_time<= ? and end_time>= ?) )" }, 
      {"search_demographiccust_alert", "select cust3 from demographiccust where demographic_no = ? " }, 
      {"search_demographic_statusroster", "select patient_status,roster_status from demographic where demographic_no = ? " }, 
    };
    addApptBean.doConfigure(dbParams,dbQueries);
  %>
  <!--  
  /*
   * 
   * 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 
   */
- -->
- <html:html locale="true">
- <head><title><bean:message key="appointment.addappointment.title"/></title>
  
  <script language="javascript">
  <!-- start javascript ---- check to see if it is really empty in database
  function setfocus() {
  	this.focus();
    document.ADDAPPT.keyword.focus();
    document.ADDAPPT.keyword.select();
  }
  function upCaseCtrl(ctrl) {
  	ctrl.value = ctrl.value.toUpperCase();
  }
  function onBlockFieldFocus(obj) {
    obj.blur();
    document.ADDAPPT.keyword.focus();
    document.ADDAPPT.keyword.select();
    window.alert("<bean:message key="Appointment.msgFillNameField"/>");
  }
  function checkTypeNum(typeIn) {
  	var typeInOK = true;
  	var i = 0;
  	var length = typeIn.length;
  	var ch;
  	// walk through a string and find a number
  	if (length>=1) {
  	  while (i <  length) {
  		  ch = typeIn.substring(i, i+1);
  		  if (ch == ":") { i++; continue; }
  		  if ((ch < "0") || (ch > "9") ) {
  			  typeInOK = false;
  			  break;
  		  }
  	    i++;
      }
  	} else typeInOK = false;
  	return typeInOK;
  }
  function checkTimeTypeIn(obj) {
    if(!checkTypeNum(obj.value) ) {
  	  alert ("<bean:message key="Appointment.msgFillTimeField"/>");
  	} else {
  	  if(obj.value.indexOf(':')==-1) {
  	    if(obj.value.length < 3) alert("<bean:message key="Appointment.msgFillValidTimeField"/>");
  	    obj.value = obj.value.substring(0, obj.value.length-2 )+":"+obj.value.substring( obj.value.length-2 );
  	  } 
  	}
  }
  function calculateEndTime() {
    var stime = document.ADDAPPT.start_time.value;
    var vlen = stime.indexOf(':')==-1?1:2;
   
    var shour = stime.substring(0,2) ;
    var smin = stime.substring(stime.length-vlen) ;
    var duration = document.ADDAPPT.duration.value ;
    if(eval(duration) == 0) { duration =1; }
    if(eval(duration) < 0) { duration = Math.abs(duration) ; }
    
    var lmin = eval(smin)+eval(duration)-1 ;
    var lhour = parseInt(lmin/60);
    
    if((lmin) > 59) {
      shour = eval(shour) + eval(lhour);
      shour = shour<10?("0"+shour):shour;
      smin = lmin - 60*lhour;
    } else {
      smin = lmin;
    }
    smin = smin<10?("0"+ smin):smin;
    document.ADDAPPT.end_time.value = shour +":"+ smin;
    
    if(shour > 23) {
      alert("<bean:message key="Appointment.msgCheckDuration"/>");
      return false;
    }
    
    //no show
    if(document.ADDAPPT.keyword.value.substring(0,1)=="." && document.ADDAPPT.demographic_no.value=="" ) {
      document.ADDAPPT.status.value = 'N' ;
    }
    return true;
  }
  
  function onButRepeat() {
  	document.forms[0].action = "appointmentrepeatbooking.jsp" ;
  	if (calculateEndTime()) { document.forms[0].submit(); }
  }
  // stop javascript -->
- </script>
  
  </head>
  <meta http-equiv="Cache-Control" content="no-cache" >
- 
  <%
    SimpleDateFormat fullform = new SimpleDateFormat ("yyyy-MM-dd HH:mm");
    SimpleDateFormat inform = new SimpleDateFormat ("yyyy-MM-dd");
    SimpleDateFormat outform = new SimpleDateFormat ("EEE");
    java.util.Date apptDate = fullform.parse(bFirstDisp?(request.getParameter("year")+"-"+request.getParameter("month")+"-"+request.getParameter("day")+" "+ request.getParameter("start_time")):(request.getParameter("appointment_date")+" "+ request.getParameter("start_time") )) ;
    String dateString1 = outform.format(apptDate );
    String dateString2 = inform.format(apptDate );
  
  	GregorianCalendar caltime =new GregorianCalendar( );
  	caltime.setTime(apptDate);
  	caltime.add(caltime.MINUTE, Integer.parseInt(duration)-1 );
  
    String [] param = new String[8] ;
    param[0] = dateString2;
    param[1] = curProvider_no;
    param[2] = request.getParameter("start_time");
    param[3] = caltime.get(Calendar.HOUR_OF_DAY) +":"+ caltime.get(Calendar.MINUTE);
  //	System.out.println(param[3] );
    param[4] = param[2];
    param[5] = param[3];
    param[6] = param[2];
    param[7] = param[3];
  	ResultSet rsdemo = addApptBean.queryResults(param, "search_appt");
- 	int apptnum = rsdemo.next()?rsdemo.getInt("n"):0 ;
-   String deepcolor = apptnum==0?"#CCCCFF":"gold", weakcolor = apptnum==0?"#EEEEFF":"ivory";
- %>
- <body  background="../images/gray_bg.jpg" bgproperties="fixed"  onLoad="setfocus()" topmargin="0"  leftmargin="0" rightmargin="0">
- <FORM NAME = "ADDAPPT" METHOD="post" ACTION="appointmentcontrol.jsp" onsubmit="return(calculateEndTime())">
- <INPUT TYPE="hidden" NAME="displaymode" value="">
  
! <table border=0 cellspacing=0 cellpadding=0 width="100%" >
!   <tr bgcolor="<%=deepcolor%>"><th><font face="Helvetica"><bean:message key="appointment.addappointment.msgMainLabel"/></font></th></tr>
! </table>
  
! <table border="0" cellpadding="0" cellspacing="0" width="100%">
!   <tr><td width="100%">
!   
!         <table BORDER="0" CELLPADDING="0" CELLSPACING="1" WIDTH="100%" BGCOLOR="#C0C0C0">
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formDate"/><font size='-1' color='brown'>(<%=dateString1%>)</font>:</font></div>
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="appointment_date" VALUE="<%=dateString2%>" WIDTH="25" HEIGHT="20" border="0" hspace="2">
!             </td>
!             <td width="5%" ></td>
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formStatus"/>:</font></div>
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="status" VALUE="<%=bFirstDisp?"t":request.getParameter("status").equals("")?"":request.getParameter("status")%>"  WIDTH="25" HEIGHT="20" border="0" hspace="2">
!             </td>
!           </tr>
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> 
!               <div align="right"><font face="arial"><font face="arial"><bean:message key="Appointment.formStartTime"/>:</font></font></div>
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="start_time" VALUE="<%=request.getParameter("start_time")%>" WIDTH="25" HEIGHT="20" border="0"  onChange="checkTimeTypeIn(this)">
!             </td>
!             <td width="5%" ></td>
!             <td width="20%" > 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formType"/>:</font></div>
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="type" VALUE="<%=bFirstDisp?"":request.getParameter("type").equals("")?"":request.getParameter("type")%>" WIDTH="25" HEIGHT="20" border="0" hspace="2">
!             </td>
!           </tr>
!           <tr valign="middle" BGCOLOR="#EEEEFF" > 
!             <td width="20%"  align="right"> 
!               <font face="arial"><bean:message key="Appointment.formDuration"/>:</font>
!               <!--font face="arial"> End Time :</font-->
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="duration" VALUE="<%=duration%>" WIDTH="25" HEIGHT="20" border="0" hspace="2" >
!               <INPUT TYPE="hidden" NAME="end_time" VALUE="<%=request.getParameter("end_time")%>" WIDTH="25" HEIGHT="20" border="0" hspace="2"  onChange="checkTimeTypeIn(this)">
!             </td>
!             <td width="5%" ></td>
!             <td width="20%"> 
!               <div align="right"></div>
!             </td>
!             <td width="20%">&nbsp; </td>
!           </tr>
!           <tr valign="middle" BGCOLOR="#CCCCFF"> 
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="appointment.addappointment.formSurName"/>:</font></div>
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="keyword" VALUE="<%=(bFirstDisp && !bFromWL)?"":request.getParameter("name").equals("")?session.getAttribute("appointmentname")==null?"":session.getAttribute("appointmentname"):request.getParameter("name")%>" HEIGHT="20" border="0" hspace="2" width="25" tabindex="1">
!             </td>
!             <td width="5%"></td>
!             <td width="20%"> 
!               <div align="right"><font face="arial">
! 				      <INPUT TYPE="hidden" NAME="orderby" VALUE="last_name, first_name" >
! 				      <INPUT TYPE="hidden" NAME="search_mode" VALUE="search_name" >
! 				      <INPUT TYPE="hidden" NAME="originalpage" VALUE="../appointment/addappointment.jsp" >
! 				      <INPUT TYPE="hidden" NAME="limit1" VALUE="0" >
! 				      <INPUT TYPE="hidden" NAME="limit2" VALUE="5" >
! 				      <INPUT TYPE="hidden" NAME="ptstatus" VALUE="active">
!               <!--input type="hidden" name="displaymode" value="Search " -->
!               <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Search '" VALUE="<bean:message key="appointment.addappointment.btnSearch"/>"></font></div>
!             </td>
!             <td width="20%" > 
!               <input type="TEXT" name="demographic_no" ONFOCUS="onBlockFieldFocus(this)" readonly value="<%=(bFirstDisp && !bFromWL)?"":request.getParameter("demographic_no").equals("")?"":request.getParameter("demographic_no")%>" width="25" height="20" border="0" hspace="2">
!             </td>
!           </tr>
!           <tr valign="middle" BGCOLOR="#CCCCFF"> 
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formReason"/>:</font></div>
!             </td>
!             <td width="20%"><font face="Times New Roman">
!               <textarea name="reason"  tabindex="2" rows="2" wrap="virtual" cols="18"><%=bFirstDisp?"":request.getParameter("reason").equals("")?"":request.getParameter("reason")%></textarea>
!               </font> </TD>
!             <td width="5%"><font face="Times New Roman"> </font></td>
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formNotes"/>:</font></div>
!             </td>
!             <td width="20%"><font face="Times New Roman">
!               <textarea name="notes"  tabindex="3" rows="2" wrap="virtual" cols="18"><%=bFirstDisp?"":request.getParameter("notes").equals("")?"":request.getParameter("notes")%></textarea>
!               </font> </td>
!           </tr>
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formLocation"/>:</font></div>
!             </td>
!             <td width="20%"> 
!               <input type="TEXT" name="location"  tabindex="4" value="<%=bFirstDisp?"":request.getParameter("location").equals("")?"":request.getParameter("location")%>" width="25" height="20" border="0" hspace="2">
!             </TD>
!             <td width="5%" ></td>
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formResources"/>:</font></div>
!             </td>
!             <td width="20%"> 
!               <input type="TEXT" name="resources"  tabindex="5" value="<%=bFirstDisp?"":request.getParameter("resources").equals("")?"":request.getParameter("resources")%>" width="25" height="20" border="0" hspace="2">
!             </td>
!           </tr>
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formCreator"/>:</font></div>
!             </td>
!             <td width="20%"> 
!               <INPUT TYPE="TEXT" NAME="user_id" readonly VALUE='<%=bFirstDisp?(userlastname+", "+userfirstname):request.getParameter("user_id").equals("")?"Unknown":request.getParameter("user_id")%>' WIDTH="25" HEIGHT="20" border="0" hspace="2">
!             </td>
!             <td width="5%" ></td>
!             <td width="20%"> 
!               <div align="right"><font face="arial"><bean:message key="Appointment.formDateTime"/>:</font></div>
!             </td>
!             <td width="20%"> <%
! 				GregorianCalendar now=new GregorianCalendar();
!                         GregorianCalendar cal = (GregorianCalendar) now.clone();
!                         cal.add(cal.DATE, 1);
! 				String strDateTime=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)+":"+now.get(Calendar.SECOND);
! 			%> 
! 			
!               <INPUT TYPE="TEXT" NAME="createdatetime" readonly VALUE="<%=strDateTime%>" WIDTH="25" HEIGHT="20" border="0" hspace="2">
!               <INPUT TYPE="hidden" NAME="provider_no" VALUE="<%=curProvider_no%>">
!               <INPUT TYPE="hidden" NAME="dboperation" VALUE="add_apptrecord">
!               <INPUT TYPE="hidden" NAME="creator" VALUE="<%=userlastname+", "+userfirstname%>">
!               <INPUT TYPE="hidden" NAME="remarks" VALUE="">
!             </td>
!           </tr>
!         </table>
! 	
! 	</td></tr>
! </table>
  
! <table width="100%" BGCOLOR="<%=deepcolor%>">
!   <tr>
!     <TD nowrap>
!         <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Group Appt'" VALUE="<bean:message key="appointment.addappointment.btnGroupAppt"/>" >
  <%
!   if(dateString2.equals( inform.format(inform.parse(now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH))) ) 
!      || dateString2.equals( inform.format(inform.parse(cal.get(Calendar.YEAR)+"-"+(cal.get(Calendar.MONTH)+1)+"-"+cal.get(Calendar.DAY_OF_MONTH))) ) ) {
!     org.apache.struts.util.MessageResources resources = org.apache.struts.util.MessageResources.getMessageResources("oscarResources");
!     %><INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Add Appt & PrintPreview'" VALUE="<bean:message key='appointment.addappointment.btnAddApptPrintPreview'/>"><%
!   }
! %>        
!         <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Add Appointment'" tabindex="6" VALUE="<bean:message key="appointment.addappointment.btnAddAppointment"/>">
!       </TD>
!     <TD></TD>
!     <TD align="right"><INPUT TYPE = "RESET" VALUE = "<bean:message key="appointment.addappointment.btnCancel"/>" onClick="window.close();">
! 	<input type="button" value="<bean:message key="appointment.addappointment.btnRepeat"/>" onclick="onButRepeat()">
!     </TD>
!   </tr>
! </TABLE>
! 
! </FORM>
  <%
    //to show Alert msg
    if (!bFirstDisp && !request.getParameter("demographic_no").equals("")) {
  	  rsdemo = addApptBean.queryResults(request.getParameter("demographic_no"), "search_demographic_statusroster");
        while (rsdemo.next()) { 
! 		  String patientStatus = rsdemo.getString("patient_status");
              if (patientStatus == null || patientStatus.equalsIgnoreCase("AC")) {
                 patientStatus = "";
              }
              String rosterStatus = rsdemo.getString("roster_status");
              if (rosterStatus == null || rosterStatus.equalsIgnoreCase("RO")) {
                 rosterStatus = "";
              }
  /*          patientStatus = (patientStatus != null && !patientStatus.equalsIgnoreCase("AC")) ? 
  			  (" Patient Status:<font color='yellow'>" + patientStatus + "</font>" ) : "";
  
  		  String rosterStatus = rsdemo.getString("roster_status");
            rosterStatus = (rosterStatus != null && !rosterStatus.equalsIgnoreCase("RO")) ?
  			  (" Roster Status:<font color='yellow'>" + rosterStatus + "</font> ") : "";
  */
  
  		  if(!patientStatus.equals("") || !rosterStatus.equals("") ) {
                String rsbgcolor = "BGCOLOR=\"orange\"" ;
  			  String exp = " null-undefined\n IN-inactive ID-deceased OP-out patient\n NR-not signed\n FS-fee for service\n TE-terminated\n SP-self pay\n TP-third party";
! %>
! <table width="98%" <%=rsbgcolor%> border=0 align='center'>
!   <tr><td><font color='blue' title='<%=exp%>'> <b><bean:message key="Appointment.msgPatientStatus"/>:&nbsp;<font color='yellow'><%=patientStatus%></font>&nbsp;<bean:message key="Appointment.msgRosterStatus"/>:&nbsp;<font color='yellow'><%=rosterStatus%></font></b></td>
!   </tr>
! </table>
  <% 
  	      }
        }
  	  rsdemo = addApptBean.queryResults(request.getParameter("demographic_no"), "search_demographiccust_alert");
        while (rsdemo.next()) { 
            if(rsdemo.getString("cust3")!=null && !rsdemo.getString("cust3").equals("") ) {
- %>
- <p>
- <table width="98%" BGCOLOR="yellow" border=1 align='center'>
-   <tr><td><font color='red'><bean:message key="Appointment.formAlert"/>: <b><%=rsdemo.getString("cust3")%></b></td>
-   </tr>
- </table>
  
  <%    
            }
        }
        addApptBean.closePstmtConn();
    }
    
    if(apptnum!=0) {
! %>
! <table width="98%" BGCOLOR="<%=deepcolor%>" border=1 align='center'>
!   <tr>
! <%--    <TH><font color='red'><%=apptnum>1?"Double ++ ":"Double"%> Booking</font></TH>--%>
!     <TH><font color='red'>
!     <% if(apptnum>1) {
!          %><bean:message key='appointment.addappointment.msgBooking'/><%
         } else {
!           %><bean:message key='appointment.addappointment.msgDoubleBooking'/><%
         }
-      %></font></TH>
-   </tr>
- </TABLE>
  
! <% } %>
  
  </body>
! </html:html>
--- 1,573 ----
  <%
+ 
    if(session.getValue("user") == null)    response.sendRedirect("../logout.jsp");
+ 
    String curProvider_no = request.getParameter("provider_no");
+ 
    String curUser_no = (String) session.getAttribute("user");
+ 
    String userfirstname = (String) session.getAttribute("userfirstname");
+ 
    String userlastname = (String) session.getAttribute("userlastname");
+ 
    //String curDemoNo = request.getParameter("demographic_no")!=null?request.getParameter("demographic_no"):"";
+ 
    //String curDemoName = request.getParameter("demographic_name")!=null?request.getParameter("demographic_name"):"";  
+ 
    int everyMin=Integer.parseInt(((String) session.getAttribute("everymin")).trim());
  
+ 
+ 
    boolean bFirstDisp=true; //this is the first time to display the window
+ 
    boolean bFromWL=false; //this is from waiting list page
+ 
    if (request.getParameter("bFirstDisp")!=null) bFirstDisp= (request.getParameter("bFirstDisp")).equals("true");
+ 
    if (request.getParameter("demographic_no")!=null) bFromWL=true;
+ 
    String duration = request.getParameter("duration")!=null?(request.getParameter("duration").equals(" ")||request.getParameter("duration").equals("")||request.getParameter("duration").equals("null")?(""+everyMin) :request.getParameter("duration")):(""+everyMin) ;
+ 
  %>
  <%@ page import="java.util.*, java.sql.*, oscar.*, java.text.*, java.lang.*,java.net.*" errorPage="../appointment/errorpage.jsp" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
! <jsp:useBean id="addApptBean" class="oscar.AppointmentMainBean" scope="page" /><%@ include file="../admin/dbconnection.jsp" %>
  <% 
+ 
    String [][] dbQueries=new String[][] { 
+ 
      {"search_appt", "select count(appointment_no) AS n from appointment where appointment_date = ? and provider_no = ? and status !='C' and ((start_time>= ? and start_time<= ?) or (end_time>= ? and end_time<= ?) or (start_time<= ? and end_time>= ?) )" }, 
+ 
      {"search_demographiccust_alert", "select cust3 from demographiccust where demographic_no = ? " }, 
+ 
      {"search_demographic_statusroster", "select patient_status,roster_status from demographic where demographic_no = ? " }, 
+ 
    };
+ 
    addApptBean.doConfigure(dbParams,dbQueries);
+ 
  %>
  <!--  
+ 
  /*
+ 
   * 
+ 
   * 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 
+ 
   */
  
+ -->
+ <head>
+ <title><bean:message key="appointment.addappointment.title"/></title>
  <script language="javascript">
+ 
  <!-- start javascript ---- check to see if it is really empty in database
+ 
  function setfocus() {
+ 
  	this.focus();
+ 
    document.ADDAPPT.keyword.focus();
+ 
    document.ADDAPPT.keyword.select();
+ 
  }
+ 
  function upCaseCtrl(ctrl) {
+ 
  	ctrl.value = ctrl.value.toUpperCase();
+ 
  }
+ 
  function onBlockFieldFocus(obj) {
+ 
    obj.blur();
+ 
    document.ADDAPPT.keyword.focus();
+ 
    document.ADDAPPT.keyword.select();
+ 
    window.alert("<bean:message key="Appointment.msgFillNameField"/>");
+ 
  }
+ 
  function checkTypeNum(typeIn) {
+ 
  	var typeInOK = true;
+ 
  	var i = 0;
+ 
  	var length = typeIn.length;
+ 
  	var ch;
+ 
  	// walk through a string and find a number
+ 
  	if (length>=1) {
+ 
  	  while (i <  length) {
+ 
  		  ch = typeIn.substring(i, i+1);
+ 
  		  if (ch == ":") { i++; continue; }
+ 
  		  if ((ch < "0") || (ch > "9") ) {
+ 
  			  typeInOK = false;
+ 
  			  break;
+ 
  		  }
+ 
  	    i++;
+ 
      }
+ 
  	} else typeInOK = false;
+ 
  	return typeInOK;
+ 
  }
+ 
  function checkTimeTypeIn(obj) {
+ 
    if(!checkTypeNum(obj.value) ) {
+ 
  	  alert ("<bean:message key="Appointment.msgFillTimeField"/>");
+ 
  	} else {
+ 
  	  if(obj.value.indexOf(':')==-1) {
+ 
  	    if(obj.value.length < 3) alert("<bean:message key="Appointment.msgFillValidTimeField"/>");
+ 
  	    obj.value = obj.value.substring(0, obj.value.length-2 )+":"+obj.value.substring( obj.value.length-2 );
+ 
  	  } 
+ 
  	}
+ 
  }
+ 
  function calculateEndTime() {
+ 
    var stime = document.ADDAPPT.start_time.value;
+ 
    var vlen = stime.indexOf(':')==-1?1:2;
+ 
   
+ 
    var shour = stime.substring(0,2) ;
+ 
    var smin = stime.substring(stime.length-vlen) ;
+ 
    var duration = document.ADDAPPT.duration.value ;
+ 
    if(eval(duration) == 0) { duration =1; }
+ 
    if(eval(duration) < 0) { duration = Math.abs(duration) ; }
+ 
    
+ 
    var lmin = eval(smin)+eval(duration)-1 ;
+ 
    var lhour = parseInt(lmin/60);
+ 
    
+ 
    if((lmin) > 59) {
+ 
      shour = eval(shour) + eval(lhour);
+ 
      shour = shour<10?("0"+shour):shour;
+ 
      smin = lmin - 60*lhour;
+ 
    } else {
+ 
      smin = lmin;
+ 
    }
+ 
    smin = smin<10?("0"+ smin):smin;
+ 
    document.ADDAPPT.end_time.value = shour +":"+ smin;
+ 
    
+ 
    if(shour > 23) {
+ 
      alert("<bean:message key="Appointment.msgCheckDuration"/>");
+ 
      return false;
+ 
    }
+ 
    
+ 
    //no show
+ 
    if(document.ADDAPPT.keyword.value.substring(0,1)=="." && document.ADDAPPT.demographic_no.value=="" ) {
+ 
      document.ADDAPPT.status.value = 'N' ;
+ 
    }
+ 
    return true;
+ 
  }
  
+ 
+ 
  function onButRepeat() {
+ 
  	document.forms[0].action = "appointmentrepeatbooking.jsp" ;
+ 
  	if (calculateEndTime()) { document.forms[0].submit(); }
+ 
  }
+ 
  // stop javascript -->
  
+ </script>
  </head>
+ <html:html locale="true">
  <meta http-equiv="Cache-Control" content="no-cache" >
  <%
+ 
    SimpleDateFormat fullform = new SimpleDateFormat ("yyyy-MM-dd HH:mm");
+ 
    SimpleDateFormat inform = new SimpleDateFormat ("yyyy-MM-dd");
+ 
    SimpleDateFormat outform = new SimpleDateFormat ("EEE");
+ 
    java.util.Date apptDate = fullform.parse(bFirstDisp?(request.getParameter("year")+"-"+request.getParameter("month")+"-"+request.getParameter("day")+" "+ request.getParameter("start_time")):(request.getParameter("appointment_date")+" "+ request.getParameter("start_time") )) ;
+ 
    String dateString1 = outform.format(apptDate );
+ 
    String dateString2 = inform.format(apptDate );
  
+ 
+ 
  	GregorianCalendar caltime =new GregorianCalendar( );
+ 
  	caltime.setTime(apptDate);
+ 
  	caltime.add(caltime.MINUTE, Integer.parseInt(duration)-1 );
  
+ 
+ 
    String [] param = new String[8] ;
+ 
    param[0] = dateString2;
+ 
    param[1] = curProvider_no;
+ 
    param[2] = request.getParameter("start_time");
+ 
    param[3] = caltime.get(Calendar.HOUR_OF_DAY) +":"+ caltime.get(Calendar.MINUTE);
+ 
  //	System.out.println(param[3] );
+ 
    param[4] = param[2];
+ 
    param[5] = param[3];
+ 
    param[6] = param[2];
+ 
    param[7] = param[3];
+ 
  	ResultSet rsdemo = addApptBean.queryResults(param, "search_appt");
  
! 	int apptnum = rsdemo.next()?rsdemo.getInt("n"):0 ;
  
!   String deepcolor = apptnum==0?"#CCCCFF":"gold", weakcolor = apptnum==0?"#EEEEFF":"ivory";
  
! %>
! <body  background="../images/gray_bg.jpg" bgproperties="fixed"  onLoad="setfocus()" topmargin="0"  leftmargin="0" rightmargin="0"> 
  <%
! String patientStatus = "";
! String disabled="";
! %>
  <%
+ 
    //to show Alert msg
+ 
    if (!bFirstDisp && !request.getParameter("demographic_no").equals("")) {
+ 
  	  rsdemo = addApptBean.queryResults(request.getParameter("demographic_no"), "search_demographic_statusroster");
+ 
        while (rsdemo.next()) { 
! 
!             patientStatus = rsdemo.getString("patient_status");
! 
              if (patientStatus == null || patientStatus.equalsIgnoreCase("AC")) {
+ 
                 patientStatus = "";
+ 
+ 
+             }
+ 	         else if (patientStatus.equalsIgnoreCase("FI")||patientStatus.equalsIgnoreCase("DE")||patientStatus.equalsIgnoreCase("IN")) {
+     
+                disabled = "disabled";
+ 
              }
+ 	
              String rosterStatus = rsdemo.getString("roster_status");
+ 
              if (rosterStatus == null || rosterStatus.equalsIgnoreCase("RO")) {
+ 
                 rosterStatus = "";
+ 
              }
+ 
  /*          patientStatus = (patientStatus != null && !patientStatus.equalsIgnoreCase("AC")) ? 
+ 
  			  (" Patient Status:<font color='yellow'>" + patientStatus + "</font>" ) : "";
  
+ 
+ 
  		  String rosterStatus = rsdemo.getString("roster_status");
+ 
            rosterStatus = (rosterStatus != null && !rosterStatus.equalsIgnoreCase("RO")) ?
+ 
  			  (" Roster Status:<font color='yellow'>" + rosterStatus + "</font> ") : "";
+ 
  */
  
+ 
+ 
  		  if(!patientStatus.equals("") || !rosterStatus.equals("") ) {
+ 
                String rsbgcolor = "BGCOLOR=\"orange\"" ;
+ 
  			  String exp = " null-undefined\n IN-inactive ID-deceased OP-out patient\n NR-not signed\n FS-fee for service\n TE-terminated\n SP-self pay\n TP-third party";
! 
! %> 
! <table width="98%" <%=rsbgcolor%> border=0 align='center'> 
!   <tr> 
!     <td><font color='blue' title='<%=exp%>'> <b><bean:message key="Appointment.msgPatientStatus"/>:&nbsp;<font color='yellow'><%=patientStatus%></font>&nbsp;<bean:message key="Appointment.msgRosterStatus"/>:&nbsp;<font color='yellow'><%=rosterStatus%></font></b></td> 
!   </tr> 
! </table> 
  <% 
+ 
  	      }
+ 
        }
+ 
  	  rsdemo = addApptBean.queryResults(request.getParameter("demographic_no"), "search_demographiccust_alert");
+ 
        while (rsdemo.next()) { 
+ 
            if(rsdemo.getString("cust3")!=null && !rsdemo.getString("cust3").equals("") ) {
  
+ %> 
+ <p>  
+ <table width="98%" BGCOLOR="yellow" border=1 align='center'> 
+   <tr> 
+     <td><font color='red'><bean:message key="Appointment.formAlert"/>: <b><%=rsdemo.getString("cust3")%></b></td> 
+   </tr> 
+ </table> 
  <%    
+ 
            }
+ 
        }
+ 
        addApptBean.closePstmtConn();
+ 
    }
+ 
    
+ 
    if(apptnum!=0) {
! 
! %> 
! <table width="98%" BGCOLOR="<%=deepcolor%>" border=1 align='center'> 
!   <tr> 
!     <%--    <TH><font color='red'><%=apptnum>1?"Double ++ ":"Double"%> Booking</font></TH>--%> 
!     <TH><font color='red'> 
!       <% if(apptnum>1) {
! 
!          %> 
!       <bean:message key='appointment.addappointment.msgBooking'/> 
!       <%
! 
         } else {
! 
!           %> 
!       <bean:message key='appointment.addappointment.msgDoubleBooking'/> 
!       <%
! 
         }
  
!      %> 
!       </font></TH> 
!   </tr> 
! </TABLE> 
! <% } %> 
! <FORM NAME = "ADDAPPT" METHOD="post" ACTION="appointmentcontrol.jsp" onsubmit="return(calculateEndTime())"> 
!   <INPUT TYPE="hidden" NAME="displaymode" value=""> 
!   <table border=0 cellspacing=0 cellpadding=0 width="100%" > 
!     <tr bgcolor="<%=deepcolor%>"> 
!       <th><font face="Helvetica"><bean:message key="appointment.addappointment.msgMainLabel"/></font></th> 
!     </tr> 
!   </table> 
!   <table border="0" cellpadding="0" cellspacing="0" width="100%"> 
!     <tr> 
!       <td width="100%"> <table BORDER="0" CELLPADDING="0" CELLSPACING="1" WIDTH="100%" BGCOLOR="#C0C0C0"> 
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formDate"/><font size='-1' color='brown'>(<%=dateString1%>)</font>:</font></div></td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="appointment_date" VALUE="<%=dateString2%>" WIDTH="25" HEIGHT="20" border="0" hspace="2"> </td> 
!             <td width="5%" ></td> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formStatus"/>:</font></div></td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="status" VALUE="<%=bFirstDisp?"t":request.getParameter("status").equals("")?"":request.getParameter("status")%>"  WIDTH="25" HEIGHT="20" border="0" hspace="2"> </td> 
!           </tr> 
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> <div align="right"><font face="arial"><font face="arial"><bean:message key="Appointment.formStartTime"/>:</font></font></div></td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="start_time" VALUE="<%=request.getParameter("start_time")%>" WIDTH="25" HEIGHT="20" border="0"  onChange="checkTimeTypeIn(this)"> </td> 
!             <td width="5%" ></td> 
!             <td width="20%" > <div align="right"><font face="arial"><bean:message key="Appointment.formType"/>:</font></div></td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="type" VALUE="<%=bFirstDisp?"":request.getParameter("type").equals("")?"":request.getParameter("type")%>" WIDTH="25" HEIGHT="20" border="0" hspace="2"> </td> 
!           </tr> 
!           <tr valign="middle" BGCOLOR="#EEEEFF" > 
!             <td width="20%"  align="right"> <font face="arial"><bean:message key="Appointment.formDuration"/>:</font> 
!               <!--font face="arial"> End Time :</font--> </td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="duration" VALUE="<%=duration%>" WIDTH="25" HEIGHT="20" border="0" hspace="2" > 
!               <INPUT TYPE="hidden" NAME="end_time" VALUE="<%=request.getParameter("end_time")%>" WIDTH="25" HEIGHT="20" border="0" hspace="2"  onChange="checkTimeTypeIn(this)"> </td> 
!             <td width="5%" ></td> 
!             <td width="20%"> <div align="right"></div></td> 
!             <td width="20%">&nbsp; </td> 
!           </tr> 
!           <tr valign="middle" BGCOLOR="#CCCCFF"> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="appointment.addappointment.formSurName"/>:</font></div></td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="keyword" VALUE="<%=(bFirstDisp && !bFromWL)?"":request.getParameter("name").equals("")?session.getAttribute("appointmentname")==null?"":session.getAttribute("appointmentname"):request.getParameter("name")%>" HEIGHT="20" border="0" hspace="2" width="25" tabindex="1"> </td> 
!             <td width="5%"></td> 
!             <td width="20%"> <div align="right"><font face="arial"> 
!                 <INPUT TYPE="hidden" NAME="orderby" VALUE="last_name, first_name" > 
!                 <INPUT TYPE="hidden" NAME="search_mode" VALUE="search_name" > 
!                 <INPUT TYPE="hidden" NAME="originalpage" VALUE="../appointment/addappointment.jsp" > 
!                 <INPUT TYPE="hidden" NAME="limit1" VALUE="0" > 
!                 <INPUT TYPE="hidden" NAME="limit2" VALUE="5" > 
!                 <INPUT TYPE="hidden" NAME="ptstatus" VALUE="active"> 
!                 <!--input type="hidden" name="displaymode" value="Search " --> 
!                 <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Search '" VALUE="<bean:message key="appointment.addappointment.btnSearch"/> 
! "></font></div></td> 
!             <td width="20%" > <input type="TEXT" name="demographic_no" ONFOCUS="onBlockFieldFocus(this)" readonly value="<%=(bFirstDisp && !bFromWL)?"":request.getParameter("demographic_no").equals("")?"":request.getParameter("demographic_no")%>" width="25" height="20" border="0" hspace="2"> </td> 
!           </tr> 
!           <tr valign="middle" BGCOLOR="#CCCCFF"> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formReason"/>:</font></div></td> 
!             <td width="20%"><font face="Times New Roman"> 
!               <textarea name="reason"  tabindex="2" rows="2" wrap="virtual" cols="18"><%=bFirstDisp?"":request.getParameter("reason").equals("")?"":request.getParameter("reason")%></textarea> 
!               </font> </TD> 
!             <td width="5%"><font face="Times New Roman"> </font></td> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formNotes"/>:</font></div></td> 
!             <td width="20%"><font face="Times New Roman"> 
!               <textarea name="notes"  tabindex="3" rows="2" wrap="virtual" cols="18"><%=bFirstDisp?"":request.getParameter("notes").equals("")?"":request.getParameter("notes")%></textarea> 
!               </font> </td> 
!           </tr> 
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formLocation"/>:</font></div></td> 
!             <td width="20%"> <input type="TEXT" name="location"  tabindex="4" value="<%=bFirstDisp?"":request.getParameter("location").equals("")?"":request.getParameter("location")%>" width="25" height="20" border="0" hspace="2"> </TD> 
!             <td width="5%" ></td> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formResources"/>:</font></div></td> 
!             <td width="20%"> <input type="TEXT" name="resources"  tabindex="5" value="<%=bFirstDisp?"":request.getParameter("resources").equals("")?"":request.getParameter("resources")%>" width="25" height="20" border="0" hspace="2"> </td> 
!           </tr> 
!           <tr valign="middle" BGCOLOR="#EEEEFF"> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formCreator"/>:</font></div></td> 
!             <td width="20%"> <INPUT TYPE="TEXT" NAME="user_id" readonly VALUE='<%=bFirstDisp?(userlastname+", "+userfirstname):request.getParameter("user_id").equals("")?"Unknown":request.getParameter("user_id")%>' WIDTH="25" HEIGHT="20" border="0" hspace="2"> </td> 
!             <td width="5%" ></td> 
!             <td width="20%"> <div align="right"><font face="arial"><bean:message key="Appointment.formDateTime"/>:</font></div></td> 
!             <td width="20%"> <%
  
+ 				GregorianCalendar now=new GregorianCalendar();
+ 
+                         GregorianCalendar cal = (GregorianCalendar) now.clone();
+ 
+                         cal.add(cal.DATE, 1);
+ 
+ 				String strDateTime=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)+":"+now.get(Calendar.SECOND);
+ 
+ 			%> 
+               <INPUT TYPE="TEXT" NAME="createdatetime" readonly VALUE="<%=strDateTime%>" WIDTH="25" HEIGHT="20" border="0" hspace="2"> 
+               <INPUT TYPE="hidden" NAME="provider_no" VALUE="<%=curProvider_no%>"> 
+               <INPUT TYPE="hidden" NAME="dboperation" VALUE="add_apptrecord"> 
+               <INPUT TYPE="hidden" NAME="creator" VALUE="<%=userlastname+", "+userfirstname%>"> 
+               <INPUT TYPE="hidden" NAME="remarks" VALUE=""> </td> 
+           </tr> 
+         </table></td> 
+     </tr> 
+   </table> 
+   <table width="100%" BGCOLOR="<%=deepcolor%>"> 
+     <tr> 
+       <TD nowrap> <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Group Appt'" VALUE="<bean:message key="appointment.addappointment.btnGroupAppt"/> 
+ " <%=disabled%>> 
+         <%
+ 
+   if(dateString2.equals( inform.format(inform.parse(now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DAY_OF_MONTH))) ) 
+ 
+      || dateString2.equals( inform.format(inform.parse(cal.get(Calendar.YEAR)+"-"+(cal.get(Calendar.MONTH)+1)+"-"+cal.get(Calendar.DAY_OF_MONTH))) ) ) {
+ 
+     org.apache.struts.util.MessageResources resources = org.apache.struts.util.MessageResources.getMessageResources("oscarResources");
+ 
+     %> 
+         <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Add Appt & PrintPreview'" VALUE="<bean:message key='appointment.addappointment.btnAddApptPrintPreview'/>" <%=disabled%>> 
+         <%
+ 
+   }
+ 
+ %> 
+         <INPUT TYPE="submit" onclick="document.forms['ADDAPPT'].displaymode.value='Add Appointment'" tabindex="6" VALUE="<bean:message key="appointment.addappointment.btnAddAppointment"/> 
+ " <%=disabled%>> </TD> 
+       <TD></TD> 
+       <TD align="right"><INPUT TYPE = "RESET" VALUE = "<bean:message key="appointment.addappointment.btnCancel"/> 
+ " onClick="window.close();"> 
+         <input type="button" value="<bean:message key="appointment.addappointment.btnRepeat"/> 
+ " onclick="onButRepeat()" <%=disabled%>></TD> 
+     </tr> 
+   </TABLE> 
+ </FORM> 
  </body>
! </html:html>
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql,1.70,1.71

[joel <jl...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14263/database/mysql

Modified Files:
	oscarinit.sql 
Log Message:
Added patientWillBook field to consultationRequests table

Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** oscarinit.sql	31 Jan 2005 21:36:49 -0000	1.70
--- oscarinit.sql	9 Feb 2005 07:11:42 -0000	1.71
***************
*** 272,275 ****
--- 272,276 ----
    concurrentProblems text,
    urgency char(2) default NULL,
+   patientWillBook tinyint(1),
    PRIMARY KEY  (requestId)
  ) TYPE=MyISAM;

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

[joel <jl...@us...>]

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

Modified Files:
	RxPatientData.java 
Log Message:
Added hin field to class and query

Index: RxPatientData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPatientData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RxPatientData.java	5 Feb 2004 19:53:10 -0000	1.1
--- RxPatientData.java	9 Feb 2005 07:04:49 -0000	1.2
***************
*** 1,506 ****
-   
  /*
!  * 
   * 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, 
[...1281 lines suppressed...]
! 
!           sql = "UPDATE diseases SET ICD9 = '" + this.getICD9() + "', "
! 
!               + "entry_date = '" + this.getEntryDate().toString() + "' "
! 
!               + "WHERE diseaseid = " + this.getDiseaseId();
! 
!           b = db.RunSQL(sql);
! 
          }
+ 
+         return b;
+ 
+       }
+ 
      }
+ 
+   }
+ 
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctConsultationFormRequestAction.java,1.8,1.9 EctConsultationFormRequestForm.java,1.5,1.6 EctConsultationFormRequestUtil.java,1.5,1.6 EctViewConsultationRequestsUtil.java,1.3,1.4 EctViewRequestAction.java,1.5,1.6

[joel <jl...@us...>]

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

Modified Files:
	EctConsultationFormRequestAction.java 
	EctConsultationFormRequestForm.java 
	EctConsultationFormRequestUtil.java 
	EctViewConsultationRequestsUtil.java EctViewRequestAction.java 
Log Message:
Added "Patient Will Book" option to consultationRequest, struts classes mods and sql query mods

Index: EctViewConsultationRequestsUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** EctViewConsultationRequestsUtil.java	11 Sep 2003 20:53:40 -0000	1.3
--- EctViewConsultationRequestsUtil.java	9 Feb 2005 07:02:15 -0000	1.4
***************
*** 1,122 ****
  // -----------------------------------------------------------------------------------------------------------------------
  // *
  // *
  // * 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 
  // *
  // -----------------------------------------------------------------------------------------------------------------------
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.PrintStream;
  import java.sql.ResultSet;
  import java.sql.SQLException;
  import java.util.Vector;
  import oscar.oscarDB.DBHandler;
  
  public class EctViewConsultationRequestsUtil {
  
      public boolean estConsultationVecByTeam(String team) {
          ids = new Vector();
          status = new Vector();
          patient = new Vector();
          provider = new Vector();
          service = new Vector();
          date = new Vector();
          boolean verdict = true;
          if(!team.equals("-1")) {
              try {
                  DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                 String sql = " select cr.status, cr.referalDate, cr.requestId, demo.last_name, demo.first_name,  pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr,  demographic demo, provider pro, consultationServices ser where  demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and  ser.serviceId = cr.serviceId and cr.status != 4 and sendTo ='" +team+ "' order by cr.referalDate desc";
                  ResultSet rs= db.GetSQL(sql);
                  while(rs.next()) {
                    date.add(rs.getString("referalDate"));
                    ids.add(rs.getString("requestId"));
                    status.add(rs.getString("status"));
                    patient.add(rs.getString("last_name") +", "+ rs.getString("first_name")) ;
                    provider.add(rs.getString("lName") +", "+ rs.getString("fName"));
                    service.add(rs.getString("serviceDesc"));
                  }
                  rs.close();
                  db.CloseConn();
              } catch(SQLException e) {
                  System.out.println(e.getMessage());
                  verdict = false;
              }
          } else {
              System.out.println("GETTIM ALL!!!!");
              try {
                  DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                 String sql = " select cr.status, cr.referalDate, cr.requestId, demo.last_name, demo.first_name,  pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr,  demographic demo, provider pro, consultationServices ser where  demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and  ser.serviceId = cr.serviceId and cr.status != 4 order by cr.referalDate desc";
                  ResultSet rs;
                  for(rs = db.GetSQL(sql); rs.next(); date.add(rs.getString("referalDate")))
                  {
                      ids.add(rs.getString("requestId"));
                      status.add(rs.getString("status"));
                      patient.add(rs.getString("last_name") +", "+ rs.getString("first_name")) ;
                      provider.add(rs.getString("lName") +", "+ rs.getString("fName")) ;
                      service.add(rs.getString("serviceDesc"));
                  }
                  rs.close();
                  db.CloseConn();
              } catch(SQLException e) {
                  System.out.println(e.getMessage());
                  verdict = false;
              }
          }
          return verdict;
      }
  
      public boolean estConsultationVecByDemographic(String demoNo) {
          ids = new Vector();
          status = new Vector();
          patient = new Vector();
          provider = new Vector();
          service = new Vector();
          date = new Vector();
          boolean verdict = true;
          try {
              DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = " select cr.status, cr.referalDate, cr.requestId, demo.last_name, demo.first_name,  pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr,  demographic demo, provider pro, consultationServices ser where  demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and  ser.serviceId = cr.serviceId and demographicNo ='"+demoNo+"' order by cr.referalDate ";
              ResultSet rs;
              for(rs = db.GetSQL(sql); rs.next(); date.add(rs.getString("referalDate")))
              {
                  ids.add(rs.getString("requestId"));
                  status.add(rs.getString("status"));
                  patient.add(rs.getString("last_name")+", "+rs.getString("first_name"));
                  provider.add(rs.getString("lName")+", "+rs.getString("fName"));
                  service.add(rs.getString("serviceDesc"));
              }
  
              rs.close();
              db.CloseConn();
          } catch(SQLException e) {
              System.out.println(e.getMessage());
              verdict = false;
          }
          return verdict;
      }
  
      public Vector ids;
      public Vector status;
      public Vector patient;
      public Vector provider;
      public Vector service;
      public Vector date;
  }
--- 1,249 ----
  // -----------------------------------------------------------------------------------------------------------------------
+ 
  // *
+ 
  // *
+ 
  // * 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
! 
  // *
+ 
  // -----------------------------------------------------------------------------------------------------------------------
+ 
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
+ 
+ 
  import java.io.PrintStream;
+ 
  import java.sql.ResultSet;
+ 
  import java.sql.SQLException;
+ 
  import java.util.Vector;
+ 
  import oscar.oscarDB.DBHandler;
  
+ 
+ 
  public class EctViewConsultationRequestsUtil {
  
+ 
+ 
      public boolean estConsultationVecByTeam(String team) {
+ 
          ids = new Vector();
+ 
          status = new Vector();
+ 
          patient = new Vector();
+ 
          provider = new Vector();
+ 
          service = new Vector();
+ 
          date = new Vector();
+         this.patientWillBook = new Vector();
+ 
          boolean verdict = true;
+ 
          if(!team.equals("-1")) {
+ 
              try {
+ 
                  DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!                 String sql = " select cr.status, cr.referalDate, cr.requestId, cr.patientWillBook,demo.last_name, demo.first_name,  pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr,  demographic demo, provider pro, consultationServices ser where  demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and  ser.serviceId = cr.serviceId and cr.status != 4 and sendTo ='" +team+ "' order by cr.referalDate desc";
! 
                  ResultSet rs= db.GetSQL(sql);
+ 
                  while(rs.next()) {
+ 
                    date.add(rs.getString("referalDate"));
+ 
                    ids.add(rs.getString("requestId"));
+ 
                    status.add(rs.getString("status"));
+ 
                    patient.add(rs.getString("last_name") +", "+ rs.getString("first_name")) ;
+ 
                    provider.add(rs.getString("lName") +", "+ rs.getString("fName"));
+ 
                    service.add(rs.getString("serviceDesc"));
+                   this.patientWillBook.add(rs.getString("patientWillBook"));
+ 
                  }
+ 
                  rs.close();
+ 
                  db.CloseConn();
+ 
              } catch(SQLException e) {
+ 
                  System.out.println(e.getMessage());
+ 
                  verdict = false;
+ 
              }
+ 
          } else {
+ 
              System.out.println("GETTIM ALL!!!!");
+ 
              try {
+ 
                  DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!                 String sql = " select cr.status, cr.referalDate, cr.requestId,  cr.patientWillBook,demo.last_name, demo.first_name,  pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr,  demographic demo, provider pro, consultationServices ser where  demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and  ser.serviceId = cr.serviceId and cr.status != 4 order by cr.referalDate desc";
! 
                  ResultSet rs;
+ 
                  for(rs = db.GetSQL(sql); rs.next(); date.add(rs.getString("referalDate")))
+ 
                  {
+ 
                      ids.add(rs.getString("requestId"));
+ 
                      status.add(rs.getString("status"));
+ 
                      patient.add(rs.getString("last_name") +", "+ rs.getString("first_name")) ;
+ 
                      provider.add(rs.getString("lName") +", "+ rs.getString("fName")) ;
+ 
                      service.add(rs.getString("serviceDesc"));
+ 
                  }
+ 
                  rs.close();
+ 
                  db.CloseConn();
+ 
              } catch(SQLException e) {
+ 
                  System.out.println(e.getMessage());
+ 
                  verdict = false;
+ 
              }
+ 
          }
+ 
          return verdict;
+ 
      }
  
+ 
+ 
      public boolean estConsultationVecByDemographic(String demoNo) {
+ 
          ids = new Vector();
+ 
          status = new Vector();
+ 
          patient = new Vector();
+ 
          provider = new Vector();
+ 
          service = new Vector();
+ 
          date = new Vector();
+         this.patientWillBook = new Vector();
+ 
          boolean verdict = true;
+ 
          try {
+ 
              DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!             String sql = " select cr.status, cr.referalDate, cr.requestId, cr.patientWillBook, demo.last_name, demo.first_name,  pro.last_name as lName, pro.first_name as fName, ser.serviceDesc from consultationRequests cr,  demographic demo, provider pro, consultationServices ser where  demo.demographic_no = cr.demographicNo and pro.provider_no = cr.providerNo and  ser.serviceId = cr.serviceId and demographicNo ='"+demoNo+"' order by cr.referalDate ";
! 
              ResultSet rs;
+ 
              for(rs = db.GetSQL(sql); rs.next(); date.add(rs.getString("referalDate")))
+ 
              {
+ 
                  ids.add(rs.getString("requestId"));
+ 
                  status.add(rs.getString("status"));
+ 
                  patient.add(rs.getString("last_name")+", "+rs.getString("first_name"));
+ 
                  provider.add(rs.getString("lName")+", "+rs.getString("fName"));
+ 
                  service.add(rs.getString("serviceDesc"));
+                 patientWillBook.add(rs.getString("patientWillBook"));
+ 
              }
  
+ 
+ 
              rs.close();
+ 
              db.CloseConn();
+ 
          } catch(SQLException e) {
+ 
              System.out.println(e.getMessage());
+ 
              verdict = false;
+ 
          }
+ 
          return verdict;
+ 
      }
  
+ 
+ 
      public Vector ids;
+ 
      public Vector status;
+ 
      public Vector patient;
+ 
      public Vector provider;
+ 
      public Vector service;
+ 
      public Vector date;
+     public Vector patientWillBook;
+ 
  }
+ 

Index: EctViewRequestAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewRequestAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctViewRequestAction.java	28 Dec 2004 17:54:47 -0000	1.5
--- EctViewRequestAction.java	9 Feb 2005 07:02:15 -0000	1.6
***************
*** 1,50 ****
  // -----------------------------------------------------------------------------------------------------------------------
  // *
  // *
  // * 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 
  // *
  // -----------------------------------------------------------------------------------------------------------------------
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.IOException;
  import java.io.PrintStream;
  import javax.servlet.ServletException;
  import javax.servlet.ServletRequest;
  import javax.servlet.http.*;
  import org.apache.struts.action.*;
  import oscar.oscarEncounter.pageUtil.EctSessionBean;
  
! public class EctViewRequestAction extends Action {
  
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException    {
  
-         EctViewRequestForm frm = (EctViewRequestForm)form;
-         //EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean");
-         /*if(bean == null) {
-             return mapping.findForward("eject");
-         } else {
-             bean.setConsultationRequestId(frm.getRequestId());*/            
-             request.setAttribute("id",frm.getRequestId());
- 	    return mapping.findForward("success");
-         //}
-     }
  }
--- 1,93 ----
  // -----------------------------------------------------------------------------------------------------------------------
+ 
  // *
+ 
  // *
+ 
  // * 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
! 
  // *
+ 
  // -----------------------------------------------------------------------------------------------------------------------
+ 
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.IOException;
+ 
  import java.io.PrintStream;
+ 
  import javax.servlet.ServletException;
+ 
  import javax.servlet.ServletRequest;
+ 
  import javax.servlet.http.*;
+ 
  import org.apache.struts.action.*;
+ 
  import oscar.oscarEncounter.pageUtil.EctSessionBean;
  
! public class EctViewRequestAction
!     extends Action {
  
!   public ActionForward execute(ActionMapping mapping, ActionForm form,
!                                HttpServletRequest request,
!                                HttpServletResponse response)
! 
!       throws ServletException, IOException {
! 
!     EctViewRequestForm frm = (EctViewRequestForm) form;
! 
!     //EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean");
! 
!     /*if(bean == null) {
!         return mapping.findForward("eject");
! 
!              } else {
! 
!         bean.setConsultationRequestId(frm.getRequestId());*/
! 
!     request.setAttribute("id", frm.getRequestId());
! 
!     return mapping.findForward("success");
! 
!     //}
! 
!   }
  
  }

Index: EctConsultationFormRequestAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EctConsultationFormRequestAction.java	28 Dec 2004 16:42:29 -0000	1.8
--- EctConsultationFormRequestAction.java	9 Feb 2005 07:02:14 -0000	1.9
***************
*** 1,133 ****
  /*
   *
   * 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
   */
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.IOException;
  import java.io.PrintStream;
  import java.sql.ResultSet;
  import java.sql.SQLException;
  import javax.servlet.ServletException;
  import javax.servlet.ServletRequest;
  import javax.servlet.http.*;
  import org.apache.struts.action.*;
  import oscar.oscarDB.DBHandler;
  import oscar.oscarMessenger.util.MsgStringQuote;
  import oscar.oscarEncounter.pageUtil.EctSessionBean;
  import oscar.OscarProperties;
  import oscar.util.ParameterActionForward;
  
! public class EctConsultationFormRequestAction extends Action {
!    
!    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!    throws ServletException, IOException {
!       //EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean");
!       //if(bean == null)
!       //    return mapping.findForward("eject");
!       EctConsultationFormRequestForm frm = (EctConsultationFormRequestForm)form;
!       String referalDate = frm.getReferalDate();
!       String serviceId = frm.getService();
!       String specId = frm.getSpecialist();
!       String appointmentDate = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(frm.getAppointmentYear())))).append("/").append(frm.getAppointmentMonth()).append("/").append(frm.getAppointmentDay())));
!       String appointmentHour = frm.getAppointmentHour();
!       String appointmentPm = frm.getAppointmentPm();
!       if(appointmentPm.equals("PM")) {
!          appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12);
!          System.out.println(String.valueOf(String.valueOf((new StringBuffer("\n\n\nlook at the time")).append(appointmentHour).append("\n\n\n"))));
        }
!       String appointmentTime = String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(appointmentHour)))).append(":").append(frm.getAppointmentMinute())));
!       String reason = frm.getReasonForConsultation();
!       String clinicalInfo = frm.getClinicalInformation();
!       String currentMeds = frm.getCurrentMedications();
!       String allergies = frm.getAllergies();
!       String concurrentProblems = frm.getConcurrentProblems();
!       String sendTo = frm.getSendTo();
!       String submission = frm.getSubmission();
!       String providerNo = frm.getProviderNo();
!       String demographicNo = frm.getDemographicNo();
!       String status = frm.getStatus();
!       String statusText = frm.getAppointmentNotes();
!       String urg = frm.getUrgency();
!       String requestId = "";
!       MsgStringQuote str = new MsgStringQuote();
!       if(submission.equals("Submit Consultation Request") || submission.equals("Submit Consultation Request And Print Preview") || submission.equals("Submit And Fax")) {
!          try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "insert into consultationRequests "
!             +"(referalDate,serviceId,specId,appointmentDate,appointmentTime,reason,"
!             +"clinicalInfo,currentMeds,allergies,providerNo,demographicNo,status,statusText,sendTo,concurrentProblems,urgency) "
!             +" values ('"+str.q(referalDate)+"','"+str.q(serviceId)+"','"+str.q(specId)+"','"+str.q(appointmentDate)+"','"+str.q(appointmentTime)+"', "
!             +"'"+str.q(reason)+"','"+str.q(clinicalInfo)+"','"+str.q(currentMeds)+"','"+str.q(allergies)+"','"+str.q(providerNo)+"','"+str.q(demographicNo)
!             +"','"+str.q(status)+"','"+str.q(statusText)+"','"+str.q(sendTo)+"','"+str.q(concurrentProblems)+"','"+urg+"')";
!             System.out.println(" sql statement "+sql);
!             db.RunSQL(sql);
!             
!             /* select the correct db specific command */
!             String db_type = OscarProperties.getInstance().getProperty("db_type").trim();
!             String dbSpecificCommand;
!             if (db_type.equalsIgnoreCase("mysql")) {
!                dbSpecificCommand = "SELECT LAST_INSERT_ID()";
!             } else if (db_type.equalsIgnoreCase("postgresql")){
!                dbSpecificCommand = "SELECT CURRVAL('consultationrequests_numeric')";
!             } else
!                throw new SQLException("ERROR: Database " + db_type + " unrecognized.");
!             
!             ResultSet rs = db.GetSQL(dbSpecificCommand);
!             if(rs.next())
!                requestId = Integer.toString(rs.getInt(1));
!             db.CloseConn();
!          }
!          catch(SQLException e) {
!             System.out.println(e.getMessage());
!          }
!          request.setAttribute("transType", "2");
!       } else
!          if(submission.equals("Update Consultation Request") || submission.equals("Update Consultation Request And Print Preview") || submission.equals("Update And Fax")) {
!             requestId = frm.getRequestId();
!             System.out.println("request id = ".concat(String.valueOf(String.valueOf(frm.getRequestId()))));
!             try {
!                DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!                String sql = String.valueOf(String.valueOf((new StringBuffer("update consultationRequests set  serviceId = '")).append(str.q(serviceId)).append("', ").append(" specId = '").append(str.q(specId)).append("', ").append(" appointmentDate = '").append(str.q(appointmentDate)).append("', ").append(" appointmentTime = '").append(str.q(appointmentTime)).append("', ").append(" reason = '").append(str.q(reason)).append("', ").append(" clinicalInfo = '").append(str.q(clinicalInfo)).append("', ").append(" currentMeds = '").append(str.q(currentMeds)).append("', ").append(" allergies = '").append(str.q(allergies)).append("', ").append(" status = '").append(str.q(status)).append("', ").append(" statusText = '").append(str.q(statusText)).append("', ").append(" sendTo = '").append(str.q(sendTo)).append("', ").append(" urgency = '").append(urg).append("', ").append(" concurrentProblems = '").append(str.q(concurrentProblems)).append("' ").append(" where requestId = '").append(str.q(requestId)).append("'")));
!                db.RunSQL(sql);
!                db.CloseConn();
!             }
!             catch(SQLException e) {
!                System.out.println(e.getMessage());
!             }
!             request.setAttribute("transType", "1");
!          }
!       frm.setRequestId("");
!       request.setAttribute("teamVar",sendTo);
!       if(submission.equals("Update Consultation Request And Print Preview") || submission.equals("Submit Consultation Request And Print Preview")){
!          request.setAttribute("reqId", requestId);
!          return mapping.findForward("print");
!       } else if (submission.equals("Update And Fax") || submission.equals("Submit And Fax")) {
!          request.setAttribute("reqId", requestId);
!          return mapping.findForward("fax");
!       } else {
!          ParameterActionForward forward = new ParameterActionForward(mapping.findForward("success"));
!          forward.addParameter("de", demographicNo);
!          return forward;
        }
!    }
  }
--- 1,309 ----
  /*
   *
+ 
   * 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
+ 
   */
+ 
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.IOException;
+ 
  import java.io.PrintStream;
+ 
  import java.sql.ResultSet;
+ 
  import java.sql.SQLException;
+ 
  import javax.servlet.ServletException;
+ 
  import javax.servlet.ServletRequest;
+ 
  import javax.servlet.http.*;
+ 
  import org.apache.struts.action.*;
+ 
  import oscar.oscarDB.DBHandler;
+ 
  import oscar.oscarMessenger.util.MsgStringQuote;
+ 
  import oscar.oscarEncounter.pageUtil.EctSessionBean;
+ 
  import oscar.OscarProperties;
+ 
  import oscar.util.ParameterActionForward;
  
! public class EctConsultationFormRequestAction
!     extends Action {
! 
!   public ActionForward execute(ActionMapping mapping, ActionForm form,
!                                HttpServletRequest request,
!                                HttpServletResponse response)
! 
!       throws ServletException, IOException {
! 
!     //EctSessionBean bean = (EctSessionBean)request.getSession().getAttribute("EctSessionBean");
! 
!     //if(bean == null)
! 
!     //    return mapping.findForward("eject");
! 
!     EctConsultationFormRequestForm frm = (EctConsultationFormRequestForm) form;
! 
!     String referalDate = frm.getReferalDate();
! 
!     String serviceId = frm.getService();
! 
!     String specId = frm.getSpecialist();
! 
!     String appointmentDate = String.valueOf(String.valueOf( (new StringBuffer(
!         String.valueOf(String.valueOf(frm.getAppointmentYear())))).append("/").
!         append(frm.getAppointmentMonth()).append("/").append(frm.
!         getAppointmentDay())));
! 
!     String appointmentHour = frm.getAppointmentHour();
! 
!     String appointmentPm = frm.getAppointmentPm();
! 
!     if (appointmentPm.equals("PM")) {
! 
!       appointmentHour = Integer.toString(Integer.parseInt(appointmentHour) + 12);
! 
!       System.out.println(String.valueOf(String.valueOf( (new StringBuffer(
!           "\n\n\nlook at the time")).append(appointmentHour).append("\n\n\n"))));
! 
!     }
! 
!     String appointmentTime = String.valueOf(String.valueOf( (new StringBuffer(
!         String.valueOf(String.valueOf(appointmentHour)))).append(":").append(
!         frm.getAppointmentMinute())));
! 
!     String reason = frm.getReasonForConsultation();
! 
!     String clinicalInfo = frm.getClinicalInformation();
! 
!     String currentMeds = frm.getCurrentMedications();
! 
!     String allergies = frm.getAllergies();
! 
!     String concurrentProblems = frm.getConcurrentProblems();
! 
!     String sendTo = frm.getSendTo();
! 
!     String submission = frm.getSubmission();
! 
!     String providerNo = frm.getProviderNo();
! 
!     String demographicNo = frm.getDemographicNo();
! 
!     String status = frm.getStatus();
! 
!     String statusText = frm.getAppointmentNotes();
! 
! 
!     String pwbtmp = request.getParameter("patientWillBook");
!     String pwb = frm.patientWillBook;
! 
!     // String pwb = (pwbtmp==null||pwbtmp.equals(""))?"0":pwbtmp;
! 
!     String urg = frm.getUrgency();
! 
!     String requestId = "";
! 
!     MsgStringQuote str = new MsgStringQuote();
! 
!     if (submission.equals("Submit Consultation Request") ||
!         submission.equals("Submit Consultation Request And Print Preview") ||
!         submission.equals("Submit And Fax")) {
! 
!       try {
! 
!         DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!         String sql = "insert into consultationRequests "
! 
!             +
!             "(referalDate,serviceId,specId,appointmentDate,appointmentTime,reason,"
! 
!             + "clinicalInfo,currentMeds,allergies,providerNo,demographicNo,status,statusText,sendTo,concurrentProblems,urgency,patientWillBook) "
! 
!             + " values ('" + str.q(referalDate) + "','" + str.q(serviceId) +
!             "','" + str.q(specId) + "','" + str.q(appointmentDate) + "','" +
!             str.q(appointmentTime) + "', "
! 
!             + "'" + str.q(reason) + "','" + str.q(clinicalInfo) + "','" +
!             str.q(currentMeds) + "','" + str.q(allergies) + "','" +
!             str.q(providerNo) + "','" + str.q(demographicNo)
! 
!             + "','" + str.q(status) + "','" + str.q(statusText) + "','" +
!             str.q(sendTo) + "','" + str.q(concurrentProblems) + "','" + urg +
!             "'," + pwb + ")";
! 
!         System.out.println(" sql statement " + sql);
! 
!         db.RunSQL(sql);
! 
!         /* select the correct db specific command */
! 
!         String db_type = OscarProperties.getInstance().getProperty("db_type").
!             trim();
! 
!         String dbSpecificCommand;
! 
!         if (db_type.equalsIgnoreCase("mysql")) {
! 
!           dbSpecificCommand = "SELECT LAST_INSERT_ID()";
! 
!         }
!         else if (db_type.equalsIgnoreCase("postgresql")) {
! 
!           dbSpecificCommand = "SELECT CURRVAL('consultationrequests_numeric')";
! 
!         }
!         else {
! 
!           throw new SQLException("ERROR: Database " + db_type +
!                                  " unrecognized.");
!         }
! 
!         ResultSet rs = db.GetSQL(dbSpecificCommand);
! 
!         if (rs.next()) {
! 
!           requestId = Integer.toString(rs.getInt(1));
! 
!         }
!         db.CloseConn();
! 
        }
! 
!       catch (SQLException e) {
! 
!         System.out.println(e.getMessage());
! 
        }
! 
!       request.setAttribute("transType", "2");
! 
!     }
!     else
! 
!     if (submission.equals("Update Consultation Request") ||
!         submission.equals("Update Consultation Request And Print Preview") ||
!         submission.equals("Update And Fax")) {
! 
!       requestId = frm.getRequestId();
! 
!       System.out.println("request id = ".concat(String.valueOf(String.valueOf(
!           frm.getRequestId()))));
! 
!       try {
! 
!         DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!         String sql = String.valueOf(String.valueOf( (new StringBuffer(
!             "update consultationRequests set  serviceId = '")).append(str.q(
!             serviceId)).append("', ").append(" specId = '").append(str.q(specId)).
!             append("', ").append(" appointmentDate = '").append(str.q(
!             appointmentDate)).append("', ").append(" appointmentTime = '").
!             append(str.q(appointmentTime)).append("', ").append(" reason = '").
!             append(str.q(reason)).append("', ").append(" clinicalInfo = '").
!             append(str.q(clinicalInfo)).append("', ").append(" currentMeds = '").
!             append(str.q(currentMeds)).append("', ").append(" allergies = '").
!             append(str.q(allergies)).append("', ").append(" status = '").append(
!             str.q(status)).append("', ").append(" statusText = '").append(str.q(
!             statusText)).append("', ").append(" sendTo = '").append(str.q(
!             sendTo)).append("', ").append(" urgency = '").append(urg).append(
!             "', ").append(" concurrentProblems = '").append(str.q(
!             concurrentProblems)).append("', ").append(" patientWillBook = ").
!             append(str.q(pwb)).append(" ").append(" where requestId = '"
!                                                   ).append(str.q(requestId)).
!             append("'")));
!         db.RunSQL(sql);
! 
!         db.CloseConn();
! 
!       }
! 
!       catch (SQLException e) {
! 
!         System.out.println(e.getMessage());
! 
!       }
! 
!       request.setAttribute("transType", "1");
! 
!     }
! 
!     frm.setRequestId("");
! 
!     request.setAttribute("teamVar", sendTo);
! 
!     if (submission.equals("Update Consultation Request And Print Preview") ||
!         submission.equals("Submit Consultation Request And Print Preview")) {
! 
!       request.setAttribute("reqId", requestId);
! 
!       return mapping.findForward("print");
! 
!     }
!     else if (submission.equals("Update And Fax") ||
!              submission.equals("Submit And Fax")) {
! 
!       request.setAttribute("reqId", requestId);
! 
!       return mapping.findForward("fax");
! 
!     }
!     else {
! 
!       ParameterActionForward forward = new ParameterActionForward(mapping.
!           findForward("success"));
! 
!       forward.addParameter("de", demographicNo);
! 
!       return forward;
! 
!     }
! 
!   }
! 
  }

Index: EctConsultationFormRequestUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestUtil.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** EctConsultationFormRequestUtil.java	7 Aug 2004 18:29:35 -0000	1.5
--- EctConsultationFormRequestUtil.java	9 Feb 2005 07:02:15 -0000	1.6
***************
*** 1,277 ****
  // -----------------------------------------------------------------------------------------------------------------------
  // *
  // *
  // * 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 
  // *
  // -----------------------------------------------------------------------------------------------------------------------
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.PrintStream;
  import java.sql.ResultSet;
  import java.sql.SQLException;
  import java.util.Vector;
  import java.util.Date;
  import oscar.oscarDB.DBHandler;
  import oscar.util.*;
  
  public class EctConsultationFormRequestUtil {
  
!     public boolean estPatient(String demo) {
!         demoNo = demo;
!         boolean verdict = true;
!         try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "select * from demographic where demographic_no = " +demoNo ;
!             ResultSet rs = db.GetSQL(sql);
!             if(rs.next()) {
!                 patientName = rs.getString("last_name") +","+ rs.getString("first_name");
!                 patientAddress = rs.getString("address") +"<br>"+ rs.getString("city") +","+ rs.getString("province") +","+ rs.getString("postal") ;
!                 patientPhone = rs.getString("phone");
!                 patientDOB = rs.getString("year_of_birth") +"/"+ rs.getString("month_of_birth") +"/"+ rs.getString("date_of_birth") ;
!                 patientHealthNum = rs.getString("hin");
!                 patientSex = rs.getString("sex");
!                 patientHealthCardType = rs.getString("hc_type");
!                 patientHealthCardVersionCode = rs.getString("ver");
!                 patientChartNo = rs.getString("chart_no");
!                 patientAge = UtilDateUtilities.calcAge(UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs.getString("month_of_birth"), rs.getString("date_of_birth")));
!               
!             }
!             rs.close();
!             db.CloseConn();
!         }  catch(SQLException e)  {
!             System.out.println(e.getMessage());
!             verdict = false;
!         }
!         return verdict;
      }
  
-     public boolean estTeams() {
-         boolean verdict = true;
-         teamVec = new Vector();
-         try {
-             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
-             String sql = "select distinct team from provider order by team ";
-             ResultSet rs = db.GetSQL(sql);
-             while(rs.next()) {
-                 String teamName = rs.getString("team");
-                 if(!teamName.equals(""))
-                     teamVec.add(teamName);
-             }
- /*            
-             do  {
-                 if(!rs.next())
-                     break;
-                 String teamName = rs.getString("team");
-                 if(!teamName.equals(""))
-                     teamVec.add(teamName);
-             } while(true);
- */            rs.close();
-             db.CloseConn();
-         } catch(SQLException e) {
-             System.out.println(e.getMessage());
-             verdict = false;
-         }
-         return verdict;
      }
  
!     public boolean estRequestFromId(String id) {
!         boolean verdict = true;
!         try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "select * from consultationRequests where requestId  = " +id;
!             ResultSet rs = db.GetSQL(sql);
!             if(rs.next()) {
!                 urgency = rs.getString("urgency");
!                 providerNo = rs.getString("providerNo");
!                 referalDate = rs.getString("referalDate");
!                 service = rs.getString("serviceId");
!                 specialist = rs.getString("specId");
!                 String appointmentTime = rs.getString("appointmentTime");
!                 reasonForConsultation = rs.getString("reason");
!                 clinicalInformation = rs.getString("clinicalInfo");
!                 concurrentProblems = rs.getString("concurrentProblems");
!                 currentMedications = rs.getString("currentMeds");
!                 allergies = rs.getString("allergies");
!                 sendTo = rs.getString("sendTo");
!                 status = rs.getString("status");
!                 appointmentNotes = rs.getString("statusText");
  
-                 if(appointmentNotes == null || appointmentNotes.equals("null"))
-                     appointmentNotes = new String();
-                 estPatient(rs.getString("demographicNo"));
-                 String date = rs.getString("appointmentDate");
-                 int fir = date.indexOf('-');
-                 int las = date.lastIndexOf('-');
-                 appointmentYear = date.substring(0, fir);
-                 appointmentMonth = date.substring(fir + 1, las);
-                 appointmentDay = date.substring(las + 1);
-                 fir = appointmentTime.indexOf(':');
-                 las = appointmentTime.lastIndexOf(':');
-                 if(fir > -1 && las > -1) {
-                     //System.out.println(String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(appointmentTime)))).append(" firs = ").append(fir).append(" las ").append(las))));
-                     appointmentHour = appointmentTime.substring(0, fir);
-                     if(fir < las)
-                         appointmentMinute = appointmentTime.substring(fir + 1, las);
-                     int h = Integer.parseInt(appointmentHour);
-                     if(h > 12) {
-                         appointmentPm = "PM";
-                         appointmentHour = Integer.toString(h - 12);
-                     } else {
-                         appointmentPm = "AM";
-                         appointmentHour = Integer.toString(h);
-                     }
-                 }
-             }
-             rs.close();
-             db.CloseConn();
-         } catch(SQLException e) {
-             System.out.println(e.getMessage());
-             verdict = false;
          }
!         return verdict;
      }
  
-     public String getSpecailistsName(String id) {
-         String retval = new String();
-         try {
-             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
-             String sql = "select * from professionalSpecialists where specId  = " +id ;
-             ResultSet rs = db.GetSQL(sql);
-             if(rs.next()) {
-                 retval = rs.getString("lName") +", "+ rs.getString("fName") +" "+ rs.getString("proLetters");
-                 specPhone = rs.getString("phone");
-                 specFax = rs.getString("fax");
-                 specAddr = rs.getString("address");
-                 if(specPhone == null || specPhone.equals("null"))
-                     specPhone = new String();
-                 if(specFax == null || specFax.equals("null"))
-                     specFax = new String();
-                 if(specAddr == null || specAddr.equals("null"))
-                     specAddr = new String();
-             }
-             rs.close();
-             db.CloseConn();
-         } catch(SQLException e) {
-             System.out.println(e.getMessage());
-         }
-         return retval;
      }
  
!     public String getProviderName(String id) {
!         String retval = new String();
!         try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "select * from provider where provider_no  = " +id ;
!             ResultSet rs = db.GetSQL(sql);
!             if(rs.next())
!                 retval = rs.getString("last_name") +", "+ rs.getString("first_name");
!             rs.close();
!             db.CloseConn();
!         } catch(SQLException e) {
!             System.out.println(e.getMessage());
          }
!         return retval;
!     }
  
-     public String getFamilyDoctor() {
-         String retval = new String();
-         try {
-             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
-             String sql = "select p.last_name, p.first_name from provider p, demographic d where d.provider_no  = p.provider_no and  d.demographic_no = " +demoNo;
-             ResultSet rs = db.GetSQL(sql);
-             if(rs.next())
-                 retval = rs.getString("last_name") +", "+ rs.getString("first_name");
-             rs.close();
-             db.CloseConn();
-         } catch(SQLException e) {
-             System.out.println(e.getMessage());
          }
!         return retval;
      }
  
-     public String getServiceName(String id) {
-         String retval = new String();
-         try {
-             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
-             String sql = "select * from consultationServices where serviceId  = "+id;
-             ResultSet rs = db.GetSQL(sql);
-             if(rs.next())
-                 retval = rs.getString("serviceDesc");
-             rs.close();
-             db.CloseConn();
-         } catch(SQLException e) {
-             System.out.println(e.getMessage());
-         }
-         return retval;
      }
!     
!     public String getClinicName() {
!         String retval = new String();
!         try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "select clinic_name from clinic";
!             ResultSet rs = db.GetSQL(sql);
!             if(rs.next())
!                 retval = rs.getString("clinic_name");
!             rs.close();
!             db.CloseConn();
!         } catch(SQLException e) {
!             System.out.println(e.getMessage());
          }
!         return retval;
      }
  
-     public String patientName;
-     public String patientAddress;
-     public String patientPhone;
-     public String patientDOB;
-     public String patientHealthNum;
-     public String patientSex;
-     public String patientAge;
-     public String patientHealthCardType;
-     public String patientHealthCardVersionCode;
-     public String patientChartNo;
-     public String familyPhysician;
-     public String referalDate;
-     public String service;
-     public String specialist;
-     public String appointmentYear;
-     public String appointmentMonth;
-     public String appointmentDay;
-     public String appointmentHour;
-     public String appointmentMinute;
-     public String appointmentPm;
-     public String reasonForConsultation;
-     public String clinicalInformation;
-     public String concurrentProblems;
-     public String currentMedications;
-     public String allergies;
-     public String sendTo;
-     public String status;
-     public String appointmentNotes;
-     public String providerNo;
-     public String urgency;
-     public String specPhone;
-     public String specFax;
-     public String specAddr;
-     public Vector teamVec;
-     private String demoNo;
  }
--- 1,557 ----
  // -----------------------------------------------------------------------------------------------------------------------
+ 
  // *
+ 
  // *
+ 
  // * 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
! 
  // *
+ 
  // -----------------------------------------------------------------------------------------------------------------------
+ 
  package oscar.oscarEncounter.oscarConsultationRequest.pageUtil;
  
  import java.io.PrintStream;
+ 
  import java.sql.ResultSet;
+ 
  import java.sql.SQLException;
+ 
  import java.util.Vector;
+ 
  import java.util.Date;
+ 
  import oscar.oscarDB.DBHandler;
+ 
  import oscar.util.*;
  
  public class EctConsultationFormRequestUtil {
  
!   public boolean estPatient(String demo) {
! 
!     demoNo = demo;
! 
!     boolean verdict = true;
! 
!     try {
! 
!       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!       String sql = "select * from demographic where demographic_no = " + demoNo;
! 
!       ResultSet rs = db.GetSQL(sql);
! 
!       if (rs.next()) {
! 
!         patientName = rs.getString("last_name") + "," +
!             rs.getString("first_name");
! 
!         patientAddress = rs.getString("address") + "<br>" + rs.getString("city") +
!             "," + rs.getString("province") + "," + rs.getString("postal");
! 
!         patientPhone = rs.getString("phone");
! 
!         patientDOB = rs.getString("year_of_birth") + "/" +
!             rs.getString("month_of_birth") + "/" + rs.getString("date_of_birth");
! 
!         patientHealthNum = rs.getString("hin");
! 
!         patientSex = rs.getString("sex");
! 
!         patientHealthCardType = rs.getString("hc_type");
! 
!         patientHealthCardVersionCode = rs.getString("ver");
! 
!         patientChartNo = rs.getString("chart_no");
! 
!         patientAge = UtilDateUtilities.calcAge(UtilDateUtilities.calcDate(rs.
!             getString("year_of_birth"), rs.getString("month_of_birth"),
!                                                rs.getString("date_of_birth")));
! 
!       }
! 
!       rs.close();
! 
!       db.CloseConn();
! 
      }
+     catch (SQLException e) {
+ 
+       System.out.println(e.getMessage());
+ 
+       verdict = false;
  
      }
  
!     return verdict;
! 
!   }
! 
!   public boolean estTeams() {
! 
!     boolean verdict = true;
! 
!     teamVec = new Vector();
! 
!     try {
! 
!       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!       String sql = "select distinct team from provider order by team ";
! 
!       ResultSet rs = db.GetSQL(sql);
! 
!       while (rs.next()) {
! 
!         String teamName = rs.getString("team");
! 
!         if (!teamName.equals("")) {
! 
!           teamVec.add(teamName);
  
          }
!       }
! 
!       /*
!                   do  {
! 
!                       if(!rs.next())
! 
!                           break;
! 
!                       String teamName = rs.getString("team");
! 
!                       if(!teamName.equals(""))
! 
!                           teamVec.add(teamName);
! 
!                   } while(true);
! 
!        */
!       rs.close();
! 
!       db.CloseConn();
! 
      }
+     catch (SQLException e) {
+ 
+       System.out.println(e.getMessage());
+ 
+       verdict = false;
  
      }
  
!     return verdict;
! 
!   }
! 
!   public boolean estRequestFromId(String id) {
! 
!     boolean verdict = true;
! 
!     try {
! 
!       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!       String sql = "select * from consultationRequests where requestId  = " +
!           id;
! 
!       ResultSet rs = db.GetSQL(sql);
! 
!       if (rs.next()) {
!         pwb = rs.getString("patientWillBook");
!         urgency = rs.getString("urgency");
! 
!         providerNo = rs.getString("providerNo");
! 
!         referalDate = rs.getString("referalDate");
! 
!         service = rs.getString("serviceId");
! 
!         specialist = rs.getString("specId");
! 
!         String appointmentTime = rs.getString("appointmentTime");
! 
!         reasonForConsultation = rs.getString("reason");
! 
!         clinicalInformation = rs.getString("clinicalInfo");
! 
!         concurrentProblems = rs.getString("concurrentProblems");
! 
!         currentMedications = rs.getString("currentMeds");
! 
!         allergies = rs.getString("allergies");
! 
!         sendTo = rs.getString("sendTo");
! 
!         status = rs.getString("status");
! 
!         appointmentNotes = rs.getString("statusText");
! 
!         if (appointmentNotes == null || appointmentNotes.equals("null")) {
! 
!           appointmentNotes = new String();
! 
          }
!         estPatient(rs.getString("demographicNo"));
! 
!         String date = rs.getString("appointmentDate");
! 
!         int fir = date.indexOf('-');
! 
!         int las = date.lastIndexOf('-');
! 
!         appointmentYear = date.substring(0, fir);
! 
!         appointmentMonth = date.substring(fir + 1, las);
! 
!         appointmentDay = date.substring(las + 1);
! 
!         fir = appointmentTime.indexOf(':');
! 
!         las = appointmentTime.lastIndexOf(':');
! 
!         if (fir > -1 && las > -1) {
! 
!           //System.out.println(String.valueOf(String.valueOf((new StringBuffer(String.valueOf(String.valueOf(appointmentTime)))).append(" firs = ").append(fir).append(" las ").append(las))));
! 
!           appointmentHour = appointmentTime.substring(0, fir);
! 
!           if (fir < las) {
! 
!             appointmentMinute = appointmentTime.substring(fir + 1, las);
! 
!           }
!           int h = Integer.parseInt(appointmentHour);
! 
!           if (h > 12) {
! 
!             appointmentPm = "PM";
! 
!             appointmentHour = Integer.toString(h - 12);
! 
!           }
!           else {
! 
!             appointmentPm = "AM";
! 
!             appointmentHour = Integer.toString(h);
! 
!           }
  
          }
! 
!       }
! 
!       rs.close();
! 
!       db.CloseConn();
! 
      }
+     catch (SQLException e) {
+ 
+       System.out.println(e.getMessage());
+ 
+       verdict = false;
  
      }
! 
!     return verdict;
! 
!   }
! 
!   public String getSpecailistsName(String id) {
! 
!     String retval = new String();
! 
!     try {
! 
!       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! 
!       String sql = "select * from professionalSpecialists where specId  = " +
!           id;
! 
!       ResultSet rs = db.GetSQL(sql);
! 
!       if (rs.next()) {
! 
!         retval = rs.getString("lName") + ", " + rs.getString("fName") + " " +
!             rs.getString("proLetters");
! 
!         specPhone = rs.getString("phone");
! 
!         specFax = rs.getString("fax");
! 
!         specAddr = rs.getString("address");
! 
!         if (specPhone == null || specPhone.equals("null")) {
! 
!           specPhone = new String();
! 
          }
!         if (specFax == null || specFax.equals("null")) {
! 
!           specFax = new String();
! 
!         }
!         if (specAddr == null || specAddr.equals("null")) {
! 
!           specAddr = new String();
! 
!         }
!       }
! 
!       rs.close();
! 
!       db.CloseConn();
! 
      }
+     catch (SQLException e) {
+ 
+       System.out.println(e.getMessage());
+ 
+     }
+ 
+     return retval;
+ 
+   }
+ 
+   public String getProviderName(String id) {
+ 
+     String retval = new String();
+ 
+     try {
+ 
+       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
+ 
+       String sql = "select * from provider where provider_no  = " + id;
+ 
+       ResultSet rs = db.GetSQL(sql);
+ 
+       if (rs.next()) {
+ 
+         retval = rs.getString("last_name") + ", " + rs.getString("first_name");
+ 
+       }
+       rs.close();
+ 
+       db.CloseConn();
+ 
+     }
+     catch (SQLException e) {
+ 
+       System.out.println(e.getMessage());
+ 
+     }
+ 
+     return retval;
+ 
+   }
+ 
+   public String getFamilyDoctor() {
+ 
+     String retval = new String();
+ 
+     try {
+ 
+       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
+ 
+       String sql = "select p.last_name, p.first_name from provider p, demographic d where d.provider_no  = p.provider_no and  d.demographic_no = " +
+           demoNo;
+ 
+       ResultSet rs = db.GetSQL(sql);
+ 
+       if (rs.next()) {
+ 
+         retval = rs.getString("last_name") + ", " + rs.getString("first_name");
+ 
+       }
+       rs.close();
+ 
+       db.CloseConn();
+ 
+     }
+     catch (SQLException e) {
+ 
+       System.out.println(e.getMessage());
+ 
+     }
+ 
+     return retval;
+ 
+   }
+ 
+   public String getServiceName(String id) {
+ 
+     String retval = new String();
+ 
+     try {
+ 
+       DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
+ 
+       String sql = "select * from consultationServices where serviceId  = " +
+           id;
+ 
+       ResultSet rs = db.GetSQL(sql);
+ 
+       i...
 
[truncated message content]

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties,1.131,1.132

[joel <jl...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9156/web/WEB-INF/classes

Modified Files:
	oscarResources_en.properties 
Log Message:
Added properties

Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.131
retrieving revision 1.132
diff -C2 -d -r1.131 -r1.132
*** oscarResources_en.properties	25 Nov 2004 05:21:11 -0000	1.131
--- oscarResources_en.properties	9 Feb 2005 06:58:04 -0000	1.132
***************
*** 1,23 ****
! #* 
  #* 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,23 ----
! #*
  #* 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,30 ****
  packageNA.msgNA1=The package
  packageNA.msgNA2=is not available
! packageNA.msg.oscarRx=oscarRx uses a third party First DataBank data-structures and it is not designed for public use. <br> For more infomation please consult <a href="mailto:osc...@fa...">OSCAR SUPPORT</a> for assistance.  
! packageNA.msg.oscarComm= oscarComm is a web service, it is not packaged in this version. <br> for more infomation please visit <a href="http://www.oscarhome.org">OSCAR HOME</a>.  
  
  index.btnSignIn=Sign in
--- 25,30 ----
  packageNA.msgNA1=The package
  packageNA.msgNA2=is not available
! packageNA.msg.oscarRx=oscarRx uses a third party First DataBank data-structures and it is not designed for public use. <br> For more infomation please consult <a href="mailto:osc...@fa...">OSCAR SUPPORT</a> for assistance.
! packageNA.msg.oscarComm= oscarComm is a web service, it is not packaged in this version. <br> for more infomation please visit <a href="http://www.oscarhome.org">OSCAR HOME</a>.
  
  index.btnSignIn=Sign in
***************
*** 469,473 ****
  oscarEncounter.Index.btnSignSave=Sign, Save and Exit
  oscarEncounter.Index.btnSign=Verify and Sign
! oscarEncounter.Index.btnGo= Go 
  oscarEncounter.Index.msgDocuments=documents
  oscarEncounter.Index.msgOsteoporotic=Osteoporotic Fracture
--- 469,473 ----
  oscarEncounter.Index.btnSignSave=Sign, Save and Exit
  oscarEncounter.Index.btnSign=Verify and Sign
! oscarEncounter.Index.btnGo= Go
  oscarEncounter.Index.msgDocuments=documents
  oscarEncounter.Index.msgOsteoporotic=Osteoporotic Fracture
***************
*** 507,511 ****
  admin.admin.baseURLSettingTitle=Base URL Setting
  admin.admin.btnBaseURLSetting=Base URL Setting
! admin.admin.oscarReport=oscarReport 
  admin.admin.btnQueryByExample=Query By Example
  admin.admin.btnAgeSexReport=Age-Sex Report
--- 507,511 ----
  admin.admin.baseURLSettingTitle=Base URL Setting
  admin.admin.btnBaseURLSetting=Base URL Setting
! admin.admin.oscarReport=oscarReport
  admin.admin.btnQueryByExample=Query By Example
  admin.admin.btnAgeSexReport=Age-Sex Report
***************
*** 815,824 ****
  provider.providerchangepassword.msgPasswordLengthError=The password must be between 6 and 10 characters and the confirm password must be the same as the new password.
  provider.providerchangepassword.description=Change your password
! provider.providerchangepassword.msgInstructions=Enter your old password and then choose your new password. Click 
  provider.providerchangepassword.msgUpdate=Update
  provider.providerchangepassword.msgClickButton=button when you're done.
! provider.providerchangepassword.msgEnterOld=Enter your 
  provider.providerchangepassword.formOldPassword=Old Password
! provider.providerchangepassword.msgChooseNew=Choose a 
  provider.providerchangepassword.formNewPassword=New Password
  provider.providerchangepassword.msgConfirm=Confirm your
--- 815,824 ----
  provider.providerchangepassword.msgPasswordLengthError=The password must be between 6 and 10 characters and the confirm password must be the same as the new password.
  provider.providerchangepassword.description=Change your password
! provider.providerchangepassword.msgInstructions=Enter your old password and then choose your new password. Click
  provider.providerchangepassword.msgUpdate=Update
  provider.providerchangepassword.msgClickButton=button when you're done.
! provider.providerchangepassword.msgEnterOld=Enter your
  provider.providerchangepassword.formOldPassword=Old Password
! provider.providerchangepassword.msgChooseNew=Choose a
  provider.providerchangepassword.formNewPassword=New Password
  provider.providerchangepassword.msgConfirm=Confirm your
***************
*** 1046,1049 ****
--- 1046,1050 ----
  
  oscarEncounter.oscarConsultationRequest.consultationFormPrint.title=ConsultationFormPrint
+ oscarEncounter.oscarConsultationRequest.consultationFormPrint.pwb=Patient Will Book
  oscarEncounter.oscarConsultationRequest.consultationFormPrint.msgFaxFooter=Fax Footer
  oscarEncounter.oscarConsultationRequest.consultationFormPrint.msgPrint=Print
***************
*** 1075,1078 ****
--- 1076,1080 ----
  
  oscarEncounter.oscarConsultationRequest.DisplayDemographicConsultationRequests.title=View Consultation Requests
+ oscarEncounter.oscarConsultationRequest.DisplayDemographicConsultationRequests.pwb=Patient Will Book
  oscarEncounter.oscarConsultationRequest.DisplayDemographicConsultationRequests.msgConsReq=oscarConsultationRequest
  oscarEncounter.oscarConsultationRequest.DisplayDemographicConsultationRequests.msgConsReqFor=Consultation Requests for
***************
*** 1094,1098 ****
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgViewAll=View All
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEditSpecialists=Edit Specialists Listing
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formSelectTeam=Select Team 
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formViewAll=View All
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.btnConsReq=Consultation Requests for this team
--- 1096,1100 ----
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgViewAll=View All
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEditSpecialists=Edit Specialists Listing
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formSelectTeam=Select Team
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formViewAll=View All
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.btnConsReq=Consultation Requests for this team
***************
*** 1308,1312 ****
  
  oscarEncounter.immunization.config.immunizationSetDisplay.title=Immunization Schedule
! oscarEncounter.immunization.config.immunizationSetDisplay.msgSet=Set 
  
  oscarEncounter.class.EctSaveEncounterAction.msgSigned=Signed on
--- 1310,1314 ----
  
  oscarEncounter.immunization.config.immunizationSetDisplay.title=Immunization Schedule
! oscarEncounter.immunization.config.immunizationSetDisplay.msgSet=Set
  
  oscarEncounter.class.EctSaveEncounterAction.msgSigned=Signed on
***************
*** 2209,2216 ****
  demographic.footer.btnClose=Close this Window
  
  demographic.demographicaddrecordhtm.title=ADD A DEMOGRAPHIC RECORD
  demographic.demographicaddrecordhtm.msgMissingFields=You must type in the following fields: Last Name, First Name, DOB, and Sex.
  demographic.demographicaddrecordhtm.msgMainLabel=ADD A DEMOGRAPHIC RECORD
! demographic.demographicaddrecordhtm.msgSearch=Search 
  demographic.demographicaddrecordhtm.formName=Name
  demographic.demographicaddrecordhtm.formPhone=Phone
--- 2211,2229 ----
  demographic.footer.btnClose=Close this Window
  
+ #Next of kin info
+ demographic.demographicaddrecordhtm.nok=Next of Kin
+ demographic.demographicaddrecordhtm.nok_fname=First Name
+ demographic.demographicaddrecordhtm.nok_lname=Last Name
+ demographic.demographicaddrecordhtm.nok_email=Email
+ demographic.demographicaddrecordhtm.nok_phone=Cell
+ demographic.demographicaddrecordhtm.nok_postal=Postal Code
+ demographic.demographicaddrecordhtm.nok_city=City
+ demographic.demographicaddrecordhtm.nok_address=Address
+ demographic.demographicaddrecordhtm.nok_province=Province
+ 
  demographic.demographicaddrecordhtm.title=ADD A DEMOGRAPHIC RECORD
  demographic.demographicaddrecordhtm.msgMissingFields=You must type in the following fields: Last Name, First Name, DOB, and Sex.
  demographic.demographicaddrecordhtm.msgMainLabel=ADD A DEMOGRAPHIC RECORD
! demographic.demographicaddrecordhtm.msgSearch=Search
  demographic.demographicaddrecordhtm.formName=Name
  demographic.demographicaddrecordhtm.formPhone=Phone
***************
*** 2224,2227 ****
--- 2237,2241 ----
  demographic.demographicaddrecordhtm.formprovince=Province
  demographic.demographicaddrecordhtm.formPostal=Postal
+ demographic.demographicaddrecordhtm.formPhoneCell=Cell Phone
  demographic.demographicaddrecordhtm.formPhoneHome=Phone (H)
  demographic.demographicaddrecordhtm.formPhoneWork=Phone (W)
***************
*** 2352,2356 ****
  billing.manageBillingform.msgDeleteBillingConfirm=You are about to delete the billing form, are you sure?
  billing.manageBillingform.msgBilling=Billing
! billing.manageBillingform.formServiceCode=service code 
  billing.manageBillingform.formDxCode=Dx Code
  billing.manageBillingform.formSelectForm=Select form
--- 2366,2370 ----
  billing.manageBillingform.msgDeleteBillingConfirm=You are about to delete the billing form, are you sure?
  billing.manageBillingform.msgBilling=Billing
! billing.manageBillingform.formServiceCode=service code
  billing.manageBillingform.formDxCode=Dx Code
  billing.manageBillingform.formSelectForm=Select form
***************
*** 2386,2390 ****
  billing.billingCorrection.formHealth=Health#
  billing.billingCorrection.msgSex=Sex
! billing.billingCorrection.formDOB=D.O.B. 
  billing.billingCorrection.msgAddress=Address
  billing.billingCorrection.msgCity=City
--- 2400,2404 ----
  billing.billingCorrection.formHealth=Health#
  billing.billingCorrection.msgSex=Sex
! billing.billingCorrection.formDOB=D.O.B.
  billing.billingCorrection.msgAddress=Address
  billing.billingCorrection.msgCity=City
***************
*** 2465,2469 ****
  billing.billingCorrection.msgPatientInformation=Patient Information
  billing.billingCorrection.msgName=Patient Name
! billing.billingCorrection.msgHealthNo=Health# 
  billing.billingCorrection.msgSex=Sex
  billing.billingCorrection.msgDOB=D.O.B.
--- 2479,2483 ----
  billing.billingCorrection.msgPatientInformation=Patient Information
  billing.billingCorrection.msgName=Patient Name
! billing.billingCorrection.msgHealthNo=Health#
  billing.billingCorrection.msgSex=Sex
  billing.billingCorrection.msgDOB=D.O.B.
***************
*** 2540,2552 ****
  admin.resourcebaseurl.msgTitle=RESOURCE BASE URL
  admin.resourcebaseurl.formBaseUrl=Base URL: <font size='-2'>(e.g. http://oscar.mcmaster.ca)</font>
! admin.resourcebaseurl.btnSave= Save 
! admin.resourcebaseurl.btnExit= Exit 
  
  admin.providertemplate.title=ADD/DELETE A TEMPLATE
  admin.providertemplate.msgTitle=ADD/EDIT A TEMPLATE
  admin.providertemplate.formEdit=Edit Template
! admin.providertemplate.btnEdit= Edit 
! admin.providertemplate.btnSave= Save 
! admin.providertemplate.btnExit= Exit 
  admin.providertemplate.btnDelete=Delete
  
--- 2554,2566 ----
  admin.resourcebaseurl.msgTitle=RESOURCE BASE URL
  admin.resourcebaseurl.formBaseUrl=Base URL: <font size='-2'>(e.g. http://oscar.mcmaster.ca)</font>
! admin.resourcebaseurl.btnSave= Save
! admin.resourcebaseurl.btnExit= Exit
  
  admin.providertemplate.title=ADD/DELETE A TEMPLATE
  admin.providertemplate.msgTitle=ADD/EDIT A TEMPLATE
  admin.providertemplate.formEdit=Edit Template
! admin.providertemplate.btnEdit= Edit
! admin.providertemplate.btnSave= Save
! admin.providertemplate.btnExit= Exit
  admin.providertemplate.btnDelete=Delete
  
***************
*** 2669,2673 ****
  schedule.scheduleflipview.msgLastMonth=Last Month
  schedule.scheduleflipview.msgNextmonth=Next Month
! schedule.scheduleflipview.btnNextMonth=next month 
  schedule.scheduleflipview.btnLastMonth=last month
  
--- 2683,2687 ----
  schedule.scheduleflipview.msgLastMonth=Last Month
  schedule.scheduleflipview.msgNextmonth=Next Month
! schedule.scheduleflipview.btnNextMonth=next month
  schedule.scheduleflipview.btnLastMonth=last month
  
***************
*** 2712,2719 ****
  admin.updatedemographicprovider.msgResident=Resident
  admin.updatedemographicprovider.formReplace=replace
! admin.updatedemographicprovider.formUse=Use 
  admin.updatedemographicprovider.formCondition=ON CONDITION <br>patient's last name from
  admin.updatedemographicprovider.formTo=to
! admin.updatedemographicprovider.btnGo= Go 
  admin.updatedemographicprovider.msgNurse=Nurse
  
--- 2726,2733 ----
  admin.updatedemographicprovider.msgResident=Resident
  admin.updatedemographicprovider.formReplace=replace
! admin.updatedemographicprovider.formUse=Use
  admin.updatedemographicprovider.formCondition=ON CONDITION <br>patient's last name from
  admin.updatedemographicprovider.formTo=to
! admin.updatedemographicprovider.btnGo= Go
  admin.updatedemographicprovider.msgNurse=Nurse
  
***************
*** 2821,2826 ****
  provider.providernewgroup.msgGroupNo=Group No.
  provider.providernewgroup.msgMaxChars=(Max. 10 chars.)
! provider.providernewgroup.btnExit= Exit 
! provider.providernewgroup.btnSave= Save 
  
  provider.providerdisplaymygroup.title=My Group
--- 2835,2840 ----
  provider.providernewgroup.msgGroupNo=Group No.
  provider.providernewgroup.msgMaxChars=(Max. 10 chars.)
! provider.providernewgroup.btnExit= Exit
! provider.providernewgroup.btnSave= Save
  
  provider.providerdisplaymygroup.title=My Group
***************
*** 2830,2834 ****
  provider.providerdisplaymygroup.btnDelete=Delete
  provider.providerdisplaymygroup.btnNew=New Group/Add a Member
! provider.providerdisplaymygroup.btnClose= Exit 
  
  provider.providersavemygroup.msgTitle=ADD MYGROUP RECORDS
--- 2844,2848 ----
  provider.providerdisplaymygroup.btnDelete=Delete
  provider.providerdisplaymygroup.btnNew=New Group/Add a Member
! provider.providerdisplaymygroup.btnClose= Exit
  
  provider.providersavemygroup.msgTitle=ADD MYGROUP RECORDS
***************
*** 2862,2866 ****
  receptionist.receptionistdisplaymygroup.btnDelete=Delete
  receptionist.receptionistdisplaymygroup.btnNew=New Group/Add a Member
! receptionist.receptionistdisplaymygroup.btnExit= Exit 
  
  receptionist.receptionistnewgroup.title=New Group
--- 2876,2880 ----
  receptionist.receptionistdisplaymygroup.btnDelete=Delete
  receptionist.receptionistdisplaymygroup.btnNew=New Group/Add a Member
! receptionist.receptionistdisplaymygroup.btnExit= Exit
  
  receptionist.receptionistnewgroup.title=New Group
***************
*** 2869,2874 ****
  receptionist.receptionistnewgroup.msgGroupNo=Group No.
  receptionist.receptionistnewgroup.msgMaxChar=(Max. 10 chars.)
! receptionist.receptionistnewgroup.btnExit= Exit 
! receptionist.receptionistnewgroup.btnSave= Save 
  
  report.reportindex.title=REPORT SETTING
--- 2883,2888 ----
  receptionist.receptionistnewgroup.msgGroupNo=Group No.
  receptionist.receptionistnewgroup.msgMaxChar=(Max. 10 chars.)
! receptionist.receptionistnewgroup.btnExit= Exit
! receptionist.receptionistnewgroup.btnSave= Save
  
  report.reportindex.title=REPORT SETTING
***************
*** 2919,2923 ****
  report.reportactivepatientlist.msgLastName=Last Name
  report.reportactivepatientlist.msgFirstName=First Name
! report.reportactivepatientlist.msgChart=Chart No 
  report.reportactivepatientlist.msgAge=Age
  report.reportactivepatientlist.msgSex=Sex
--- 2933,2937 ----
  report.reportactivepatientlist.msgLastName=Last Name
  report.reportactivepatientlist.msgFirstName=First Name
! report.reportactivepatientlist.msgChart=Chart No
  report.reportactivepatientlist.msgAge=Age
  report.reportactivepatientlist.msgSex=Sex
***************
*** 2991,2994 ****
--- 3005,3009 ----
  demographic.demographiceditdemographic.formPhoneH=Phone(H)
  demographic.demographiceditdemographic.formPhoneW=Phone(W)
+ demographic.demographiceditdemographic.formPhoneC=Cell Phone
  demographic.demographiceditdemographic.formEmail=Email
  demographic.demographiceditdemographic.formPIN=PIN
***************
*** 3012,3016 ****
  demographic.demographiceditdemographic.formEndDate=End Date
  demographic.demographiceditdemographic.formAlert=Alert
! demographic.demographiceditdemographic.formNotes=Notes 
  demographic.demographiceditdemographic.btnUpdate=Update Record
  demographic.demographiceditdemographic.btnSwipeCard=Swipe Card
--- 3027,3031 ----
  demographic.demographiceditdemographic.formEndDate=End Date
  demographic.demographiceditdemographic.formAlert=Alert
! demographic.demographiceditdemographic.formNotes=Notes
  demographic.demographiceditdemographic.btnUpdate=Update Record
  demographic.demographiceditdemographic.btnSwipeCard=Swipe Card
***************
*** 3023,3027 ****
  eform.showmyform.title=ShowMyForm
  eform.showmyform.msgMyForm=My FORM
! eform.showmyform.btnAddEForm=Add E-Form 
  eform.showmyform.msgFormLybrary=Form Library
  eform.showmyform.btnDeleted=List Deleted Forms
--- 3038,3042 ----
  eform.showmyform.title=ShowMyForm
  eform.showmyform.msgMyForm=My FORM
! eform.showmyform.btnAddEForm=Add E-Form
  eform.showmyform.msgFormLybrary=Form Library
  eform.showmyform.btnDeleted=List Deleted Forms
***************
*** 3072,3076 ****
  pager.max.page.index=10
  pager.next.desc=Pr\u00F3ximo
! pager.prev.desc=Anterior 
  
  oscarEncounter.calculators.GeneralCalculators.title=General Conversions
--- 3087,3091 ----
  pager.max.page.index=10
  pager.next.desc=Pr\u00F3ximo
! pager.prev.desc=Anterior
  
  oscarEncounter.calculators.GeneralCalculators.title=General Conversions
***************
*** 3106,3110 ****
  oscarEncounter.calculators.GeneralCalculators.msgInstructions2=2. Type in temperature.
  oscarEncounter.calculators.GeneralCalculators.msgInstructions3=3. Click on the other box to calculate.
! oscarEncounter.calculators.GeneralCalculators.msgFahrenheit=Fahrenheit... 
  oscarEncounter.calculators.GeneralCalculators.msgCelsius=Celsius........
  oscarEncounter.calculators.GeneralCalculators.btnCalibrate=Calibrate
--- 3121,3125 ----
  oscarEncounter.calculators.GeneralCalculators.msgInstructions2=2. Type in temperature.
  oscarEncounter.calculators.GeneralCalculators.msgInstructions3=3. Click on the other box to calculate.
! oscarEncounter.calculators.GeneralCalculators.msgFahrenheit=Fahrenheit...
  oscarEncounter.calculators.GeneralCalculators.msgCelsius=Celsius........
  oscarEncounter.calculators.GeneralCalculators.btnCalibrate=Calibrate
***************
*** 3117,3123 ****
  
  oscarEncounter.calculators.OsteoporoticFracture.title=Average 10-Year probability (%) of an osteoporotic fracture
! oscarEncounter.calculators.OsteoporoticFracture.msgAverage=Average 10-Year Probability of   
  oscarEncounter.calculators.OsteoporoticFracture.msgOsteoporoticFracture=Osteoporotic fracture
! oscarEncounter.calculators.OsteoporoticFracture.msg10YearProb=10 Year Probability  
  oscarEncounter.calculators.OsteoporoticFracture.msgOverall=Overall average Probability
  oscarEncounter.calculators.OsteoporoticFracture.msgCalculators=calculators
--- 3132,3138 ----
  
  oscarEncounter.calculators.OsteoporoticFracture.title=Average 10-Year probability (%) of an osteoporotic fracture
! oscarEncounter.calculators.OsteoporoticFracture.msgAverage=Average 10-Year Probability of
  oscarEncounter.calculators.OsteoporoticFracture.msgOsteoporoticFracture=Osteoporotic fracture
! oscarEncounter.calculators.OsteoporoticFracture.msg10YearProb=10 Year Probability
  oscarEncounter.calculators.OsteoporoticFracture.msgOverall=Overall average Probability
  oscarEncounter.calculators.OsteoporoticFracture.msgCalculators=calculators
***************
*** 3228,3233 ****
  oscarEncounter.oscarMeasurements.SelectMeasurementGroup.selectGroup=Please select a group to edit
  oscarEncounter.oscarMeasurements.MeasurementsAction.deleteBtn=Delete
! oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group=Please Select types and press Add button to add types into the group\ 
! oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes=Select types and press Delete button to delete types from the group\ 
  oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes=All Types
  oscarEncounter.Index.measurements.editMeasurementGroup=Edit Measurement Group
--- 3243,3248 ----
  oscarEncounter.oscarMeasurements.SelectMeasurementGroup.selectGroup=Please select a group to edit
  oscarEncounter.oscarMeasurements.MeasurementsAction.deleteBtn=Delete
! oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group=Please Select types and press Add button to add types into the group\
! oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes=Select types and press Delete button to delete types from the group\
  oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes=All Types
  oscarEncounter.Index.measurements.editMeasurementGroup=Edit Measurement Group
***************
*** 3443,3449 ****
  admin.providerupdateprovider.btnDelete=Delete Record
  oscarEncounter.oscarMeasurements.AddMeasuringInstruction.successful=Measuring Instruction has been added successfully{0}
! provider.appointmentProviderAdminDay.rosterMsg=Roster Status:\ 
  
! provider.appointmentProviderAdminDay.versionMsg=Unknown version code:\ 
  
  oscarEncounter.Measurements.msgAddMeasurementStyleSheet=Add Measurement Style Sheet
--- 3458,3464 ----
  admin.providerupdateprovider.btnDelete=Delete Record
  oscarEncounter.oscarMeasurements.AddMeasuringInstruction.successful=Measuring Instruction has been added successfully{0}
! provider.appointmentProviderAdminDay.rosterMsg=Roster Status:\
  
! provider.appointmentProviderAdminDay.versionMsg=Unknown version code:\
  
  oscarEncounter.Measurements.msgAddMeasurementStyleSheet=Add Measurement Style Sheet
***************
*** 3875,3879 ****
  admin.admin.btnImportFormData=Import Form Data
  
! demographic.search.noResultsWereFound=No results were found\! 
  
  demographic.record=Record
--- 3890,3894 ----
  admin.admin.btnImportFormData=Import Form Data
  
! demographic.search.noResultsWereFound=No results were found\!
  
  demographic.record=Record
***************
*** 3889,3890 ****
--- 3904,3906 ----
  
  oscarEncounter.oscarMeasurements.Measurements.headingMax4Characters=max. 4 characters
+ oscar.oscarRx.hin=Health Ins.#

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx Preview.jsp,1.1,1.2

[joel <jl...@us...>]

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

Modified Files:
	Preview.jsp 
Log Message:
Display Province agnostic health insurance label and number

Index: Preview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/Preview.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Preview.jsp	5 Feb 2004 19:26:42 -0000	1.1
--- Preview.jsp	9 Feb 2005 06:56:25 -0000	1.2
***************
*** 6,32 ****
  <% response.setHeader("Cache-Control","no-cache");%>
  
! <!--  
  /*
!  * 
   * 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 
   */
  -->
--- 6,32 ----
  <% response.setHeader("Cache-Control","no-cache");%>
  
! <!--
  /*
!  *
   * 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
   */
  -->
***************
*** 88,95 ****
--- 88,99 ----
                  <tr>
                      <td align=left valign=top>
+                       	<br>
                          <%= patient.getFirstName() %> <%= patient.getSurname() %><br>
                          <%= patient.getAddress() %><br>
                          <%= patient.getCity() %> <%= patient.getPostal() %><br>
                          <%= patient.getPhone() %><br>
+                         <b>
+                         <bean:message key="oscar.oscarRx.hin"/><%= patient.getHin() %>
+                       </b>
                      </td>
                      <td align=right valign=top><b>
***************
*** 110,114 ****
                              rx = bean.getStashItem(i);
                              %>
!                            
                              <%= rx.getFullOutLine().replaceAll(";","<br/>") %>
                              <hr>
--- 114,118 ----
                              rx = bean.getStashItem(i);
                              %>
! 
                              <%= rx.getFullOutLine().replaceAll(";","<br/>") %>
                              <hr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ConsultationFormRequest.jsp,1.13,1.14

[joel <jl...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14897/web/oscarEncounter/oscarConsultationRequest

Modified Files:
	ConsultationFormRequest.jsp 
Log Message:
Added  "Patient Will Book" option

Index: ConsultationFormRequest.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** ConsultationFormRequest.jsp	18 Nov 2004 02:59:24 -0000	1.13
--- ConsultationFormRequest.jsp	9 Feb 2005 05:44:44 -0000	1.14
***************
*** 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
   */
  -->
***************
*** 34,38 ****
      response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
      response.setHeader("Pragma","no-cache"); //HTTP 1.0
!     response.setDateHeader ("Expires", 0); //prevents caching at the proxy 
  %>
  
--- 34,38 ----
      response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
      response.setHeader("Pragma","no-cache"); //HTTP 1.0
!     response.setDateHeader ("Expires", 0); //prevents caching at the proxy
  %>
  
***************
*** 49,53 ****
  if (demo != null ){
      demoData = new oscar.oscarDemographic.data.DemographicData();
!     demographic = demoData.getDemographic(demo);    
  }
  
--- 49,53 ----
  if (demo != null ){
      demoData = new oscar.oscarDemographic.data.DemographicData();
!     demographic = demoData.getDemographic(demo);
  }
  
***************
*** 67,73 ****
  
  OscarProperties props = OscarProperties.getInstance();
! %>
! 
! <head>
  <title>
  <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.title"/>
--- 67,71 ----
  
  OscarProperties props = OscarProperties.getInstance();
! %><head>
  <title>
  <bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.title"/>
***************
*** 125,128 ****
--- 123,128 ----
  </head>
  
+ 
+ 
  <link type="text/javascript" src="../consult.js"/>
  
***************
*** 155,158 ****
--- 155,178 ----
  //-------------------------------------------------------------------
  
+ //-----------------disableDateFields() disables date fields if "Patient Will Book" selected
+ function disableDateFields(){
+ 	if(document.forms[0].patientWillBook.checked){
+ 		document.forms[0].appointmentYear.disabled = true;
+ 		document.forms[0].appointmentMonth.disabled = true;
+ 		document.forms[0].appointmentDay.disabled = true;
+ 		document.forms[0].appointmentHour.disabled = true;
+ 		document.forms[0].appointmentMinute.disabled = true;
+ 		document.forms[0].appointmentPm.disabled = true;
+ 	}
+ 	else{
+ 		document.forms[0].appointmentYear.disabled = false;
+ 		document.forms[0].appointmentMonth.disabled = false;
+ 		document.forms[0].appointmentDay.disabled = false;
+ 		document.forms[0].appointmentHour.disabled = false;
+ 		document.forms[0].appointmentMinute.disabled = false;
+ 		document.forms[0].appointmentPm.disabled = false;
+ 	}
+ }
+ //------------------------------------------------------------------------------------------
  /////////////////////////////////////////////////////////////////////
  // create car model objects and fill arrays
***************
*** 364,372 ****
  }
  
! function checkForm(submissionVal,formName){  
  
     var msg = "<bean:message key="Errors.service.noServiceSelected"/>";
     msg  = msg.replace('<li>','');
!    msg  = msg.replace('</li>','');   
    if (document.EctConsultationFormRequestForm.service.options.selectedIndex == 0){
       alert(msg);
--- 384,392 ----
  }
  
! function checkForm(submissionVal,formName){
  
     var msg = "<bean:message key="Errors.service.noServiceSelected"/>";
     msg  = msg.replace('<li>','');
!    msg  = msg.replace('</li>','');
    if (document.EctConsultationFormRequestForm.service.options.selectedIndex == 0){
       alert(msg);
***************
*** 374,378 ****
       return false;
    }
!   document.forms[formName].submission.value=submissionVal; 
    document.forms[formName].submit();
    return true;
--- 394,398 ----
       return false;
    }
!   document.forms[formName].submission.value=submissionVal;
    document.forms[formName].submit();
    return true;
***************
*** 380,387 ****
  </script>
  <link rel="stylesheet" type="text/css" href="../encounterStyles.css">
! <body topmargin="0" leftmargin="0" vlink="#0000FF" onload="window.focus();">
  <html:errors/>
  
! <html:form action="/oscarEncounter/RequestConsultation" onsubmit="alert('HTHT'); return false;" >
          <input type="hidden" name="providerNo" value="<%=providerNo%>">
          <input type="hidden" name="demographicNo" value="<%=demo%>">
--- 400,407 ----
  </script>
  <link rel="stylesheet" type="text/css" href="../encounterStyles.css">
! <body topmargin="0" leftmargin="0" vlink="#0000FF" onload="window.focus();disableDateFields()">
  <html:errors/>
  
! <html:form action="/oscarEncounter/RequestConsultation" onsubmit="alert('HTHT'); return false;">
          <input type="hidden" name="providerNo" value="<%=providerNo%>">
          <input type="hidden" name="demographicNo" value="<%=demo%>">
***************
*** 411,414 ****
--- 431,435 ----
                  thisForm.setAppointmentNotes(consultUtil.appointmentNotes);
                  thisForm.setUrgency(consultUtil.urgency);
+                 thisForm.setPatientWillBook(consultUtil.pwb);
  
                  // System.out.println("this is from in the form setter "+ consultUtil.patientName);
***************
*** 416,420 ****
  
          }else if(request.getAttribute("validateError") == null){
!             //  new request              
                  thisForm.setAllergies(demographic.RxInfo.getAllergies());
    		thisForm.setCurrentMedications(demographic.RxInfo.getCurrentMedication());
--- 437,441 ----
  
          }else if(request.getAttribute("validateError") == null){
!             //  new request
                  thisForm.setAllergies(demographic.RxInfo.getAllergies());
    		thisForm.setCurrentMedications(demographic.RxInfo.getCurrentMedication());
***************
*** 423,427 ****
                  thisForm.setConcurrentProblems(demographic.EctInfo.getOngoingConcerns());
          	thisForm.setAppointmentYear(year);
!                                    
  	}
          %>
--- 444,448 ----
                  thisForm.setConcurrentProblems(demographic.EctInfo.getOngoingConcerns());
          	thisForm.setAppointmentYear(year);
! 
  	}
          %>
***************
*** 438,442 ****
                          <td class="Header" style="padding-left:2px;padding-right:2px;border-right:2px solid #003399;text-align:left;font-size:80%;font-weight:bold;width:100%;" NOWRAP >
                              <%=consultUtil.patientName%> <%=consultUtil.patientSex%> <%=consultUtil.patientAge%>
!                         </td>                                               
                      </tr>
                  </table>
--- 459,463 ----
                          <td class="Header" style="padding-left:2px;padding-right:2px;border-right:2px solid #003399;text-align:left;font-size:80%;font-weight:bold;width:100%;" NOWRAP >
                              <%=consultUtil.patientName%> <%=consultUtil.patientSex%> <%=consultUtil.patientAge%>
!                         </td>
                      </tr>
                  </table>
***************
*** 509,513 ****
              </table>
              </td>
!             <td class="MainTableRightColumn">       
       <table cellpadding="0" cellspacing="2" style="border-collapse: collapse" bordercolor="#111111" width="100%" height="100%" border=1>
  
--- 530,534 ----
              </table>
              </td>
!             <td class="MainTableRightColumn">
       <table cellpadding="0" cellspacing="2" style="border-collapse: collapse" bordercolor="#111111" width="100%" height="100%" border=1>
  
***************
*** 564,568 ****
                      <html:select property="urgency">
                           <html:option value="2"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgNUrgent"/></html:option>
!                          <html:option value="1"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgUrgent"/></html:option>                         
                           <html:option value="3"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgReturn"/></html:option>
                      </html:select>
--- 585,589 ----
                      <html:select property="urgency">
                           <html:option value="2"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgNUrgent"/></html:option>
!                          <html:option value="1"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgUrgent"/></html:option>
                           <html:option value="3"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.msgReturn"/></html:option>
                      </html:select>
***************
*** 585,588 ****
--- 606,610 ----
                  </td>
              </tr>
+ 
              <tr>
                  <td class="tite4" >
***************
*** 593,600 ****
                  </td>
              </tr>
              <tr>
                  <td class="tite4">
                <a href="javascript:popupOscarCal(300,380,'https://<%=request.getServerName() %>:<%=request.getServerPort()%><%=request.getContextPath()%>/oscarEncounter/oscarConsultationRequest/CalendarPopup.jsp?year=<%=year%>&month=<%=mon%>')"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnAppointmentDate"/>:</a>
!    
                  </td>
                  <td align="right" class="tite3">
--- 615,629 ----
                  </td>
              </tr>
+ 			 <tr>
+               <td class="tite4" >Patient Will Book: </td>
+               <td align="right" class="tite3">
+                 <html:checkbox property="patientWillBook" value="1" onclick="disableDateFields()" >
+                 </html:checkbox>
+               </td>
+             </tr>
              <tr>
                  <td class="tite4">
                <a href="javascript:popupOscarCal(300,380,'https://<%=request.getServerName() %>:<%=request.getServerPort()%><%=request.getContextPath()%>/oscarEncounter/oscarConsultationRequest/CalendarPopup.jsp?year=<%=year%>&month=<%=mon%>')"><bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.btnAppointmentDate"/>:</a>
! 
                  </td>
                  <td align="right" class="tite3">
***************
*** 729,737 ****
              </tr>
              <tr>
!                 <td class="tite4">
!                 &nbsp;
                  </td>
!                 <td class="tite4">
!                 &nbsp;
                  </td>
              </tr>
--- 758,766 ----
              </tr>
              <tr>
!                 <td class="tite4">&nbsp;
! 
                  </td>
!                 <td class="tite4">&nbsp;
! 
                  </td>
              </tr>
***************
*** 757,761 ****
         <tr>
              <td colspan=2>
!                 &nbsp;
              <td>
         </tr>
--- 786,790 ----
         <tr>
              <td colspan=2>
! 
              <td>
         </tr>
***************
*** 777,781 ****
         <tr>
              <td colspan=2>
!                 <html:textarea cols="90" rows="3" property="clinicalInformation"></html:textarea>
              </td>
         </tr>
--- 806,810 ----
         <tr>
              <td colspan=2>
!                 <html:textarea cols="90" rows="10" property="clinicalInformation"></html:textarea>
              </td>
         </tr>
***************
*** 821,825 ****
         </tr>
         <tr>
!             <td colspan=2>            
  	        <input type="hidden" name="submission" value="">
                  <%if (request.getAttribute("id") != null){ %>
--- 850,854 ----
         </tr>
         <tr>
!             <td colspan=2>
  	        <input type="hidden" name="submission" value="">
                  <%if (request.getAttribute("id") != null){ %>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ConsultationFormPrint.jsp,1.11,1.12

[joel <jl...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14460/web/oscarEncounter/oscarConsultationRequest

Modified Files:
	ConsultationFormPrint.jsp 
Log Message:
Displays "Patient Will Book" instead of date if that option is selected

Index: ConsultationFormPrint.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormPrint.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ConsultationFormPrint.jsp	19 May 2004 19:42:25 -0000	1.11
--- ConsultationFormPrint.jsp	9 Feb 2005 05:43:32 -0000	1.12
***************
*** 1,546 ****
! <%--  
  /*
   * 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 
[...1615 lines suppressed...]
+ 
+ 
      i++;
+ 
      }
  
  
+ 
+ 
+ 
  return stringBuffer.toString();
  
+ 
+ 
  }
  
+ 
+ 
  %>
+ 

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil BillingViewAction.java,1.5,1.6

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

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

Modified Files:
	BillingViewAction.java 
Log Message:
changed setPatientDoB to be set with the DateOfBirth instead of FirstName



Index: BillingViewAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/bc/pageUtil/BillingViewAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BillingViewAction.java	3 Jan 2005 20:13:29 -0000	1.5
--- BillingViewAction.java	6 Feb 2005 23:25:58 -0000	1.6
***************
*** 81,85 ****
              bean.setPatientLastName(demo.getLastName());
              bean.setPatientFirstName(demo.getFirstName());
!             bean.setPatientDoB(demo.getFirstName());
              bean.setPatientAddress1(demo.getAddress());
              bean.setPatientAddress2(demo.getCity());
--- 81,85 ----
              bean.setPatientLastName(demo.getLastName());
              bean.setPatientFirstName(demo.getFirstName());
!             bean.setPatientDoB(demo.getDateOfBirth());
              bean.setPatientAddress1(demo.getAddress());
              bean.setPatientAddress2(demo.getCity());

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form FrmAction.java,1.5,1.6

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

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

Modified Files:
	FrmAction.java 
Log Message:
fix a bug for saving ar1 with no some ar2 records

Index: FrmAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/FrmAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** FrmAction.java	28 Dec 2004 16:57:38 -0000	1.5
--- FrmAction.java	4 Feb 2005 02:57:53 -0000	1.6
***************
*** 1,28 ****
  /*
-  *
   * 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
   */
  // form_class - a part of class name
  // c_lastVisited, formId - if the form has multiple pages
- 
  package oscar.form;
  
--- 1,17 ----
  /*
   * 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
   */
  // form_class - a part of class name
  // c_lastVisited, formId - if the form has multiple pages
  package oscar.form;
  
***************
*** 41,123 ****
  
  public final class FrmAction extends Action {
!    public ActionForward execute(
!    ActionMapping mapping,
!    ActionForm form,
!    HttpServletRequest request,
!    HttpServletResponse response)
!    throws ServletException, IOException {
!       int newID = 0;
!       FrmRecord rec = null;
!       String where = "";
!       
!       try {
!          FrmRecordFactory recorder = new FrmRecordFactory();
!          rec = recorder.factory(request.getParameter("form_class"));
!          Properties props = new Properties();
!          
!          boolean bMulPage =
!          request.getParameter("c_lastVisited") != null ? true : false;
!          String name;
!          
!          if (bMulPage) {
!             String curPageNum = request.getParameter("c_lastVisited");
!             String commonField =
!             request.getParameter("commonField") != null
!             ? request.getParameter("commonField")
!             : "&'";
!             curPageNum =
!             curPageNum.length() > 3
!             ? ("" + curPageNum.charAt(0))
!             : curPageNum;
!             
!             //copy an old record
!             props =
!             rec.getFormRecord(
!             Integer.parseInt(
!             request.getParameter("demographic_no")),
!             Integer.parseInt(request.getParameter("formId")));
!             
!             //empty the current page
!             for (Enumeration enum = props.propertyNames();
!             enum.hasMoreElements();
!             ) {
!                name = (String) enum.nextElement();
!                if (name.startsWith(curPageNum + "_")
!                || name.startsWith(commonField)) {
!                   props.remove(name);
!                }
              }
!          }
!          
!          //update the current record
!          for (Enumeration enum = request.getParameterNames();
!          enum.hasMoreElements();
!          ) {
!             name = (String) enum.nextElement();
!             props.setProperty(name, request.getParameter(name));
!          }
!          
!          props.setProperty(
!          "provider_no",
!          (String) request.getSession().getAttribute("user"));
!          newID = rec.saveFormRecord(props);
!          
!          String strAction =
!          rec.findActionValue(request.getParameter("submit"));
!          ActionForward af = mapping.findForward(strAction);
!          where = af.getPath();
!          where =
!          rec.createActionURL(
!          where,
!          strAction,
!          request.getParameter("demographic_no"),
!          "" + newID);
!          
!       } catch (Exception ex) {
!          throw new ServletException(ex);
!       }
!       
!       return new ActionForward(where);
!    }
!    
! }
--- 30,93 ----
  
  public final class FrmAction extends Action {
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
!             HttpServletResponse response) throws ServletException, IOException {
!         int newID = 0;
!         FrmRecord rec = null;
!         String where = "";
! 
!         try {
!             FrmRecordFactory recorder = new FrmRecordFactory();
!             rec = recorder.factory(request.getParameter("form_class"));
!             Properties props = new Properties();
! 
!             boolean bMulPage = request.getParameter("c_lastVisited") != null ? true : false;
!             String name;
! 
!             if (bMulPage) {
!                 String curPageNum = request.getParameter("c_lastVisited");
!                 String commonField = request.getParameter("commonField") != null ? request
!                         .getParameter("commonField") : "&'";
!                 curPageNum = curPageNum.length() > 3 ? ("" + curPageNum.charAt(0)) : curPageNum;
! 
!                 //copy an old record
!                 props = rec.getFormRecord(Integer.parseInt(request.getParameter("demographic_no")), Integer
!                         .parseInt(request.getParameter("formId")));
! 
!                 //empty the current page
!                 Properties currentParam = new Properties();
!                 for (Enumeration enum = request.getParameterNames(); enum.hasMoreElements();) {
!                     name = (String) enum.nextElement();
!                     currentParam.setProperty(name, "");
!                 }
!                 for (Enumeration enum = props.propertyNames(); enum.hasMoreElements();) {
!                     name = (String) enum.nextElement();
!                     // kick off the current page elements, commonField on the current page
!                     if (name.startsWith(curPageNum + "_")
!                             || (name.startsWith(commonField) && currentParam.containsKey(name))) {
!                         props.remove(name);
!                     }
!                 }
              }
! 
!             //update the current record
!             for (Enumeration enum = request.getParameterNames(); enum.hasMoreElements();) {
!                 name = (String) enum.nextElement();
!                 props.setProperty(name, request.getParameter(name));
!             }
! 
!             props.setProperty("provider_no", (String) request.getSession().getAttribute("user"));
!             newID = rec.saveFormRecord(props);
! 
!             String strAction = rec.findActionValue(request.getParameter("submit"));
!             ActionForward af = mapping.findForward(strAction);
!             where = af.getPath();
!             where = rec.createActionURL(where, strAction, request.getParameter("demographic_no"), "" + newID);
! 
!         } catch (Exception ex) {
!             throw new ServletException(ex);
!         }
! 
!         return new ActionForward(where);
!     }
! 
! }
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.30,1.31

[Ivy C. <ic...@us...>]

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

Modified Files:
	formVTForm.jsp 
Log Message:
fixed waist hip ratio calcuation


Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** formVTForm.jsp	3 Feb 2005 20:47:37 -0000	1.30
--- formVTForm.jsp	3 Feb 2005 20:57:11 -0000	1.31
***************
*** 249,253 ****
      else if (document.forms[0].elements[hip].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[hip].value!=0 && document.forms[0].elements[ratio].value!=0){
          document.forms[0].elements[ratio].readOnly = true; 
!         document.forms[0].elements[waist].value = parseInt(parseFloat(r) / parseInt(h));
      }
      else{                
--- 249,253 ----
      else if (document.forms[0].elements[hip].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[hip].value!=0 && document.forms[0].elements[ratio].value!=0){
          document.forms[0].elements[ratio].readOnly = true; 
!         document.forms[0].elements[waist].value = parseInt(parseFloat(r) * parseInt(h));
      }
      else{                
***************
*** 267,271 ****
      else if (document.forms[0].elements[hip].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[hip].value!=0 && document.forms[0].elements[ratio].value!=0){
          document.forms[0].elements[ratio].readOnly = false; 
!         document.forms[0].elements[waist].value = parseInt(parseFloat(r) / parseInt(h));
      }
      else{                
--- 267,271 ----
      else if (document.forms[0].elements[hip].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[hip].value!=0 && document.forms[0].elements[ratio].value!=0){
          document.forms[0].elements[ratio].readOnly = false; 
!         document.forms[0].elements[waist].value = parseInt(parseFloat(r) * parseInt(h));
      }
      else{                

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.29,1.30

[Ivy C. <ic...@us...>]

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

Modified Files:
	formVTForm.jsp 
Log Message:
updated waist hip ratio calcuation
added clr button in the phsychosocial and med aherence sections



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** formVTForm.jsp	3 Feb 2005 04:05:58 -0000	1.29
--- formVTForm.jsp	3 Feb 2005 20:47:37 -0000	1.30
***************
*** 166,169 ****
--- 166,171 ----
      var smkSDate, smkHDate, smkCDate;
      var smkSCmt, smkHCmt, smkCCmt;
+     var DpScId, StScId, LcCtId;
+     var MedGId, MedNId, MedRId, MedAId;
      var FTExId, ftNeId, ftIsId, ftInId, ftUlId, ftOtId, ftReId;
      var FTExDate, ftNeDate, ftIsDate, ftInDate, ftUlDate, ftOtDate, ftReDate;
***************
*** 236,250 ****
  }
  
! function updateWaistHipRatio(){
!     
!     if (document.forms[0].elements[waist].value=="" || document.forms[0].elements[hip].value==""){
!         document.forms[0].elements[ratio].readOnly = false;
      }
!     else{
!         var r = document.forms[0].elements[ratio].value;
!         var w = document.forms[0].elements[waist].value;
!         var h = document.forms[0].elements[hip].value;
          document.forms[0].elements[ratio].value = parseInt(w) / parseInt(h);
!         document.forms[0].elements[ratio].readOnly = true;        
      }
  }
--- 238,292 ----
  }
  
! function updateWaistHip(){
!     var r = document.forms[0].elements[ratio].value;
!     var w = document.forms[0].elements[waist].value;
!     var h = document.forms[0].elements[hip].value;
! 
!    if (document.forms[0].elements[waist].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[waist].value!=0 && document.forms[0].elements[ratio].value!=0){
!         document.forms[0].elements[ratio].readOnly = true; 
!         document.forms[0].elements[hip].value = parseInt(parseInt(w) / parseFloat(r));       
      }
!     else if (document.forms[0].elements[hip].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[hip].value!=0 && document.forms[0].elements[ratio].value!=0){
!         document.forms[0].elements[ratio].readOnly = true; 
!         document.forms[0].elements[waist].value = parseInt(parseFloat(r) / parseInt(h));
!     }
!     else{                
!         document.forms[0].elements[ratio].readOnly = false;        
!     }
! }
! 
! function updateWaistAndRatio(){
!     var r = document.forms[0].elements[ratio].value;
!     var w = document.forms[0].elements[waist].value;
!     var h = document.forms[0].elements[hip].value;
! 
!      if (document.forms[0].elements[waist].value!="" && document.forms[0].elements[hip].value!="" && document.forms[0].elements[waist].value!=0 && document.forms[0].elements[hip].value!=0){
!         document.forms[0].elements[ratio].readOnly = true;
          document.forms[0].elements[ratio].value = parseInt(w) / parseInt(h);
!     }
!     else if (document.forms[0].elements[hip].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[hip].value!=0 && document.forms[0].elements[ratio].value!=0){
!         document.forms[0].elements[ratio].readOnly = false; 
!         document.forms[0].elements[waist].value = parseInt(parseFloat(r) / parseInt(h));
!     }
!     else{                
!         document.forms[0].elements[ratio].readOnly = false;        
!     }
! }
! 
! function updateHipAndRatio(){
!     var r = document.forms[0].elements[ratio].value;
!     var w = document.forms[0].elements[waist].value;
!     var h = document.forms[0].elements[hip].value;
! 
!     if (document.forms[0].elements[waist].value!="" && document.forms[0].elements[hip].value!="" && document.forms[0].elements[waist].value!=0 && document.forms[0].elements[hip].value!=0){
!         document.forms[0].elements[ratio].readOnly = true;
!         document.forms[0].elements[ratio].value = parseInt(w) / parseInt(h);
!     }
!     else if (document.forms[0].elements[waist].value!="" && document.forms[0].elements[ratio].value!="" && document.forms[0].elements[waist].value!=0 && document.forms[0].elements[ratio].value!=0){
!         document.forms[0].elements[ratio].readOnly = false; 
!         document.forms[0].elements[hip].value = parseInt(parseInt(w) / parseFloat(r));       
!     }
!     else{                
!         document.forms[0].elements[ratio].readOnly = false;        
      }
  }
***************
*** 388,391 ****
--- 430,442 ----
              case 'value(SmkCComments)': smkCCmt = i;  break;
              
+             case 'value(DpScValue)': DpScId = i;  break;
+             case 'value(StScValue)': StScId = i;  break;
+             case 'value(LcCtValue)': LcCtId = i;  break;
+                         
+             case 'value(MedGValue)': MedGId = i;  break;
+             case 'value(MedNValue)': MedNId = i;  break;
+             case 'value(MedRValue)': MedRId = i;  break;
+             case 'value(MedAValue)': MedAId = i;  break;
+             
              case 'value(FTExValue)': FTExId = i;  break;
              case 'value(FTNeValue)': ftNeId = i;  break;
***************
*** 791,794 ****
--- 842,846 ----
                                                          <html:radio property="value(DpScValue)" value="yes" />Yes
                                                          <html:radio property="value(DpScValue)" value="no" />No
+                                                         <a title="clear all" href="javascript:clearAll(DpScId, DpScId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(DpScDate)"/>
***************
*** 807,810 ****
--- 859,863 ----
                                                          <html:radio property="value(StScValue)" value="yes" />Yes 
                                                          <html:radio property="value(StScValue)" value="no" />No 
+                                                         <a title="clear all" href="javascript:clearAll(StScId, StScId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(StScDate)"/>
***************
*** 823,826 ****
--- 876,880 ----
                                                          <html:radio property="value(LcCtValue)" value="yes" />Yes 
                                                          <html:radio property="value(LcCtValue)" value="no" />No 
+                                                         <a title="clear all" href="javascript:clearAll(LcCtId, LcCtId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(LcCtDate)"/>
***************
*** 860,863 ****
--- 914,918 ----
                                                          <html:radio property="value(MedGValue)" value="yes" />Yes 
                                                          <html:radio property="value(MedGValue)" value="no" />No 
+                                                         <a title="clear all" href="javascript:clearAll(MedGId, MedGId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(MedGDate)"/>
***************
*** 876,879 ****
--- 931,935 ----
                                                          <html:radio property="value(MedNValue)" value="yes" />Yes 
                                                          <html:radio property="value(MedNValue)" value="no" />No
+                                                         <a title="clear all" href="javascript:clearAll(MedNId, MedNId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(MedNDate)"/>
***************
*** 892,895 ****
--- 948,952 ----
                                                          <html:radio property="value(MedRValue)" value="yes" />Yes 
                                                          <html:radio property="value(MedRValue)" value="no" />No 
+                                                         <a title="clear all" href="javascript:clearAll(MedRId, MedRId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(MedRDate)"/>
***************
*** 908,911 ****
--- 965,969 ----
                                                          <html:radio property="value(MedAValue)" value="yes" />Yes
                                                          <html:radio property="value(MedAValue)" value="no" />No
+                                                         <a title="clear all" href="javascript:clearAll(MedAId, MedAId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
                                                      </td>
                                                      <html:hidden property="value(MedADate)"/>
***************
*** 968,972 ****
                                                          
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onfocus="javascript: updateWaistHipRatio();"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td>
--- 1026,1030 ----
                                                          
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onchange="javascript: updateWaistHip();"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td>
***************
*** 984,988 ****
                                                          
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%" onchange="javascript: updateWaistHipRatio();"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
--- 1042,1046 ----
                                                          
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%" onchange="javascript: updateHipAndRatio();"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
***************
*** 1000,1004 ****
                                                          
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"  onchange="javascript: updateWaistHipRatio();"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td>
--- 1058,1062 ----
                                                          
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"  onchange="javascript: updateWaistAndRatio();"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarWaitingList DisplayWaitingList.jsp,1.2,1.3

[Ivy C. <ic...@us...>]

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

Modified Files:
	DisplayWaitingList.jsp 
Log Message:
added remove button
updated layout



Index: DisplayWaitingList.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarWaitingList/DisplayWaitingList.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DisplayWaitingList.jsp	3 Oct 2004 14:14:39 -0000	1.2
--- DisplayWaitingList.jsp	3 Feb 2005 19:02:16 -0000	1.3
***************
*** 29,36 ****
  -->
   <%
!   if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp");
  %>
  <%@ page language="java" %>
! <%@ page import="java.util.*,oscar.util.*" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
--- 29,39 ----
  -->
   <%
!     if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp");
!     response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
!     response.setHeader("Pragma","no-cache"); //HTTP 1.0
!     response.setDateHeader ("Expires", 0); //prevents caching at the proxy 
  %>
  <%@ page language="java" %>
! <%@ page import="java.util.*,oscar.util.*, oscar.oscarWaitingList.bean.*" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
***************
*** 49,52 ****
--- 52,56 ----
      window.location = '../oscarWaitingList/SetupDisplayWaitingList.do?waitingListId=' + document.forms[0].selectedWL.options[document.forms[0].selectedWL.selectedIndex].value
  }
+ 
  function popupPage(ctr, patientName, demographicNo, startDate, vheight,vwidth,varpage) { 
    var nbPatients = "<bean:write name="nbPatients"/>";  
***************
*** 67,87 ****
    }
  }
  </script>
! <body class="BodyStyle" vlink="#0000FF" onload='window.resizeTo(800,400)' >
  <!--  -->    
      <html:form action="/oscarWaitingList/WLWaitingList.do">    
      <table  class="MainTable" id="scrollNumber1" name="encounterTable">
          <tr class="MainTableTopRow">
!             <td class="MainTableTopRowLeftColumn">
                  Waiting List
              </td>
!             <td class="MainTableTopRowRightColumn" width="400">
                  <table class="TopStatusBar" >                 
                      <tr>    
!                         <td>Current List: <logic:present name="waitingListName"><bean:write name="waitingListName"/></logic:present></td>
!                         <td>Please Select a Waiting List:
                              <html:select property="selectedWL">
                                  <option value=""> </option>
!                                 <html:options collection="allWaitingListName" property="id" labelProperty="waitingListName"/>
                              </html:select>                        
                              <INPUT type="button" onClick="goToPage()" value="Generate Report">                            
--- 71,115 ----
    }
  }
+ 
+ function removePatient(demographicNo, waitingList){
+     var agree=confirm("Are you sure you want to remove this patient from the waiting list?");
+     if (agree){
+         windowprops = "height=50,width=50,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=50,screenY=50,top=0,left=0";
+         var page = 'RemoveFromWaitingList.jsp?listId='+waitingList+'&demographicNo='+demographicNo; 
+         var popup = window.open(page, "removeWaitingList", windowprops); 
+     }
+     else{
+         return false ;
+     }
+         
+     
+ }
  </script>
! <body class="BodyStyle" vlink="#0000FF" onload='window.resizeTo(900,400)' >
  <!--  -->    
      <html:form action="/oscarWaitingList/WLWaitingList.do">    
      <table  class="MainTable" id="scrollNumber1" name="encounterTable">
          <tr class="MainTableTopRow">
!             <td class="MainTableTopRowLeftColumn" width="20%">
                  Waiting List
              </td>
!             <td class="MainTableTopRowRightColumn" width="80%">
                  <table class="TopStatusBar" >                 
                      <tr>    
!                         <td width="250">Current List: <logic:present name="waitingListName"><bean:write name="waitingListName"/></logic:present></td>
!                         <td align="left">Please Select a Waiting List:                            
                              <html:select property="selectedWL">
                                  <option value=""> </option>
!                                 <%
!                                     WLWaitingListNameBeanHandler wlNameHd = new WLWaitingListNameBeanHandler();
!                                     Vector allWaitingListName = wlNameHd.getWaitingListNameVector();
!                                     for(int i=0; i<allWaitingListName.size(); i++){
!                                         WLWaitingListNameBean wLBean = (WLWaitingListNameBean) allWaitingListName.elementAt(i);
!                                         String id = wLBean.getId();
!                                         String name = wLBean.getWaitingListName();                                       
!                                         String selected = id.compareTo((String) request.getAttribute("WLId")==null?"0":(String) request.getAttribute("WLId"))==0?"SELECTED":"";                                        
!                                 %>
!                                  <option value="<%=id%>" <%=selected%>><%=name%></option>
!                                 <%}%>
                              </html:select>                        
                              <INPUT type="button" onClick="goToPage()" value="Generate Report">                            
***************
*** 95,99 ****
              </td>
              <td class="MainTableRightColumn">
!                <table border=0 cellspacing=4 width=700>
                  <tr>
                      <td>
--- 123,127 ----
              </td>
              <td class="MainTableRightColumn">
!                <table border=0 cellspacing=4 width="100%">
                  <tr>
                      <td>
***************
*** 102,107 ****
                                  <td>               
                                      <tr>
!                                         <td align="left" class="Header" width="50">
!                                             Position
                                          </td>                                        
                                          <td align="left" class="Header" width="100">
--- 130,134 ----
                                  <td>               
                                      <tr>
!                                         <td align="left" class="Header" width="20">                                            
                                          </td>                                        
                                          <td align="left" class="Header" width="100">
***************
*** 111,137 ****
                                              Phone
                                          </td>
!                                         <td align="left" class="Header" width="100">
                                              Note
                                          </td>
!                                         <td align="left" class="Header" width="100">
                                              On Waiting List Since
                                          </td> 
!                                         <td align="left" class="Header" width="250">
                                              Provider
                                          </td> 
                                       </tr>
                                      <logic:iterate id="waitingListBean" name="waitingList" property="waitingListVector" indexId = "ctr">
                                      <tr class="data">
!                                         <td width="50"><bean:write name="waitingListBean" property="position" /></td>
!                                         <td width="100"><bean:write name="waitingListBean" property="patientName" /></td>
!                                         <td width="100"><bean:write name="waitingListBean" property="phoneNumber" /></td>
!                                         <td width="100"><bean:write name="waitingListBean" property="note" /></td>
!                                         <td width="100"><bean:write name="waitingListBean" property="onListSince" /></td>
!                                         <td width="250" nowrap>
                                              <html:select property="selectedProvider">                                                
                                                  <html:options collection="allProviders" property="providerID" labelProperty="providerName"/>
!                                             </html:select>
                                              <a href=# onClick ="popupPage(<%=ctr%>,'<bean:write name="waitingListBean" property="patientName" />','<bean:write name="waitingListBean" property="demographicNo"/>','<bean:write name="today"/>',400,780,'../schedule/scheduleflipview.jsp?originalpage=../oscarWaitingList/DisplayWaitingList.jsp');return false;">Make Appointment</a>
                                          </td>
                                      </tr>                        
                                      </logic:iterate>                                    
--- 138,169 ----
                                              Phone
                                          </td>
!                                         <td align="left" class="Header" width="150">
                                              Note
                                          </td>
!                                         <td align="left" class="Header" width="130">
                                              On Waiting List Since
                                          </td> 
!                                         <td align="left" class="Header" width="300">
                                              Provider
                                          </td> 
+                                         <td align="left" class="Header" width="50">                                        
+                                         </td>
                                       </tr>
                                      <logic:iterate id="waitingListBean" name="waitingList" property="waitingListVector" indexId = "ctr">
                                      <tr class="data">
!                                         <td ><bean:write name="waitingListBean" property="position" /></td>
!                                         <td><bean:write name="waitingListBean" property="patientName" /></td>
!                                         <td><bean:write name="waitingListBean" property="phoneNumber" /></td>
!                                         <td><bean:write name="waitingListBean" property="note" /></td>
!                                         <td><bean:write name="waitingListBean" property="onListSince" /></td>
!                                         <td>
                                              <html:select property="selectedProvider">                                                
                                                  <html:options collection="allProviders" property="providerID" labelProperty="providerName"/>
!                                             </html:select> 
                                              <a href=# onClick ="popupPage(<%=ctr%>,'<bean:write name="waitingListBean" property="patientName" />','<bean:write name="waitingListBean" property="demographicNo"/>','<bean:write name="today"/>',400,780,'../schedule/scheduleflipview.jsp?originalpage=../oscarWaitingList/DisplayWaitingList.jsp');return false;">Make Appointment</a>
                                          </td>
+                                         <td>
+                                             <a href=# onClick ="removePatient('<bean:write name="waitingListBean" property="demographicNo"/>', '<bean:write name="WLId"/>');">Remove</a>
+                                         </td>
                                      </tr>                        
                                      </logic:iterate>                                    

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/bean WLWaitingListNameBeanHandler.java,1.2,1.3

[Ivy C. <ic...@us...>]

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

Modified Files:
	WLWaitingListNameBeanHandler.java 
Log Message:
updated getWaitingListNameVector to return Vector



Index: WLWaitingListNameBeanHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/bean/WLWaitingListNameBeanHandler.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** WLWaitingListNameBeanHandler.java	30 Sep 2004 01:04:49 -0000	1.2
--- WLWaitingListNameBeanHandler.java	3 Feb 2005 18:33:14 -0000	1.3
***************
*** 67,71 ****
      }
          
!     public Collection getWaitingListNameVector(){
          return waitingListNameVector;
      }    
--- 67,71 ----
      }
          
!     public Vector getWaitingListNameVector(){
          return waitingListNameVector;
      }    

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/pageUtil WLSetupDisplayWaitingListAction.java,1.4,1.5

[Ivy C. <ic...@us...>]

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

Modified Files:
	WLSetupDisplayWaitingListAction.java 
Log Message:
set waitingList id attribute



Index: WLSetupDisplayWaitingListAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarWaitingList/pageUtil/WLSetupDisplayWaitingListAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** WLSetupDisplayWaitingListAction.java	15 Oct 2004 22:33:52 -0000	1.4
--- WLSetupDisplayWaitingListAction.java	3 Feb 2005 18:32:49 -0000	1.5
***************
*** 57,71 ****
          ProviderNameBeanHandler phd = new ProviderNameBeanHandler();
          WLWaitingListNameBeanHandler wlNameHd = new WLWaitingListNameBeanHandler();
!         Collection allWaitingListName = wlNameHd.getWaitingListNameVector();
          phd.setThisGroupProviderVector((String) session.getAttribute("groupno"));
          Collection allProviders = phd.getThisGroupProviderVector();
          String nbPatients = Integer.toString(hd.getWaitingListVector().size());
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(), "yyyy-MM-dd");
!        
          session.setAttribute( "waitingList", hd );            
          session.setAttribute("waitingListName", hd.getWaitingListName());
          session.setAttribute("allProviders", allProviders);
          session.setAttribute("nbPatients", nbPatients);
!         session.setAttribute("allWaitingListName", allWaitingListName);
          session.setAttribute("today", today);
          return (mapping.findForward("continue"));
--- 57,72 ----
          ProviderNameBeanHandler phd = new ProviderNameBeanHandler();
          WLWaitingListNameBeanHandler wlNameHd = new WLWaitingListNameBeanHandler();
!         //Vector allWaitingListName = wlNameHd.getWaitingListNameVector();
          phd.setThisGroupProviderVector((String) session.getAttribute("groupno"));
          Collection allProviders = phd.getThisGroupProviderVector();
          String nbPatients = Integer.toString(hd.getWaitingListVector().size());
          String today = UtilDateUtilities.DateToString(UtilDateUtilities.Today(), "yyyy-MM-dd");
!              
!         request.setAttribute("WLId", waitingListId);
          session.setAttribute( "waitingList", hd );            
          session.setAttribute("waitingListName", hd.getWaitingListName());
          session.setAttribute("allProviders", allProviders);
          session.setAttribute("nbPatients", nbPatients);
!         //session.setAttribute("allWaitingListName", allWaitingListName);
          session.setAttribute("today", today);
          return (mapping.findForward("continue"));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarWaitingList RemoveFromWaitingList.jsp,1.2,1.3

[Ivy C. <ic...@us...>]

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

Modified Files:
	RemoveFromWaitingList.jsp 
Log Message:
updated opener reload function



Index: RemoveFromWaitingList.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarWaitingList/RemoveFromWaitingList.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RemoveFromWaitingList.jsp	12 Jan 2005 21:31:07 -0000	1.2
--- RemoveFromWaitingList.jsp	3 Feb 2005 18:31:40 -0000	1.3
***************
*** 57,63 ****
      <tr>
          <td> Update waiting list </td> 
!         <script language="javascript">
              self.close();
-             self.opener.refresh();
          </script>
      </tr>
--- 57,63 ----
      <tr>
          <td> Update waiting list </td> 
!         <script language="javascript">            
!             window.opener.location.reload();
              self.close();
          </script>
      </tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.28,1.29

[Ivy C. <ic...@us...>]

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

Modified Files:
	formVTForm.jsp 
Log Message:
updated the cell width of the patient's name cell



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** formVTForm.jsp	31 Jan 2005 21:32:04 -0000	1.28
--- formVTForm.jsp	3 Feb 2005 04:05:58 -0000	1.29
***************
*** 578,582 ****
                                                  <table width="95%">
                                                      <tr>
!                                                         <td width="30%">
                                                              <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present>
                                                          </td>
--- 578,582 ----
                                                  <table width="95%">
                                                      <tr>
!                                                         <td width="25%">
                                                              <logic:present name="EctSessionBean"><bean:write name="EctSessionBean" property="patientLastName"/> <bean:write name="EctSessionBean" property="patientFirstName"/> <bean:write name="EctSessionBean" property="patientSex"/> <bean:write name="EctSessionBean" property="patientAge"/></logic:present>
                                                          </td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON billingReview.jsp,1.14,1.15

[Ivy C. <ic...@us...>]

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

Modified Files:
	billingReview.jsp 
Log Message:
added E400B and E401B
updated to allow E411A to use with other percentage code



Index: billingReview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingReview.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** billingReview.jsp	24 Nov 2004 20:07:12 -0000	1.14
--- billingReview.jsp	2 Feb 2005 22:52:11 -0000	1.15
***************
*** 323,327 ****
  			BigDecimal otherperc01 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP);   
  
! 			if (otherdbcode1.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = otherdbcode1;
  				eDesc = otherdesc1;
--- 323,327 ----
  			BigDecimal otherperc01 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP);   
  
! 			if (scode.compareTo("E400B") == 0 || scode.compareTo("E401B") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = otherdbcode1;
  				eDesc = otherdesc1;
***************
*** 403,407 ****
  			BigDecimal otherperc02 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP);
  
! 			if (otherdbcode2.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = otherdbcode2;
  				eDesc = otherdesc2;
--- 403,407 ----
  			BigDecimal otherperc02 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP);
  
! 			if (scode.compareTo("E400B") == 0 || scode.compareTo("E401B") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = otherdbcode2;
  				eDesc = otherdesc2;
***************
*** 482,486 ****
  			BigDecimal otherperc03 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP);
  
! 			if (otherdbcode3.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = otherdbcode3;
  				eDesc = otherdesc3;
--- 482,486 ----
  			BigDecimal otherperc03 = bdotherFee.multiply(otherunit).setScale(4, BigDecimal.ROUND_HALF_UP);
  
! 			if (scode.compareTo("E400B") == 0 || scode.compareTo("E401B") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = otherdbcode3;
  				eDesc = otherdesc3;
***************
*** 584,588 ****
  	}else{ 
  		if (fee.compareTo(".00")==0) {
! 			if (scode.compareTo("E411A") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = scode;
  				eDesc = desc;
--- 584,588 ----
  	}else{ 
  		if (fee.compareTo(".00")==0) {
! 			if (scode.compareTo("E400B") == 0 || scode.compareTo("E401B") == 0 || scode.compareTo("E410A") == 0 || scode.compareTo("E409A") == 0 || otherdbcode1.compareTo("Q012A") == 0) {
  				eCode = scode;
  				eDesc = desc;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formselfadministered.jsp,1.10,1.11

[Ivy C. <ic...@us...>]

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

Modified Files:
	formselfadministered.jsp 
Log Message:
updated form: changed "12 months" to "9 months"



Index: formselfadministered.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formselfadministered.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** formselfadministered.jsp	29 Jul 2004 15:54:38 -0000	1.10
--- formselfadministered.jsp	2 Feb 2005 21:02:20 -0000	1.11
***************
*** 191,195 ****
                  <tr>
                      <td align="right">2. </td>
!                     <td>In the previous 12 months have you stayed overnight as a patient in a hospital?</td>
                  </tr>
                  <tr bgcolor="white">
--- 191,195 ----
                  <tr>
                      <td align="right">2. </td>
!                     <td>In the previous 9 months have you stayed overnight as a patient in a hospital?</td>
                  </tr>
                  <tr bgcolor="white">
***************
*** 219,223 ****
                  <tr>
                      <td align="right">3. </td>
!                     <td>In the previous 12 months, how many times did you visit a physician or clinic?</td>
                  </tr>
                  <tr bgcolor="white">
--- 219,223 ----
                  <tr>
                      <td align="right">3. </td>
!                     <td>In the previous 9 months, how many times did you visit a physician or clinic?</td>
                  </tr>
                  <tr bgcolor="white">
***************
*** 247,251 ****
                  <tr>
                      <td align="right">4. </td>
!                     <td>In the previous 12 months, did you have diabetes?</td>
                  </tr>
                  <tr bgcolor="white">
--- 247,251 ----
                  <tr>
                      <td align="right">4. </td>
!                     <td>In the previous 9 months, did you have diabetes?</td>
                  </tr>
                  <tr bgcolor="white">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formintakeinfo.jsp,1.14,1.15

[Ivy C. <ic...@us...>]

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

Modified Files:
	formintakeinfo.jsp 
Log Message:
updated form: changed "12 months" to "9 months"

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formfalls.jsp,1.10,1.11

[Ivy C. <ic...@us...>]

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

Modified Files:
	formfalls.jsp 
Log Message:
changed question 1 from "last 12 months" to "last 9 month"



Index: formfalls.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formfalls.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** formfalls.jsp	29 Jul 2004 15:54:38 -0000	1.10
--- formfalls.jsp	2 Feb 2005 20:43:32 -0000	1.11
***************
*** 152,156 ****
  <table width="100%" border="0"  cellspacing="0" cellpadding="0" >
      <tr>
!         <td colspan="2">1. Have you fallen in the last 12 months?</td>
      </tr>
      <tr bgcolor="white">
--- 152,156 ----
  <table width="100%" border="0"  cellspacing="0" cellpadding="0" >
      <tr>
!         <td colspan="2">1. Have you fallen in the last 9 months?</td>
      </tr>
      <tr bgcolor="white">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx StaticScript.jsp,1.1,1.2

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

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

Modified Files:
	StaticScript.jsp 
Log Message:
Added logic to show deleted drugs with strike through style



Index: StaticScript.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/StaticScript.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StaticScript.jsp	5 Feb 2004 19:26:42 -0000	1.1
--- StaticScript.jsp	2 Feb 2005 02:12:39 -0000	1.2
***************
*** 136,141 ****
                          oscar.oscarRx.data.RxProviderData.Provider prov =
                              new oscar.oscarRx.data.RxProviderData().getProvider(drugs[i].getProviderNo());
                          %>
!                         <tr style="height:20px">
                              <td><%= prov.getFirstName() %> <%= prov.getSurname() %></td>
                              <td><%= oscar.oscarRx.util.RxUtil.DateToString(drugs[i].getRxDate()) %></td>
--- 136,146 ----
                          oscar.oscarRx.data.RxProviderData.Provider prov =
                              new oscar.oscarRx.data.RxProviderData().getProvider(drugs[i].getProviderNo());
+                         String arch = "";
+                         System.out.println(drugs[i].isArchived());
+                         if (drugs[i].isArchived()){
+                            arch = "text-decoration: line-through;";
+                         } 
                          %>
!                         <tr style="height:20px;<%=arch%>">
                              <td><%= prov.getFirstName() %> <%= prov.getSurname() %></td>
                              <td><%= oscar.oscarRx.util.RxUtil.DateToString(drugs[i].getRxDate()) %></td>

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

[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-serv9755

Modified Files:
	RxPrescriptionData.java 
Log Message:
removed archived = 0 in sql statement for similar drugs method.  also retrieve archived status and set it in Prescription Class in same method



Index: RxPrescriptionData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPrescriptionData.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RxPrescriptionData.java	27 Oct 2004 14:11:19 -0000	1.5
--- RxPrescriptionData.java	2 Feb 2005 01:50:09 -0000	1.6
***************
*** 333,337 ****
              String sql;
              if(GCN_SEQNO!=0) {
!                 sql = "SELECT * FROM drugs WHERE archived = 0 AND "
                  + "demographic_no = " + demographicNo + " AND "
                  + "GCN_SEQNO = " + GCN_SEQNO + " "
--- 333,337 ----
              String sql;
              if(GCN_SEQNO!=0) {
!                 sql = "SELECT * FROM drugs WHERE  "
                  + "demographic_no = " + demographicNo + " AND "
                  + "GCN_SEQNO = " + GCN_SEQNO + " "
***************
*** 339,343 ****
              }
              else {
!                 sql = "SELECT * FROM drugs WHERE archived = 0 AND "
                  + "demographic_no = " + demographicNo + " AND "
                  + "GCN_SEQNO = 0 AND customName = '" + customName + "' "
--- 339,343 ----
              }
              else {
!                 sql = "SELECT * FROM drugs WHERE  "
                  + "demographic_no = " + demographicNo + " AND "
                  + "GCN_SEQNO = 0 AND customName = '" + customName + "' "
***************
*** 345,349 ****
              }
              
!             Prescription p;
              
              rs = db.GetSQL(sql);
--- 345,349 ----
              }
              
!             Prescription p;            
              
              rs = db.GetSQL(sql);
***************
*** 365,368 ****
--- 365,369 ----
                  p.setNosubs(rs.getInt("nosubs"));
                  p.setPrn(rs.getInt("prn"));
+                 p.setArchived(rs.getString("archived"));
                  p.setSpecial(rs.getString("special"));
                  p.setGenericName(rs.getString("GN"));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx ChooseDrug.jsp,1.2,1.3

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

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

Modified Files:
	ChooseDrug.jsp 
Log Message:
changed doc link to search Doc database if there is text entered in search text box



Index: ChooseDrug.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/ChooseDrug.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ChooseDrug.jsp	3 Jan 2005 21:34:10 -0000	1.2
--- ChooseDrug.jsp	2 Feb 2005 00:47:56 -0000	1.3
***************
*** 92,95 ****
--- 92,104 ----
        }
      }
+     
+     function goDOC(){
+        if (document.RxSearchDrugForm.searchString.value.length == 0){
+           popupDrugOfChoice(720,700,'http://67.69.12.117:8080/oscarResource/DoC/')
+        }else{
+           var docURL = "http://67.69.12.117:8080/oscarResource/DoC/OSCAR_search/OSCAR_search_results?title="+document.RxSearchDrugForm.searchString.value+"&SUBMIT=GO";
+           popupDrugOfChoice(720,700,docURL);                               
+        }
+     }    
  
      function isEmpty(){  
***************
*** 145,149 ****
                            </td>
                            <td>
!                             <html:text property="searchString" size="16" maxlength="16"/> <a href="javascript:popupDrugOfChoice(720,700,'http://67.69.12.117:8080/oscarResource/DoC/')">Drug Of Choice</a>
                              
                              <!--<html:hidden property="otcExcluded" value="true"/>OTC Excluded-->
--- 154,158 ----
                            </td>
                            <td>
!                             <html:text property="searchString" size="16" maxlength="16"/> <a href="javascript:goDOC();">Drug Of Choice</a>
                              
                              <!--<html:hidden property="otcExcluded" value="true"/>OTC Excluded-->

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx SearchDrug.jsp,1.5,1.6

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

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

Modified Files:
	SearchDrug.jsp 
Log Message:
changed doc link to search Doc database if there is text entered in search text box



Index: SearchDrug.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/SearchDrug.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** SearchDrug.jsp	27 Oct 2004 14:42:52 -0000	1.5
--- SearchDrug.jsp	2 Feb 2005 00:42:30 -0000	1.6
***************
*** 84,87 ****
--- 84,97 ----
        }
      }
+     
+     
+     function goDOC(){
+        if (document.RxSearchDrugForm.searchString.value.length == 0){
+           popupDrugOfChoice(720,700,'http://67.69.12.117:8080/oscarResource/DoC/')
+        }else{
+           var docURL = "http://67.69.12.117:8080/oscarResource/DoC/OSCAR_search/OSCAR_search_results?title="+document.RxSearchDrugForm.searchString.value+"&SUBMIT=GO";
+           popupDrugOfChoice(720,700,docURL);                               
+        }
+     }     
  
      function popupWindow(vheight,vwidth,varpage,varPageName) { //open a new popup window
***************
*** 386,390 ****
                            </td>
                            <td>
!                             <html:text property="searchString" size="16" maxlength="16"/>&nbsp;<a href="javascript:popupDrugOfChoice(720,700,'http://67.69.12.117:8080/oscarResource/DoC/')">Drug of Choice</a>
                            </td>
                          </tr>
--- 396,400 ----
                            </td>
                            <td>
!                             <html:text property="searchString" size="16" maxlength="16"/>&nbsp;<a href="javascript:goDOC();">Drug of Choice</a>                            
                            </td>
                          </tr>