oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON addEditServiceCode.jsp,1.2,1.3

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

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

Modified Files:
	addEditServiceCode.jsp 
Log Message:
change javascript a bit

Index: addEditServiceCode.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/addEditServiceCode.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** addEditServiceCode.jsp	7 Mar 2005 21:18:15 -0000	1.2
--- addEditServiceCode.jsp	7 Mar 2005 21:35:28 -0000	1.3
***************
*** 62,66 ****
  			    prop.setProperty("service_code", serviceCode);
  			} else {
! 	  			msg = serviceCode + " is NOT updated. Action failed! Try edit it again." ;
  			    action = "edit" + serviceCode;
  			    prop.setProperty("service_code", serviceCode);
--- 62,66 ----
  			    prop.setProperty("service_code", serviceCode);
  			} else {
! 	  			msg = serviceCode + " is <font color='red'>NOT</font> updated. Action failed! Try edit it again." ;
  			    action = "edit" + serviceCode;
  			    prop.setProperty("service_code", serviceCode);
***************
*** 71,77 ****
  			}
  		} else {
! 	  			msg = "Type in a service code and search first to see if it is available.";
! 	  			action = "search";
! 			    prop.setProperty("service_code", serviceCode);
  		}
      } else if (request.getParameter("action").startsWith("add")) {
--- 71,77 ----
  			}
  		} else {
!       		msg = "You can <font color='red'>NOT</font> save the service code - " + serviceCode + ". Please search the service code first.";
!   			action = "search";
! 		    prop.setProperty("service_code", serviceCode);
  		}
      } else if (request.getParameter("action").startsWith("add")) {
***************
*** 90,94 ****
  			    prop.setProperty("service_code", serviceCode);
  			} else {
! 	  			msg = serviceCode + " is NOT added. Action failed! Try edit it again." ;
  			    action = "add" + serviceCode;
  			    prop.setProperty("service_code", serviceCode);
--- 90,94 ----
  			    prop.setProperty("service_code", serviceCode);
  			} else {
! 	  			msg = serviceCode + " is <font color='red'>NOT</font> added. Action failed! Try edit it again." ;
  			    action = "add" + serviceCode;
  			    prop.setProperty("service_code", serviceCode);
***************
*** 99,108 ****
  			}
  		} else {
! 	  			msg = "Type in a service code and search first to see if it is available.";
! 	  			action = "search";
! 			    prop.setProperty("service_code", serviceCode);
  		}
      } else {
!       msg = "You can NOT save the service code. Please search the service code first.";
      }
    } else if (request.getParameter("submit") != null && request.getParameter("submit").equals("Search")) {
--- 99,108 ----
  			}
  		} else {
!       		msg = "You can <font color='red'>NOT</font> save the service code - " + serviceCode + ". Please search the service code first.";
!   			action = "search";
! 		    prop.setProperty("service_code", serviceCode);
  		}
      } else {
!       msg = "You can <font color='red'>NOT</font> save the service code. Please search the service code first.";
      }
    } else if (request.getParameter("submit") != null && request.getParameter("submit").equals("Search")) {
***************
*** 201,205 ****
--- 201,209 ----
  		            alert ("The percentage should be less than 1.");
  		        }
+ 	        } else if(document.forms[0].value.value.length==0 && document.forms[0].percentage.value.length==0) {
+ 	            b = false;
+ 	            alert ("You must type in a number in the field fee");
  	        }
+ 
  			if(document.forms[0].billingservice_date.value.length<10) {
  	            b = false;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON addEditServiceCode.jsp,1.1,1.2

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

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

Modified Files:
	addEditServiceCode.jsp 
Log Message:
change javascript a bit

Index: addEditServiceCode.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/addEditServiceCode.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** addEditServiceCode.jsp	6 Mar 2005 02:59:53 -0000	1.1
--- addEditServiceCode.jsp	7 Mar 2005 21:18:15 -0000	1.2
***************
*** 201,205 ****
  		            alert ("The percentage should be less than 1.");
  		        }
! 	        } else if(document.forms[0].billingservice_date.value.length == 0) {
  	            b = false;
  	            alert ("You need to select a date from the calendar.");
--- 201,206 ----
  		            alert ("The percentage should be less than 1.");
  		        }
! 	        }
! 			if(document.forms[0].billingservice_date.value.length<10) {
  	            b = false;
  	            alert ("You need to select a date from the calendar.");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON addEditServiceCode.jsp,NONE,1.1

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

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

Added Files:
	addEditServiceCode.jsp 
Log Message:
for Ontario billing service code

--- NEW FILE: addEditServiceCode.jsp ---
<!--
/*
 *
 * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
 * This software is published under the GPL GNU General Public License.
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version 2
 * of the License, or (at your option) any later version. *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
 *
 * <OSCAR TEAM>
 *
 * This software was written for the
 * Department of Family Medicine
 * McMaster Unviersity
 * Hamilton
 * Ontario, Canada
 */
-->
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../logout.jsp");
  }
%>
  <%@ page errorPage="../appointment/errorpage.jsp"import="java.util.*,
                                                           java.sql.*,
                                                           oscar.*,
                                                           java.text.*,
                                                           java.lang.*,
                                                           java.net.*" %>
  <%@ page import="oscar.oscarBilling.ca.on.data.BillingONDataHelp" %>
  <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
<%
  int serviceCodeLen = 5;
  String msg = "Type in a service code and search first to see if it is available.";
  String action = "search"; // add/edit
  //BillingServiceCode serviceCodeObj = new BillingServiceCode();
  Properties	prop  = new Properties();
  BillingONDataHelp dbObj = new BillingONDataHelp();
  if (request.getParameter("submit") != null && request.getParameter("submit").equals("Save")) {
    // check the input data

    if(request.getParameter("action").startsWith("edit")) {
      	// update the service code
		String serviceCode = request.getParameter("service_code");
		if(serviceCode.equals(request.getParameter("action").substring("edit".length()))) {
			String	sql   = "update billingservice set description='" + StringEscapeUtils.escapeSql(request.getParameter("description")) + "', ";
			sql += " value='" + request.getParameter("value") + "', ";
			sql += " percentage='" + request.getParameter("percentage") + "', ";
			sql += " billingservice_date='" + request.getParameter("billingservice_date") + "' ";
			sql += "where service_code='" + serviceCode + "'";
			System.out.println(sql);
			if(dbObj.updateDBRecord(sql)) {
	  			msg = serviceCode + " is updated.<br>" + "Type in a service code and search first to see if it is available.";
	  			action = "search";
			    prop.setProperty("service_code", serviceCode);
			} else {
	  			msg = serviceCode + " is NOT updated. Action failed! Try edit it again." ;
			    action = "edit" + serviceCode;
			    prop.setProperty("service_code", serviceCode);
			    prop.setProperty("description", request.getParameter("description"));
			    prop.setProperty("value", request.getParameter("value"));
			    prop.setProperty("percentage", request.getParameter("percentage"));
			    prop.setProperty("billingservice_date", request.getParameter("billingservice_date"));
			}
		} else {
	  			msg = "Type in a service code and search first to see if it is available.";
	  			action = "search";
			    prop.setProperty("service_code", serviceCode);
		}
    } else if (request.getParameter("action").startsWith("add")) {
      	// insert into the service code
		String serviceCode = request.getParameter("service_code");
		if(serviceCode.equals(request.getParameter("action").substring("add".length()))) {
			String	sql   = "insert into billingservice (service_compositecode, service_code, description, value, percentage, billingservice_date) values ('', '";
			sql += serviceCode + "', '";
			sql += request.getParameter("description") + "', '";
			sql += request.getParameter("value") + "', '";
			sql += request.getParameter("percentage") + "', '";
			sql += request.getParameter("billingservice_date") + "' )";
			if(dbObj.updateDBRecord(sql)) {
	  			msg = serviceCode + " is added.<br>" + "Type in a service code and search first to see if it is available.";
	  			action = "search";
			    prop.setProperty("service_code", serviceCode);
			} else {
	  			msg = serviceCode + " is NOT added. Action failed! Try edit it again." ;
			    action = "add" + serviceCode;
			    prop.setProperty("service_code", serviceCode);
			    prop.setProperty("description", request.getParameter("description"));
			    prop.setProperty("value", request.getParameter("value"));
			    prop.setProperty("percentage", request.getParameter("percentage"));
			    prop.setProperty("billingservice_date", request.getParameter("billingservice_date"));
			}
		} else {
	  			msg = "Type in a service code and search first to see if it is available.";
	  			action = "search";
			    prop.setProperty("service_code", serviceCode);
		}
    } else {
      msg = "You can NOT save the service code. Please search the service code first.";
    }
  } else if (request.getParameter("submit") != null && request.getParameter("submit").equals("Search")) {
    // check the input data
    if(request.getParameter("service_code") == null || request.getParameter("service_code").length() != serviceCodeLen) {
      msg = "Please type in a right service code.";
    } else {
        String serviceCode = request.getParameter("service_code");
		String	sql   = "select * from billingservice where service_code='" + serviceCode + "'";
		ResultSet rs = dbObj.searchDBRecord(sql);

		if (rs.next()) {
		    prop.setProperty("service_code", serviceCode);
		    prop.setProperty("description", rs.getString("description"));
		    prop.setProperty("value", rs.getString("value"));
		    prop.setProperty("percentage", rs.getString("percentage"));
		    prop.setProperty("billingservice_date", rs.getString("billingservice_date"));
		    msg = "You can edit the service code.";
		    action = "edit" + serviceCode;
		} else {
		    prop.setProperty("service_code", serviceCode);
		    msg = "It is a NEW service code. You can add it.";
		    action = "add" + serviceCode;
		}
	}
  }
%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <html:html locale="true">
    <head>
      <title>
        Add/Edit Service Code
      </title>
      <meta http-equiv="Expires" content="Monday, 8 Aug 88 18:18:18 GMT">
      <meta http-equiv="Cache-Control" content="no-cache">
      <LINK REL="StyleSheet" HREF="../web.css" TYPE="text/css">
      <!-- calendar stylesheet -->
      <link rel="stylesheet" type="text/css" media="all" href="../../../share/calendar/calendar.css" title="win2k-cold-1" />
      <!-- main calendar program -->
      <script type="text/javascript" src="../../../share/calendar/calendar.js"></script>
      <!-- language for the calendar -->
      <script type="text/javascript" src="../../../share/calendar/lang/<bean:message key="global.javascript.calendar"/>">
              </script>
      <!-- the following script defines the Calendar.setup helper function, which makes
       adding a calendar a matter of 1 or 2 lines of code. -->
      <script type="text/javascript" src="../../../share/calendar/calendar-setup.js"></script>
      <script language="JavaScript">

      <!--
		function setfocus() {
		  this.focus();
		  document.forms[0].service_code.focus();
		  document.forms[0].service_code.select();
		}
	    function onSearch() {
	        //document.forms[0].submit.value="Search";
	        var ret = checkServiceCode();
	        return ret;
	    }
	    function onSave() {
	        //document.forms[0].submit.value="Save";
	        var ret = checkServiceCode();
	        if(ret==true) {
				ret = checkAllFields();
			}
	        if(ret==true) {
	            ret = confirm("Are you sure you want to save?");
	        }
	        return ret;
	    }
		function checkServiceCode() {
	        var b = true;
	        if(document.forms[0].service_code.value.length!=5){
	            b = false;
	            alert ("You must type in a service code with 5 letters/digits. The service code ends with \'A\' or \'B\'...");
	        }
	        return b;
	    }
		function checkAllFields() {
	        var b = true;
	        if(document.forms[0].value.value.length>0 && document.forms[0].percentage.value.length>0){
	            b = false;
	            alert ("You can NOT type in a fee and a percentage at the same time. (leave one blank)");
	        } else if(document.forms[0].value.value.length>0) {
		        if(!isNumber(document.forms[0].value.value)){
		            b = false;
		            alert ("You must type in a number in the field fee");
		        }
	        } else if(document.forms[0].percentage.value.length>0) {
		        if(!isNumber(document.forms[0].percentage.value)){
		            b = false;
		            alert ("You must type in a number in the field percentage");
		        } else if(document.forms[0].percentage.value > 1){
		            b = false;
		            alert ("The percentage should be less than 1.");
		        }
	        } else if(document.forms[0].billingservice_date.value.length == 0) {
	            b = false;
	            alert ("You need to select a date from the calendar.");
	        }
			return b;
	    }
	    function isNumber(s){
	        var i;
	        for (i = 0; i < s.length; i++){
	            // Check that current character is number.
	            var c = s.charAt(i);
	            if (c == ".") continue;
	            if (((c < "0") || (c > "9"))) return false;
	        }
	        // All characters are numbers.
	        return true;
	    }
//-->

      </script>
    </head>
    <body bgcolor="ivory" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
      <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
        <tr>
          <td align="left">
            &nbsp;
          </td>
        </tr>
      </table>

      <center>
      <table BORDER="1" CELLPADDING="0" CELLSPACING="0" WIDTH="80%">
        <tr BGCOLOR="#CCFFFF">
          <th>
            <%=msg%>
          </th>
        </tr>
      </table>
      </center>
      <table width="100%" border="0" cellspacing="2" cellpadding="2">
        <form method="post" name="baseurl" action="addEditServiceCode.jsp">
          <tr>
            <td>
              &nbsp;
            </td>
          </tr>
          <tr bgcolor="#EEEEFF">
            <td align="right">
              <b>Service Code</b>
            </td>
            <td>
              <input type="text" name="service_code" value="<%=prop.getProperty("service_code", "")%>" size='4' maxlength='5'>
              (5 letters, e.g. A001A)
              <input type="submit" name="submit" value="Search" onclick="javascript:return onSearch();">
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Description</b>
            </td>
            <td>
              <input type="text" name="description" value="<%=prop.getProperty("description", "")%>" size='50' maxlength='50'>
              (50 letters)
            </td>
          </tr>
          <tr bgcolor="#EEEEFF">
            <td align="right">
              <b>Fee</b>
            </td>
            <td>
              <input type="text" name="value" value="<%=prop.getProperty("value", "")%>" size='8' maxlength='8'>
              (format: xx.xx, e.g. 18.20)
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Percentage</b>
            </td>
            <td>
              <input type="text" name="percentage" value="<%=prop.getProperty("percentage", "")%>" size='8' maxlength='8'>
              (format: 0.xx, e.g. 0.20)
            </td>
          </tr>
          <tr bgcolor="#EEEEFF">
            <td align="right">
              <b>Issued Date</b>
            </td>
            <td>
              <input type="text" name="billingservice_date" value="<%=prop.getProperty("billingservice_date", "")%>" size='10' maxlength='10' readonly>
              (effective date)
              <img src="../../../images/cal.gif" id="billingservice_date_cal">
            </td>
          </tr>
          <tr>
            <td>
              &nbsp;
            </td>
            <td>
              &nbsp;
            </td>
          </tr>
          <tr>
            <td align="center" bgcolor="#CCCCFF" colspan="2">
              <input type="hidden" name="action" value='<%=action%>'>
              <input type="submit" name="submit" value="<bean:message key="admin.resourcebaseurl.btnSave"/>" onclick="javascript:return onSave();">
              <input type="button" name="Cancel" value="<bean:message key="admin.resourcebaseurl.btnExit"/>" onClick="window.close()">
            </td>
          </tr>
        </form>
      </table>
    </body>
    <script type="text/javascript">
Calendar.setup( { inputField : "billingservice_date", ifFormat : "%Y-%m-%d", showsTime :false, button : "billingservice_date_cal", singleClick : true, step : 1 } );
</script>
  </html:html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/data BillingONDataHelp.java,1.2,1.3

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

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

Modified Files:
	BillingONDataHelp.java 
Log Message:
correct the updateDbRecord returned boolean value

Index: BillingONDataHelp.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/data/BillingONDataHelp.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BillingONDataHelp.java	21 Jul 2004 14:48:48 -0000	1.2
--- BillingONDataHelp.java	6 Mar 2005 02:16:13 -0000	1.3
***************
*** 1,24 ****
  /*
!  * 
   * 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,24 ----
  /*
!  *
   * 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
   */
  /*
***************
*** 36,40 ****
  /**
   * @author yilee18
!  * 
   * To change the template for this generated type comment go to Window -
   * Preferences - Java - Code Generation - Code and Comments
--- 36,40 ----
  /**
   * @author yilee18
!  *
   * To change the template for this generated type comment go to Window -
   * Preferences - Java - Code Generation - Code and Comments
***************
*** 73,77 ****
  		return ret;
  	}
! 	
  	public synchronized boolean updateDBRecord(String sql) {
  		boolean ret = false;
--- 73,77 ----
  		return ret;
  	}
! 
  	public synchronized boolean updateDBRecord(String sql) {
  		boolean ret = false;
***************
*** 81,90 ****
  
  			db.CloseConn();
  		} catch (SQLException e) {
  			System.out.println(e.getMessage());
  		}
  		return ret;
  	}
! 	
  	public synchronized ResultSet searchDBRecord(String sql) {
  		ResultSet ret = null;
--- 81,92 ----
  
  			db.CloseConn();
+ 			ret = true;
  		} catch (SQLException e) {
+ 		    ret = false;
  			System.out.println(e.getMessage());
  		}
  		return ret;
  	}
! 
  	public synchronized ResultSet searchDBRecord(String sql) {
  		ResultSet ret = null;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/admin admin.jsp,1.32,1.33

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

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

Modified Files:
	admin.jsp 
Log Message:
add service code management for ON billing

Index: admin.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admin.jsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** admin.jsp	25 Jan 2005 22:28:00 -0000	1.32
--- admin.jsp	5 Mar 2005 18:20:42 -0000	1.33
***************
*** 12,16 ****
  <%@ page import="java.util.*,oscar.*" errorPage="errorpage.jsp" %>
  <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" />
! <% String country = request.getLocale().getCountry(); 
     oscar.oscarSecurity.CookieSecurity cs = new oscar.oscarSecurity.CookieSecurity();
     response.addCookie(cs.GiveMeACookie(cs.adminCookie)); %>
--- 12,16 ----
  <%@ page import="java.util.*,oscar.*" errorPage="errorpage.jsp" %>
  <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" />
! <% String country = request.getLocale().getCountry();
     oscar.oscarSecurity.CookieSecurity cs = new oscar.oscarSecurity.CookieSecurity();
     response.addCookie(cs.GiveMeACookie(cs.adminCookie)); %>
***************
*** 18,45 ****
  
  
! <!--  
  /*
!  * 
   * 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 
!  */ 
  -->
  <html:html locale="true">
--- 18,45 ----
  
  
! <!--
  /*
!  *
   * 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
!  */
  -->
  <html:html locale="true">
***************
*** 59,63 ****
  	} else return true;
  	// do nothing at the moment
! 	// check input data in the future 
  }
  
--- 59,63 ----
  	} else return true;
  	// do nothing at the moment
! 	// check input data in the future
  }
  
***************
*** 80,84 ****
    if (popup != null) {
      if (popup.opener == null) {
!       popup.opener = self; 
      }
      popup.focus();
--- 80,84 ----
    if (popup != null) {
      if (popup.opener == null) {
!       popup.opener = self;
      }
      popup.focus();
***************
*** 110,115 ****
  
          BODY {
!             font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;             
!             background-color: #A9A9A9;            
          }
  
--- 110,115 ----
  
          BODY {
!             font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;
!             background-color: #A9A9A9;
          }
  
***************
*** 117,121 ****
              font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;
          }
!         
          TD{
              font-size:14pt;
--- 117,121 ----
              font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;
          }
! 
          TD{
              font-size:14pt;
***************
*** 123,127 ****
  
          TH{
!             font-size:14pt;   
              font-weight: bold;
              text-align: left;
--- 123,127 ----
  
          TH{
!             font-size:14pt;
              font-weight: bold;
              text-align: left;
***************
*** 136,140 ****
              color:#FFFFFF;
          }
!         
      </style>
  </head>
--- 136,140 ----
              color:#FFFFFF;
          }
! 
      </style>
  </head>
***************
*** 146,212 ****
    </table>
    <table border="0" cellspacing="0" cellpadding="2" width="90%">
!   <tr>      
        <td align="right"><a href="../logout.jsp"><bean:message key="global.btnLogout"/></a></td>
    </tr>
!     <tr bgcolor="#CCCCFF"> 
!       <th> 
          <p><bean:message key="admin.admin.provider"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
!       <td> 
          <p><a href="provideraddarecordhtm.jsp"><bean:message key="admin.admin.btnAddProvider"/></a><br>
            <a href="providersearchrecordshtm.jsp"><bean:message key="admin.admin.btnSearchProvider"/></a></p>
          </td>
      </tr>
!     <tr bgcolor="#CCCCFF"> 
        <th><bean:message key="admin.admin.groupNo"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
!       <td> 
          <p><a href=# onClick ="popupPage(360,600,'admincontrol.jsp?displaymode=newgroup&submit=blank')"><bean:message key="admin.admin.btnAddGroupNoRecord"/></a><br>
            <a href=# onClick ="popupPage(360,600,'admincontrol.jsp?displaymode=displaymygroup&dboperation=searchmygroupall')"><bean:message key="admin.admin.btnSearchGroupNoRecords"/></a></p>
        </td>
      </tr>
!     <tr bgcolor="#CCCCFF"> 
        <th colspan="2"><bean:message key="admin.admin.preference"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
!       <td> 
          <p><a href="preferenceaddarecord.jsp"><bean:message key="admin.admin.btnAddPreference"/></a><br>
            <a href="preferencesearchrecordshtm.jsp"><bean:message key="admin.admin.btnSearchPreference"/></a></p>
        </td>
      </tr>
!     <tr bgcolor="#CCCCFF"> 
        <th><bean:message key="admin.admin.security"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
!       <td> 
          <p><a href="securityaddarecord.jsp"><bean:message key="admin.admin.btnAddLogin"/></a><br>
            <a href="securitysearchrecordshtm.jsp"><bean:message key="admin.admin.btnSearchLogin"/></a></p>
        </td>
      </tr>
!       
!     <tr bgcolor="#CCCCFF"> 
!       <th> 
          <p><bean:message key="admin.admin.schedule"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
!       <td> 
! 	      <a href="#" ONCLICK ="popupPage(550,800,'../schedule/scheduletemplatesetting.jsp');return false;" title="<bean:message key="admin.admin.scheduleSettingTitle"/>"><bean:message key="admin.admin.scheduleSetting"/></a> 
!          
          </td>
      </tr>
!       
             <%-- This links doesnt make sense on Brazil. There are other billing engines that we must use for billing --%>
             <% if (!country.equals("BR")) { %>
!     <tr bgcolor="#CCCCFF"> 
!       <th> 
          <p><bean:message key="admin.admin.billing"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
!       <td> 
          <p>
          <% if (oscarVariables.getProperty("billregion","").equals("BC")){ %>
--- 146,212 ----
    </table>
    <table border="0" cellspacing="0" cellpadding="2" width="90%">
!   <tr>
        <td align="right"><a href="../logout.jsp"><bean:message key="global.btnLogout"/></a></td>
    </tr>
!     <tr bgcolor="#CCCCFF">
!       <th>
          <p><bean:message key="admin.admin.provider"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF">
!       <td>
          <p><a href="provideraddarecordhtm.jsp"><bean:message key="admin.admin.btnAddProvider"/></a><br>
            <a href="providersearchrecordshtm.jsp"><bean:message key="admin.admin.btnSearchProvider"/></a></p>
          </td>
      </tr>
!     <tr bgcolor="#CCCCFF">
        <th><bean:message key="admin.admin.groupNo"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF">
!       <td>
          <p><a href=# onClick ="popupPage(360,600,'admincontrol.jsp?displaymode=newgroup&submit=blank')"><bean:message key="admin.admin.btnAddGroupNoRecord"/></a><br>
            <a href=# onClick ="popupPage(360,600,'admincontrol.jsp?displaymode=displaymygroup&dboperation=searchmygroupall')"><bean:message key="admin.admin.btnSearchGroupNoRecords"/></a></p>
        </td>
      </tr>
!     <tr bgcolor="#CCCCFF">
        <th colspan="2"><bean:message key="admin.admin.preference"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF">
!       <td>
          <p><a href="preferenceaddarecord.jsp"><bean:message key="admin.admin.btnAddPreference"/></a><br>
            <a href="preferencesearchrecordshtm.jsp"><bean:message key="admin.admin.btnSearchPreference"/></a></p>
        </td>
      </tr>
!     <tr bgcolor="#CCCCFF">
        <th><bean:message key="admin.admin.security"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF">
!       <td>
          <p><a href="securityaddarecord.jsp"><bean:message key="admin.admin.btnAddLogin"/></a><br>
            <a href="securitysearchrecordshtm.jsp"><bean:message key="admin.admin.btnSearchLogin"/></a></p>
        </td>
      </tr>
! 
!     <tr bgcolor="#CCCCFF">
!       <th>
          <p><bean:message key="admin.admin.schedule"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF">
!       <td>
! 	      <a href="#" ONCLICK ="popupPage(550,800,'../schedule/scheduletemplatesetting.jsp');return false;" title="<bean:message key="admin.admin.scheduleSettingTitle"/>"><bean:message key="admin.admin.scheduleSetting"/></a>
! 
          </td>
      </tr>
! 
             <%-- This links doesnt make sense on Brazil. There are other billing engines that we must use for billing --%>
             <% if (!country.equals("BR")) { %>
!     <tr bgcolor="#CCCCFF">
!       <th>
          <p><bean:message key="admin.admin.billing"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF">
!       <td>
          <p>
          <% if (oscarVariables.getProperty("billregion","").equals("BC")){ %>
***************
*** 214,241 ****
            <a href=# onClick ="popupPage(600,600,'../billing/CA/BC/billingPrivateCodeAdjust.jsp');return false;">Manage Private Bill</a><br/>
            <a href=# onClick ="popupPage(700,1000,'../billing/CA/BC/billingSim.jsp');return false;">Simulate Submission File</a><br>
!           <a href=# onClick ="popupPage(800,720,'../billing/CA/BC/billingTeleplanGroupReport.jsp');return false;">Generate Teleplan File</a><br>          
!           <a href=# onClick ="popupPage(600,800,'../billing/CA/BC/billingTA.jsp');return false;">Upload Remittance Files</a><br>     
!           <a href=# onClick ="popupPage(600,800,'../billing/CA/BC/viewReconcileReports.jsp');return false;">Billing Reconcilliation Reports</a><br>          
!           <a href=# onClick ="popupPage(800,1000,'../billing/CA/BC/billStatus.jsp');return false;">Bill Status</a><br>  
!           
  
         <% }else if (oscarVariables.getProperty("billregion","").equals("ON")){ %>
            <a href=# onClick ="popupPage(700,1000,'../billing/CA/ON/manageBillingLocation.jsp');return false;"><bean:message key="admin.admin.btnAddBillingLocation"/></a><br>
            <a href=# onClick ="popupPage(700,1000,'../billing/CA/ON/manageBillingform.jsp');return false;"><bean:message key="admin.admin.btnManageBillingForm"/></a><br>
            <a href=# onClick ="popupPage(700,700,'../billing/CA/ON/billingOHIPsimulation.jsp?html=');return false;"><bean:message key="admin.admin.btnSimulationOHIPDiskette"/></a><br>
!         	
! 	  <a href=# onClick ="popupPage(700,720,'../billing/CA/ON/billingOHIPreport.jsp');return false;"><bean:message key="admin.admin.btnGenerateOHIPDiskette"/></a><br>
            <a href=# onClick ="popupPage(700,640,'../billing/CA/ON/billingCorrection.jsp?billing_no=');return false;"><bean:message key="admin.admin.btnBillingCorrection"/></a><br>
            <a href=# onClick ="popupPage(700,640,'../billing/CA/ON/inr/reportINR.jsp?provider_no=all');return false;"><bean:message key="admin.admin.btnINRBatchBilling"/></a><br>
            <a href=# onClick ="popupPage(600,900,'../billing/CA/ON/billingRA.jsp');return false;"><bean:message key="admin.admin.btnBillingReconcilliation"/></a><br>
!           <a href=# onClick ="popupPage(600,1000,'../billing/CA/ON/billingOBECEA.jsp');return false;"><bean:message key="admin.admin.btnEDTBillingReportGenerator"/></a><br>         	         
         <%}%>
!                    	         
          </td>
      </tr>
             <% } %>
!     <%-- removed the add demographic button because it was never used, it was out of sync with the 
           doctor/receptionist version, and it was too much of a pain to keep it up to date --%>
!     <%-- <tr bgcolor="#CCCCFF"> 
        <td colspan="2"><bean:message key="admin.admin.demographic"/></td>
      </tr>
--- 214,241 ----
            <a href=# onClick ="popupPage(600,600,'../billing/CA/BC/billingPrivateCodeAdjust.jsp');return false;">Manage Private Bill</a><br/>
            <a href=# onClick ="popupPage(700,1000,'../billing/CA/BC/billingSim.jsp');return false;">Simulate Submission File</a><br>
!           <a href=# onClick ="popupPage(800,720,'../billing/CA/BC/billingTeleplanGroupReport.jsp');return false;">Generate Teleplan File</a><br>
!           <a href=# onClick ="popupPage(600,800,'../billing/CA/BC/billingTA.jsp');return false;">Upload Remittance Files</a><br>
!           <a href=# onClick ="popupPage(600,800,'../billing/CA/BC/viewReconcileReports.jsp');return false;">Billing Reconcilliation Reports</a><br>
!           <a href=# onClick ="popupPage(800,1000,'../billing/CA/BC/billStatus.jsp');return false;">Bill Status</a><br>
! 
  
         <% }else if (oscarVariables.getProperty("billregion","").equals("ON")){ %>
+           <a href=# onClick ="popupPage(300,600,'../billing/CA/ON/addEditServiceCode.jsp');return false;">Add/Edit Billing Service Code</a><br>
            <a href=# onClick ="popupPage(700,1000,'../billing/CA/ON/manageBillingLocation.jsp');return false;"><bean:message key="admin.admin.btnAddBillingLocation"/></a><br>
            <a href=# onClick ="popupPage(700,1000,'../billing/CA/ON/manageBillingform.jsp');return false;"><bean:message key="admin.admin.btnManageBillingForm"/></a><br>
            <a href=# onClick ="popupPage(700,700,'../billing/CA/ON/billingOHIPsimulation.jsp?html=');return false;"><bean:message key="admin.admin.btnSimulationOHIPDiskette"/></a><br>
!           <a href=# onClick ="popupPage(700,720,'../billing/CA/ON/billingOHIPreport.jsp');return false;"><bean:message key="admin.admin.btnGenerateOHIPDiskette"/></a><br>
            <a href=# onClick ="popupPage(700,640,'../billing/CA/ON/billingCorrection.jsp?billing_no=');return false;"><bean:message key="admin.admin.btnBillingCorrection"/></a><br>
            <a href=# onClick ="popupPage(700,640,'../billing/CA/ON/inr/reportINR.jsp?provider_no=all');return false;"><bean:message key="admin.admin.btnINRBatchBilling"/></a><br>
            <a href=# onClick ="popupPage(600,900,'../billing/CA/ON/billingRA.jsp');return false;"><bean:message key="admin.admin.btnBillingReconcilliation"/></a><br>
!           <a href=# onClick ="popupPage(600,1000,'../billing/CA/ON/billingOBECEA.jsp');return false;"><bean:message key="admin.admin.btnEDTBillingReportGenerator"/></a><br>
         <%}%>
! 
          </td>
      </tr>
             <% } %>
!     <%-- removed the add demographic button because it was never used, it was out of sync with the
           doctor/receptionist version, and it was too much of a pain to keep it up to date --%>
!     <%-- <tr bgcolor="#CCCCFF">
        <td colspan="2"><bean:message key="admin.admin.demographic"/></td>
      </tr>
***************
*** 243,252 ****
        <td> <a href="demographicaddarecordhtm.jsp"><bean:message key="admin.admin.btnAddDemographicRecord"/></a></td>
      </tr>--%>
!     <tr bgcolor="#CCCCFF"> 
!       <th> 
          <p><bean:message key="admin.admin.resource"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
        <td> <a href="#" ONCLICK ="popupPage(200,300,'resourcebaseurl.jsp');return false;" title="<bean:message key="admin.admin.baseURLSettingTitle"/>"><bean:message key="admin.admin.btnBaseURLSetting"/></a> </td>
      </tr>
--- 243,252 ----
        <td> <a href="demographicaddarecordhtm.jsp"><bean:message key="admin.admin.btnAddDemographicRecord"/></a></td>
      </tr>--%>
!     <tr bgcolor="#CCCCFF">
!       <th>
          <p><bean:message key="admin.admin.resource"/></p>
        </th>
      </tr>
!     <tr bgcolor="#EEEEFF">
        <td> <a href="#" ONCLICK ="popupPage(200,300,'resourcebaseurl.jsp');return false;" title="<bean:message key="admin.admin.baseURLSettingTitle"/>"><bean:message key="admin.admin.btnBaseURLSetting"/></a> </td>
      </tr>
***************
*** 259,263 ****
        <tr bgcolor="#EEEEFF">
            <td colspan="2" nowrap>
!           <%      session.setAttribute("reportdownload", "/usr/local/tomcat/webapps/oscar_sfhc/oscarReport/download/"); 
            %>
              <% if (!country.equals("BR")) { %>
--- 259,263 ----
        <tr bgcolor="#EEEEFF">
            <td colspan="2" nowrap>
!           <%      session.setAttribute("reportdownload", "/usr/local/tomcat/webapps/oscar_sfhc/oscarReport/download/");
            %>
              <% if (!country.equals("BR")) { %>
***************
*** 270,274 ****
                <a HREF="#" ONCLICK ="popupPage(600,900,'../oscarReport/oscarReportCatchment.jsp');return false;"><bean:message key="admin.admin.btnPCNCatchmentReport"/></a><br>
                <a HREF="#" ONCLICK ="popupPage(600,900,'../oscarReport/FluBilling.do?orderby=');return false;"><bean:message key="admin.admin.btnFluBillingReport"/></a><br>
!               <a href=# onClick ="popupPage(600,1000,'../oscarReport/obec.jsp');return false;"><bean:message key="admin.admin.btnOvernightChecking"/></a><br/>              
             <% } else {%>
                <a HREF="#" ONCLICK ="popupPage(600,750,'../report/reportactivepatientlist.jsp')" ><bean:message key="report.reportindex.btnActivePList"/></a><br/>
--- 270,274 ----
                <a HREF="#" ONCLICK ="popupPage(600,900,'../oscarReport/oscarReportCatchment.jsp');return false;"><bean:message key="admin.admin.btnPCNCatchmentReport"/></a><br>
                <a HREF="#" ONCLICK ="popupPage(600,900,'../oscarReport/FluBilling.do?orderby=');return false;"><bean:message key="admin.admin.btnFluBillingReport"/></a><br>
!               <a href=# onClick ="popupPage(600,1000,'../oscarReport/obec.jsp');return false;"><bean:message key="admin.admin.btnOvernightChecking"/></a><br/>
             <% } else {%>
                <a HREF="#" ONCLICK ="popupPage(600,750,'../report/reportactivepatientlist.jsp')" ><bean:message key="report.reportindex.btnActivePList"/></a><br/>
***************
*** 283,287 ****
  <!--/oscarReport Code block -->
    <!--backup download Code block -->
!   
        <tr  bgcolor="#CCCCFF">
          <th><bean:message key="admin.admin.oscarBackup"/></th>
--- 283,287 ----
  <!--/oscarReport Code block -->
    <!--backup download Code block -->
! 
        <tr  bgcolor="#CCCCFF">
          <th><bean:message key="admin.admin.oscarBackup"/></th>
***************
*** 292,300 ****
            </td>
        </tr>
!   
  <!--/backup download Code block -->
      <% } %>
  <!--oscarMessenger Code block -->
!   
      <tr>
        <th bgcolor="#CCCCFF"><bean:message key="admin.admin.oscarMessenger"/></th>
--- 292,300 ----
            </td>
        </tr>
! 
  <!--/backup download Code block -->
      <% } %>
  <!--oscarMessenger Code block -->
! 
      <tr>
        <th bgcolor="#CCCCFF"><bean:message key="admin.admin.oscarMessenger"/></th>
***************
*** 312,336 ****
         </td>
      </tr>
!   
  <!--/oscarMessenger Code block -->
  
  <!--e forms block -->
!   
!     <tr bgcolor="#CCCCFF"> 
        <th><bean:message key="admin.admin.eForms"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF"> 
        <td> <a href="../eform/uploadhtml.jsp"><bean:message key="admin.admin.btnUploadForm"/></a><br>
          </td>
      </tr>
!     <tr  bgcolor="#EEEEFF"> 
        <td> <a href="../eform/uploadimages.jsp"><bean:message key="admin.admin.btnUploadImage"/></a><br>
          </td>
!     </tr>    
!   
  <!--// end e forms block -->
  
! <!--// start oscarEncounter block-->  
!     <tr bgcolor="#CCCCFF"> 
        <th><bean:message key="admin.admin.oscarEncounter"/></th>
      </tr>
--- 312,336 ----
         </td>
      </tr>
! 
  <!--/oscarMessenger Code block -->
  
  <!--e forms block -->
! 
!     <tr bgcolor="#CCCCFF">
        <th><bean:message key="admin.admin.eForms"/></th>
      </tr>
!     <tr bgcolor="#EEEEFF">
        <td> <a href="../eform/uploadhtml.jsp"><bean:message key="admin.admin.btnUploadForm"/></a><br>
          </td>
      </tr>
!     <tr  bgcolor="#EEEEFF">
        <td> <a href="../eform/uploadimages.jsp"><bean:message key="admin.admin.btnUploadImage"/></a><br>
          </td>
!     </tr>
! 
  <!--// end e forms block -->
  
! <!--// start oscarEncounter block-->
!     <tr bgcolor="#CCCCFF">
        <th><bean:message key="admin.admin.oscarEncounter"/></th>
      </tr>
***************
*** 349,358 ****
  <!--// end of oscar measuremnt block-->
  
!     <tr bgcolor="#CCCCFF"> 
        <th><bean:message key="admin.admin.misc"/></th>
      </tr>
      <tr bgcolor="#EEEEFF">
        <td><a href="#" ONCLICK ="popupPage(550,800,'updatedemographicprovider.jsp');return false;" ><bean:message key="admin.admin.btnUpdatePatientProvider"/></a></td>
!     </tr>  
      <tr bgcolor="#EEEEFF">
        <td><a href="#" ONCLICK ="popupPage(550,800,'providertemplate.jsp');return false;" ><bean:message key="admin.admin.btnInsertTemplate"/></a></td>
--- 349,358 ----
  <!--// end of oscar measuremnt block-->
  
!     <tr bgcolor="#CCCCFF">
        <th><bean:message key="admin.admin.misc"/></th>
      </tr>
      <tr bgcolor="#EEEEFF">
        <td><a href="#" ONCLICK ="popupPage(550,800,'updatedemographicprovider.jsp');return false;" ><bean:message key="admin.admin.btnUpdatePatientProvider"/></a></td>
!     </tr>
      <tr bgcolor="#EEEEFF">
        <td><a href="#" ONCLICK ="popupPage(550,800,'providertemplate.jsp');return false;" ><bean:message key="admin.admin.btnInsertTemplate"/></a></td>
***************
*** 381,384 ****
  </center>
  
! </body> 
  </html:html>
--- 381,384 ----
  </center>
  
! </body>
  </html:html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form FrmRecordHelp.java,1.11,1.12

[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-serv5893/WEB-INF/classes/src/oscar/form

Modified Files:
	FrmRecordHelp.java 
Log Message:
update for mysql 4.1.x

Index: FrmRecordHelp.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/FrmRecordHelp.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FrmRecordHelp.java	21 Jan 2005 17:15:54 -0000	1.11
--- FrmRecordHelp.java	5 Mar 2005 02:20:43 -0000	1.12
***************
*** 46,50 ****
                  String value;
  
!                 if (md.getColumnTypeName(i).equalsIgnoreCase("TINY")) {
                      if (rs.getInt(i) == 1)
                          value = "checked='checked'";
--- 46,50 ----
                  String value;
  
!                 if (md.getColumnTypeName(i).startsWith("TINY")) {
                      if (rs.getInt(i) == 1)
                          value = "checked='checked'";
***************
*** 76,80 ****
          rs.insertRow();
          String saveAsXml = OscarProperties.getInstance().getProperty("save_as_xml", "false");
!         System.out.println("the value of save_as_xml is: " + saveAsXml);
  
          if (saveAsXml.equalsIgnoreCase("true")) {
--- 76,80 ----
          rs.insertRow();
          String saveAsXml = OscarProperties.getInstance().getProperty("save_as_xml", "false");
!         //System.out.println("the value of save_as_xml is: " + saveAsXml);
  
          if (saveAsXml.equalsIgnoreCase("true")) {
***************
*** 136,145 ****
  
              String value = props.getProperty(name, null);
!             if (md.getColumnTypeName(i).equalsIgnoreCase("TINY")) {
                  if (value != null) {
!                     if (value.equalsIgnoreCase("on") || value.equalsIgnoreCase("checked='checked'"))
                          rs.updateInt(name, 1);
!                     else
                          rs.updateInt(name, 0);
                  } else {
                      rs.updateInt(name, 0);
--- 136,147 ----
  
              String value = props.getProperty(name, null);
!             if (md.getColumnTypeName(i).startsWith("TINY")) {
                  if (value != null) {
!                     if (value.equalsIgnoreCase("on") || value.equalsIgnoreCase("checked='checked'")) {
                          rs.updateInt(name, 1);
!                         //System.out.println(name + "   - " + md.getColumnTypeName(i) + value);
!                     } else {
                          rs.updateInt(name, 0);
+                     }
                  } else {
                      rs.updateInt(name, 0);
***************
*** 150,157 ****
              if (md.getColumnTypeName(i).equalsIgnoreCase("date")) {
                  java.util.Date d;
!                 if (md.getColumnName(i).equalsIgnoreCase("formEdited"))
                      d = UtilDateUtilities.Today();
!                 else
                      d = UtilDateUtilities.StringToDate(value, _dateFormat);
                  if (d == null)
                      rs.updateNull(name);
--- 152,160 ----
              if (md.getColumnTypeName(i).equalsIgnoreCase("date")) {
                  java.util.Date d;
!                 if (md.getColumnName(i).equalsIgnoreCase("formEdited")) {
                      d = UtilDateUtilities.Today();
!                 } else {
                      d = UtilDateUtilities.StringToDate(value, _dateFormat);
+                 }
                  if (d == null)
                      rs.updateNull(name);
***************
*** 208,212 ****
                  String value;
  
!                 if (md.getColumnTypeName(i).equalsIgnoreCase("TINY") && md.getScale(i) == 1) {
                      if (rs.getInt(i) == 1)
                          value = "on";
--- 211,215 ----
                  String value;
  
!                 if (md.getColumnTypeName(i).startsWith("TINY") && md.getScale(i) == 1) {
                      if (rs.getInt(i) == 1)
                          value = "on";
***************
*** 245,254 ****
          if (action.equalsIgnoreCase("print")) {
              temp = where + "?demoNo=" + demoId + "&formId=" + formId; // + "&study_no=" + studyId +
!                                                                       // "&study_link" + studyLink;
          } else if (action.equalsIgnoreCase("save")) {
              temp = where + "?demographic_no=" + demoId + "&formId=" + formId; // "&study_no=" +
!                                                                               // studyId +
!                                                                               // "&study_link" +
!                                                                               // studyLink; //+
          } else if (action.equalsIgnoreCase("exit")) {
              temp = where;
--- 248,257 ----
          if (action.equalsIgnoreCase("print")) {
              temp = where + "?demoNo=" + demoId + "&formId=" + formId; // + "&study_no=" + studyId +
!             // "&study_link" + studyLink;
          } else if (action.equalsIgnoreCase("save")) {
              temp = where + "?demographic_no=" + demoId + "&formId=" + formId; // "&study_no=" +
!             // studyId +
!             // "&study_link" +
!             // studyLink; //+
          } else if (action.equalsIgnoreCase("exit")) {
              temp = where;

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

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

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

Modified Files:
	EctSplitChart.java 
Log Message:
closed connection to database



Index: EctSplitChart.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/data/EctSplitChart.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** EctSplitChart.java	23 Dec 2004 23:26:49 -0000	1.1
--- EctSplitChart.java	3 Mar 2005 20:50:52 -0000	1.2
***************
*** 64,67 ****
--- 64,69 ----
              vec.add(s);
           }
+          rs.close();
+          db.CloseConn();
           
        }catch(SQLException e){

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql,1.73,1.74

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

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

Modified Files:
	oscarinit.sql 
Log Message:
Added index on status in billing table



Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** oscarinit.sql	19 Feb 2005 04:00:25 -0000	1.73
--- oscarinit.sql	3 Mar 2005 18:38:44 -0000	1.74
***************
*** 142,146 ****
    KEY provider_ohip_no (provider_ohip_no),
    KEY apptProvider_no (apptProvider_no),
!   KEY creator (creator)
  ) TYPE=MyISAM;
  
--- 142,147 ----
    KEY provider_ohip_no (provider_ohip_no),
    KEY apptProvider_no (apptProvider_no),
!   KEY creator (creator),
!   KEY status (status)
  ) TYPE=MyISAM;
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/BC billingTeleplanGroupReport.jsp,1.4,1.5

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

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

Modified Files:
	billingTeleplanGroupReport.jsp 
Log Message:
add javascript to ignore double click form button and change the display color

Index: billingTeleplanGroupReport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/billingTeleplanGroupReport.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** billingTeleplanGroupReport.jsp	3 Jan 2005 05:43:11 -0000	1.4
--- billingTeleplanGroupReport.jsp	27 Feb 2005 20:14:23 -0000	1.5
***************
*** 1,8 ****
! <% 
! if(session.getValue("user") == null) response.sendRedirect("../../../logout.jsp");
  String user_no = (String) session.getAttribute("user");
! %> 
  
! <%@ page import="java.util.*, java.sql.*, oscar.*, java.net.*" errorPage="errorpage.jsp" %>
  <%@ include file="../../../admin/dbconnection.jsp" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
--- 1,8 ----
! <%
! if(session.getAttribute("user") == null) response.sendRedirect("../../../logout.jsp");
  String user_no = (String) session.getAttribute("user");
! %>
  
! <%@ page import="java.util.*, java.sql.*, oscar.util.*" errorPage="errorpage.jsp" %>
  <%@ include file="../../../admin/dbconnection.jsp" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
***************
*** 20,24 ****
  String thisyear = (request.getParameter("year")==null || request.getParameter("year").compareTo("")==0) ? String.valueOf(curYear) : request.getParameter("year");
  
! String yearColor = "";  
  yearArray[0] = String.valueOf(curYear);
  yearArray[1] = String.valueOf(curYear-1);
--- 20,24 ----
  String thisyear = (request.getParameter("year")==null || request.getParameter("year").compareTo("")==0) ? String.valueOf(curYear) : request.getParameter("year");
  
! String yearColor = "";
  yearArray[0] = String.valueOf(curYear);
  yearArray[1] = String.valueOf(curYear-1);
***************
*** 26,30 ****
  yearArray[3] = String.valueOf(curYear-3);
  yearArray[4] = String.valueOf(curYear-4);
!           
  if (thisyear.compareTo(yearArray[0])==0) yearColor="#B1D3EF";
  if (thisyear.compareTo(yearArray[1])==0) yearColor="#BBBBBB";
--- 26,30 ----
  yearArray[3] = String.valueOf(curYear-3);
  yearArray[4] = String.valueOf(curYear-4);
! 
  if (thisyear.compareTo(yearArray[0])==0) yearColor="#B1D3EF";
  if (thisyear.compareTo(yearArray[1])==0) yearColor="#BBBBBB";
***************
*** 47,76 ****
  if (curMonth == 12) monthCode = "L";
  String ohipdownload = oscarVariables.getProperty("HOME_DIR") ;;
! session.setAttribute("ohipdownload", ohipdownload);      
  %>
  
! <!--  
  /*
!  * 
   * 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 
   */
  -->
--- 47,76 ----
  if (curMonth == 12) monthCode = "L";
  String ohipdownload = oscarVariables.getProperty("HOME_DIR") ;;
! session.setAttribute("ohipdownload", ohipdownload);
  %>
  
! <!--
  /*
!  *
   * 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
   */
  -->
***************
*** 85,88 ****
--- 85,97 ----
    this.focus();
  }
+ var checkSubmitFlg = false;
+ function checkSubmit() {
+ 	if (checkSubmitFlg == true) {
+ 		return false;
+ 	}
+ 	checkSubmitFlg = true;
+ 	document.forms[0].Submit.disabled = true;
+ 	return true;
+ }
  
  function findObj(n, d) { //v4.0
***************
*** 96,107 ****
  function showHideLayers() { //v3.0
      var i,p,v,obj,args=showHideLayers.arguments;
!     for (i=0; i<(args.length-2); i+=3){ 
!     if ((obj=findObj(args[i]))!=null) {    
          v=args[i+2];
!         if (obj.style) { 
!             obj=obj.style; 
!             v=(v=='show')?'visible':(v='hide')?'hidden':v; 
          }
!         obj.visibility=v; 
      }
    }
--- 105,116 ----
  function showHideLayers() { //v3.0
      var i,p,v,obj,args=showHideLayers.arguments;
!     for (i=0; i<(args.length-2); i+=3){
!     if ((obj=findObj(args[i]))!=null) {
          v=args[i+2];
!         if (obj.style) {
!             obj=obj.style;
!             v=(v=='show')?'visible':(v='hide')?'hidden':v;
          }
!         obj.visibility=v;
      }
    }
***************
*** 113,124 ****
  <body bgcolor="#FFFFFF" text="#000000">
   <div id="Layer1" style="position:absolute; left:90px; top:35px; width:0px; height:12px; z-index:1"></div>
!  <div id="Layer2" style="position:absolute; left:45px; top:61px; width:129px; height:123px; z-index:2; background-color: #EEEEFF; layer-background-color: #6666FF; border: 1px none #000000; visibility: hidden;"> 
    <table width="100%" border="0" cellspacing="0" cellpadding="0">
!      <tr bgcolor="#DDDDEE"> 
!        <td align='CENTER'><font size="2" face="Tahoma, Geneva, Arial, Helvetica, san-serif"><strong>Last 
           5 Years</strong></font></td>
       </tr>
   <% for (int i=0; i<5;i++) { %>
!      <tr> 
         <td align='CENTER'><font size="2" face="Tahoma, Geneva, Arial, Helvetica, san-serif"><a href="billingTeleplanGroupReport.jsp?year=<%=yearArray[i]%>">YEAR <%=yearArray[i]%></a></font></td>
       </tr>
--- 122,133 ----
  <body bgcolor="#FFFFFF" text="#000000">
   <div id="Layer1" style="position:absolute; left:90px; top:35px; width:0px; height:12px; z-index:1"></div>
!  <div id="Layer2" style="position:absolute; left:45px; top:61px; width:129px; height:123px; z-index:2; background-color: #EEEEFF; layer-background-color: #6666FF; border: 1px none #000000; visibility: hidden;">
    <table width="100%" border="0" cellspacing="0" cellpadding="0">
!      <tr bgcolor="#DDDDEE">
!        <td align='CENTER'><font size="2" face="Tahoma, Geneva, Arial, Helvetica, san-serif"><strong>Last
           5 Years</strong></font></td>
       </tr>
   <% for (int i=0; i<5;i++) { %>
!      <tr>
         <td align='CENTER'><font size="2" face="Tahoma, Geneva, Arial, Helvetica, san-serif"><a href="billingTeleplanGroupReport.jsp?year=<%=yearArray[i]%>">YEAR <%=yearArray[i]%></a></font></td>
       </tr>
***************
*** 129,134 ****
      <tr bgcolor="#486ebd">
       <th align='LEFT'>
! 		<input type='button' name='print' value='Print' onClick='window.print()'> </th> 
!     <th align='CENTER'  ><font face="Arial, Helvetica, sans-serif" color="#FFFFFF"> 
       Teleplan Group Report - <%=thisyear%></font></th>
        <th align='RIGHT'><input type='button' name='close' value='Close' onClick='window.close()'></th>
--- 138,143 ----
      <tr bgcolor="#486ebd">
       <th align='LEFT'>
! 		<input type='button' name='print' value='Print' onClick='window.print()'> </th>
!     <th align='CENTER'  ><font face="Arial, Helvetica, sans-serif" color="#FFFFFF">
       Teleplan Group Report - <%=thisyear%></font></th>
        <th align='RIGHT'><input type='button' name='close' value='Close' onClick='window.close()'></th>
***************
*** 138,148 ****
  
  <table width="100%" border="0" bgcolor="#E6F0F7">
!   <form name="form1" method="post" action="genTeleplanGroupReport.jsp">
!     <tr> 
!      <td width="220"><b><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><a href="#" onClick="showHideLayers('Layer2','','show');">Show 
          Archive</a> </font></b></td>
!       <td width="220"><b><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Select 
          provider </font></b></td>
!       <td width="254"><b><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"> 
          <select name="provider">
            <option value="all">All Providers</option>
--- 147,157 ----
  
  <table width="100%" border="0" bgcolor="#E6F0F7">
!   <form name="form1" method="post" action="genTeleplanGroupReport.jsp" onsubmit="return checkSubmit();">
!     <tr>
!      <td width="220"><b><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><a href="#" onClick="showHideLayers('Layer2','','show');">Show
          Archive</a> </font></b></td>
!       <td width="220"><b><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Select
          provider </font></b></td>
!       <td width="254"><b><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">
          <select name="provider">
            <option value="all">All Providers</option>
***************
*** 150,154 ****
               String proLast="";
               String proOHIP="";
!              String specialty_code; 
               String billinggroup_no;
               int Count = 0;
--- 159,163 ----
               String proLast="";
               String proOHIP="";
!              String specialty_code;
               String billinggroup_no;
               int Count = 0;
***************
*** 159,168 ****
                  proFirst = rslocal.getString("first_name");
                  proLast = rslocal.getString("last_name");
!                 proOHIP = rslocal.getString("ohip_no"); 
                  billinggroup_no= rslocal.getString("billing_no");//SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_billinggroup_no>","</xml_p_billinggroup_no>");
                  specialty_code = SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_specialty_code>","</xml_p_specialty_code>");
             %>
             <option value="<%=proOHIP%>,<%=specialty_code%>|<%=billinggroup_no%>" ><%=proLast%>,<%=proFirst%></option>
!            <% 
  
               }
--- 168,177 ----
                  proFirst = rslocal.getString("first_name");
                  proLast = rslocal.getString("last_name");
!                 proOHIP = rslocal.getString("ohip_no");
                  billinggroup_no= rslocal.getString("billing_no");//SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_billinggroup_no>","</xml_p_billinggroup_no>");
                  specialty_code = SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_specialty_code>","</xml_p_specialty_code>");
             %>
             <option value="<%=proOHIP%>,<%=specialty_code%>|<%=billinggroup_no%>" ><%=proLast%>,<%=proFirst%></option>
!            <%
  
               }
***************
*** 171,182 ****
          </select>
          </font></b></td>
!       <td width="181"><b><!--<font face="Arial, Helvetica, sans-serif" size="2">Select 
          billing center</font>--></b></td>
!       <td width="254"><font face="Arial, Helvetica, sans-serif" size="2"> 
       <!--   <select name="billcenter">
!         
          <%-- String centerCode="";
             String centerDesc="";
!            
             int Count1 = 0;
             ResultSet rsCenter;
--- 180,191 ----
          </select>
          </font></b></td>
!       <td width="181"><b><!--<font face="Arial, Helvetica, sans-serif" size="2">Select
          billing center</font>--></b></td>
!       <td width="254"><font face="Arial, Helvetica, sans-serif" size="2">
       <!--   <select name="billcenter">
! 
          <%-- String centerCode="";
             String centerDesc="";
! 
             int Count1 = 0;
             ResultSet rsCenter;
***************
*** 186,190 ****
                centerCode = rsCenter.getString("billcenter_code");
                centerDesc = rsCenter.getString("billcenter_desc");
!   
         %>
              <option value="<%=centerCode%>" <%=oscarVariables.getProperty("billcenter").compareTo(centerCode)==0?"selected":""%>><%=centerDesc%></option>
--- 195,199 ----
                centerCode = rsCenter.getString("billcenter_code");
                centerDesc = rsCenter.getString("billcenter_desc");
! 
         %>
              <option value="<%=centerCode%>" <%=oscarVariables.getProperty("billcenter").compareTo(centerCode)==0?"selected":""%>><%=centerDesc%></option>
***************
*** 192,196 ****
   </select>-->
        </td>
!  <td width="277"> <font color="#003366"> 
          <input type="submit" name="Submit" value="Create Report">
          <input type="hidden" name="monthCode" value="<%=monthCode%>">
--- 201,205 ----
   </select>-->
        </td>
!  <td width="277"> <font color="#003366">
          <input type="submit" name="Submit" value="Create Report">
          <input type="hidden" name="monthCode" value="<%=monthCode%>">
***************
*** 200,204 ****
          </font></td>
      </tr>
!     <tr> 
        <td colspan="4">
              <font color="#003366">
--- 209,213 ----
          </font></td>
      </tr>
!     <tr>
        <td colspan="4">
              <font color="#003366">
***************
*** 209,233 ****
                  <b><font face="Arial, Helvetica, sans-serif" size="2"></font></b>
                  <font face="Arial, Helvetica, sans-serif" size="2"> </font>
!             </font> 
        </td>
      </tr>
    </form>
  </table>
! <table width="100%" border="1" cellspacing="0" cellpadding="0" bgcolor="<%=yearColor%>">
!   <tr> 
!     <td colspan="6"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"> 
        <b>Activity List </b></font></td>
    </tr>
!   <tr> 
      <th width="12%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Provider</font></th>
      <th width="14%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Group Number</font></th>
      <th width="20%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Creation Date </font></th>
      <th width="15%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Claims/Records</font></th>
!     <th width="15%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">MSP Filename</font></th>
      <th><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">HTML Filename</font></th>
    </tr>
!   
  <%
  	String pro_ohip="", pro_group="", updatedate="", cr="", oFile="", hFile="";
  
  	String[] paramYear = new String[2];
--- 218,243 ----
                  <b><font face="Arial, Helvetica, sans-serif" size="2"></font></b>
                  <font face="Arial, Helvetica, sans-serif" size="2"> </font>
!             </font>
        </td>
      </tr>
    </form>
  </table>
! <table width="100%" border="1" cellspacing="0" cellpadding="0">
!   <tr bgcolor="<%=yearColor%>">
!     <td colspan="6"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">
        <b>Activity List </b></font></td>
    </tr>
!   <tr bgcolor="<%=yearColor%>">
      <th width="12%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Provider</font></th>
      <th width="14%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Group Number</font></th>
      <th width="20%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Creation Date </font></th>
      <th width="15%"><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">Claims/Records</font></th>
!     <th width="15%"><font face="Arial, Helvetica, sans-serif" size="2" color="blue">MSP Filename</font></th>
      <th><font face="Arial, Helvetica, sans-serif" size="2" color="#003366">HTML Filename</font></th>
    </tr>
! 
  <%
  	String pro_ohip="", pro_group="", updatedate="", cr="", oFile="", hFile="";
+ 	String strToday = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy-MM-dd");
  
  	String[] paramYear = new String[2];
***************
*** 238,242 ****
  	rslocal = apptMainBean.queryResults(paramYear, "search_billactivity");
  	while(rslocal.next()){
! 		pro_ohip = rslocal.getString("providerohipno"); 
  		pro_group = rslocal.getString("groupno");
  		updatedate = rslocal.getString("updatedatetime");
--- 248,252 ----
  	rslocal = apptMainBean.queryResults(paramYear, "search_billactivity");
  	while(rslocal.next()){
! 		pro_ohip = rslocal.getString("providerohipno");
  		pro_group = rslocal.getString("groupno");
  		updatedate = rslocal.getString("updatedatetime");
***************
*** 246,250 ****
  %>
  
!   <tr> 
      <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><%=pro_ohip%></font></td>
      <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><%=pro_group%></font></td>
--- 256,260 ----
  %>
  
!   <tr bgcolor="<%=updatedate.startsWith(strToday)? "#E6F0F7" : yearColor %>" align="center">
      <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><%=pro_ohip%></font></td>
      <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><%=pro_group%></font></td>
***************
*** 253,258 ****
     <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><a href="../../../servlet/OscarDownload?homepath=ohipdownload&filename=<%=oFile%>" target="_blank"><%=oFile%></a></font></td>
      <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><a href="../../../servlet/OscarDownload?homepath=ohipdownload&filename=<%=hFile%>" target="_blank"><%=hFile%></a></font></td>
!   </tr>            
! <% 
  }
  apptMainBean.closePstmtConn();
--- 263,268 ----
     <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><a href="../../../servlet/OscarDownload?homepath=ohipdownload&filename=<%=oFile%>" target="_blank"><%=oFile%></a></font></td>
      <td><font face="Arial, Helvetica, sans-serif" size="2" color="#003366"><a href="../../../servlet/OscarDownload?homepath=ohipdownload&filename=<%=hFile%>" target="_blank"><%=hFile%></a></font></td>
!   </tr>
! <%
  }
  apptMainBean.closePstmtConn();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportnewedblist.jsp,1.8,1.9

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

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

Modified Files:
	reportnewedblist.jsp 
Log Message:
added count number to side of report



Index: reportnewedblist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportnewedblist.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** reportnewedblist.jsp	22 Apr 2004 14:48:00 -0000	1.8
--- reportnewedblist.jsp	25 Feb 2005 21:20:51 -0000	1.9
***************
*** 124,127 ****
--- 124,128 ----
  %>
  <tr bgcolor="<%=bodd?weakcolor:"white"%>">
+       <td><%=nItems%></td>
        <td align="center" nowrap><%=rs.getString("c_finalEDB")!=null?rs.getString("c_finalEDB").replace('-','/'):"0001/01/01"%></td>
        <td><%=rs.getString("c_pName")%></td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportedblist.jsp,1.6,1.7

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

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

Modified Files:
	reportedblist.jsp 
Log Message:
added count number to side of report



Index: reportedblist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportedblist.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** reportedblist.jsp	22 Apr 2004 14:48:00 -0000	1.6
--- reportedblist.jsp	25 Feb 2005 21:02:11 -0000	1.7
***************
*** 61,156 ****
  <body  background="../images/gray_bg.jpg" bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
  
! <table border="0" cellspacing="0" cellpadding="0" width="100%" >
!   <tr bgcolor="#486ebd"><th align=CENTER><font face="Helvetica" color="#FFFFFF">EDB LIST</font></th>
!    <th align="right" width="10%" NOWRAP><input type="button" name="Button" value="Print" onClick="window.print()">
!    <input type="button" name="Button" value="Cancel" onClick="window.close()"></th>
!   </tr>
! </table>
  
! <CENTER><table width="100%" border="1" bgcolor="#ffffff" cellspacing="0" cellpadding="1"> 
! <tr bgcolor="silver"> 
! <TH align="center" width="10%" nowrap><b>EDB</b></TH>
! <TH align="center" width="30%"><b>Patient's Name </b></TH>
! <!--TH align="center" width="20%"><b>Demog' No </b></TH-->
! <TH align="center" width="5%"><b>Age</b></TH>
! <TH align="center" width="5%"><b>Gravida</b></TH>
! <TH align="center" width="10%"><b>Term</b></TH>
! <TH align="center" width="30%"><b>Phone</b></TH>
! <TH align="center"><b>Provider</b></TH>
! </tr>
  <%
! 	GregorianCalendar now=new GregorianCalendar();
!   int curYear = now.get(Calendar.YEAR);
!   int curMonth = (now.get(Calendar.MONTH)+1);
!   int curDay = now.get(Calendar.DAY_OF_MONTH);
!   int age=0;
!   ResultSet rs=null ;
!   rs = reportMainBean.queryResults("search_provider");
!   while (rs.next()) { 
!     providerNameBean.setDef(rs.getString("provider_no"), new String( rs.getString("last_name")+","+rs.getString("first_name") ));
!   }
      
!   int rowsAffected = reportMainBean.queryExecuteUpdate("%", "delete_reporttemp");
  	rs = reportMainBean.queryResults("search_form_demo");
  
!   while (rs.next()) {
! 	  String[] param1 =new String[2];
! 	  param1[0]=rs.getString("demographic_no");
! 	  param1[1]="ar%";
! 	  ResultSet rsdemo = reportMainBean.queryResults(param1, "search_form_aredb");
!     while (rsdemo.next()) {
! 	    int []itemp = new int[] {Integer.parseInt(rsdemo.getString("demographic_no"))};
! 	    String[] param2 =new String[5];
!   	  param2[0]=rsdemo.getString("content")!=null?(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_fedb")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_fedb"):"0001-01-01"):"0001-01-01";
! 	    param2[1]=rsdemo.getString("content")!=null?(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_name")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_name"):""):"";
! 	    param2[2]=rsdemo.getString("provider_no");
! 	    param2[3]="<age>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_age")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_age"):"") + "</age>" +  "<gravida>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_gra")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_gra"):"") + "</gravida>" +   "<term>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_term")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_term"):"") + "</term>" +   "<phone>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_hp")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_hp"):"") + "</phone>";
! 	    param2[4]=curUser_no; 
! //	System.out.println("from -------- :"+ rsdemo.getString("form_date")+ ": next :"+param2[3]+param2[0]+param2[2]);
! 	 	  rowsAffected = reportMainBean.queryExecuteUpdate(itemp,param2,  "add_reporttemp"); //lock the table
! 	  } 
!   } 
  
  	String[] param =new String[4];
! 	param[1]=startDate; //"0001-01-01"; 
! 	param[0]=endDate; //"0001-01-01"; 
! 	param[2]=curUser_no; 
! 	//param[3]="edb";
!   int[] itemp1 = new int[2];
!   itemp1[0] = Integer.parseInt(strLimit1);
!   itemp1[1] = Integer.parseInt(strLimit2);
  	//System.out.println("from -------- :"+ param[0]+ ": next :"+param[1]);
  	rs = reportMainBean.queryResults(param, itemp1, "search_reporttemp"); //unlock the table
!   boolean bodd=false;
!   int nItems=0;
    
!   while (rs.next()) {
!     bodd=bodd?false:true; //for the color of rows
!     nItems++; 
  %>
! <tr bgcolor="<%=bodd?"ivory":"white"%>">
!       <td align="center" nowrap><%=rs.getString("edb").replace('-','/')%></td>
!       <td><%=rs.getString("demo_name")%></td>
!       <!--td align="center" ><%=rs.getString("demographic_no")%> </td-->
!       <td><%=SxmlMisc.getXmlContent(rs.getString("address"),"age")%></td>
!       <td><%=SxmlMisc.getXmlContent(rs.getString("address"),"gravida")%></td>
!       <td><%=SxmlMisc.getXmlContent(rs.getString("address"),"term")%></td>
!       <td nowrap><%=SxmlMisc.getXmlContent(rs.getString("address"),"phone")%></td>
!       <td><%=providerNameBean.getShortDef(rs.getString("provider_no"), "", 11)%></td>
! </tr>
  <%
    }
  
! if(reportMainBean.getBDoConfigure()) reportMainBean.setBDoConfigure();
!   reportMainBean.closePstmtConn();
  %> 
  
! </table>
  <br>
  <%
!   int nLastPage=0,nNextPage=0;
!   nNextPage=Integer.parseInt(strLimit2)+Integer.parseInt(strLimit1);
!   nLastPage=Integer.parseInt(strLimit1)-Integer.parseInt(strLimit2);
!   if(nLastPage>=0) {
  %>
  <a href="reportedblist.jsp?startDate=<%=request.getParameter("startDate")%>&endDate=<%=request.getParameter("endDate")%>&limit1=<%=nLastPage%>&limit2=<%=strLimit2%>">Last Page</a> |
--- 61,162 ----
  <body  background="../images/gray_bg.jpg" bgproperties="fixed" onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
  
!    <table border="0" cellspacing="0" cellpadding="0" width="100%" >
!       <tr bgcolor="#486ebd">
!          <th align=CENTER><font face="Helvetica" color="#FFFFFF">EDB LIST</font></th>
!          <th align="right" width="10%" NOWRAP><input type="button" name="Button" value="Print" onClick="window.print()">
!             <input type="button" name="Button" value="Cancel" onClick="window.close()">
!          </th>
!       </tr>
!    </table>
  
!    <CENTER>
!       <table width="100%" border="1" bgcolor="#ffffff" cellspacing="0" cellpadding="1"> 
!          <tr bgcolor="silver"> 
!             <TH >&nbsp;</TH>
!             <TH align="center" width="10%" nowrap><b>EDB</b></TH>
!             <TH align="center" width="30%"><b>Patient's Name </b></TH>
!             <!--TH align="center" width="20%"><b>Demog' No </b></TH-->
!             <TH align="center" width="5%"><b>Age</b></TH>
!             <TH align="center" width="5%"><b>Gravida</b></TH>
!             <TH align="center" width="10%"><b>Term</b></TH>
!             <TH align="center" width="30%"><b>Phone</b></TH>
!             <TH align="center"><b>Provider</b></TH>
!          </tr>
  <%
!    GregorianCalendar now=new GregorianCalendar();
!    int curYear = now.get(Calendar.YEAR);
!    int curMonth = (now.get(Calendar.MONTH)+1);
!    int curDay = now.get(Calendar.DAY_OF_MONTH);
!    int age=0;
!    ResultSet rs=null ;
!    rs = reportMainBean.queryResults("search_provider");
!    while (rs.next()) { 
!       providerNameBean.setDef(rs.getString("provider_no"), new String( rs.getString("last_name")+","+rs.getString("first_name") ));
!    }
      
!    int rowsAffected = reportMainBean.queryExecuteUpdate("%", "delete_reporttemp");
  	rs = reportMainBean.queryResults("search_form_demo");
  
!    while (rs.next()) {
! 	   String[] param1 =new String[2];
! 	     param1[0]=rs.getString("demographic_no");
! 	     param1[1]="ar%";
! 	   ResultSet rsdemo = reportMainBean.queryResults(param1, "search_form_aredb");
!       while (rsdemo.next()) {
! 	      int []itemp = new int[] {Integer.parseInt(rsdemo.getString("demographic_no"))};
! 	      String[] param2 =new String[5];
!   	        param2[0]=rsdemo.getString("content")!=null?(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_fedb")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_fedb"):"0001-01-01"):"0001-01-01";
! 	        param2[1]=rsdemo.getString("content")!=null?(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_name")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_name"):""):"";
! 	        param2[2]=rsdemo.getString("provider_no");
! 	        param2[3]="<age>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_age")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_age"):"") + "</age>" +  "<gravida>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_gra")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_gra"):"") + "</gravida>" +   "<term>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_term")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_term"):"") + "</term>" +   "<phone>"+(SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_hp")!=null?SxmlMisc.getXmlContent(rsdemo.getString("content"),"xml_hp"):"") + "</phone>";
! 	        param2[4]=curUser_no; 
!            //	System.out.println("from -------- :"+ rsdemo.getString("form_date")+ ": next :"+param2[3]+param2[0]+param2[2]);
! 	 	    rowsAffected = reportMainBean.queryExecuteUpdate(itemp,param2,  "add_reporttemp"); //lock the table
! 	   } 
!    } 
  
  	String[] param =new String[4];
! 	  param[1]=startDate; //"0001-01-01"; 
! 	  param[0]=endDate; //"0001-01-01"; 
! 	  param[2]=curUser_no; 
! 	  //param[3]="edb";
!    int[] itemp1 = new int[2];
!      itemp1[0] = Integer.parseInt(strLimit1);
!      itemp1[1] = Integer.parseInt(strLimit2);
  	//System.out.println("from -------- :"+ param[0]+ ": next :"+param[1]);
  	rs = reportMainBean.queryResults(param, itemp1, "search_reporttemp"); //unlock the table
!    boolean bodd=false;
!    int nItems=0;
    
!    while (rs.next()) {
!       bodd=bodd?false:true; //for the color of rows
!       nItems++; 
  %>
!             <tr bgcolor="<%=bodd?"ivory":"white"%>">
!                 <td align="center"><%=nItems%></td>
!                 <td align="center" nowrap><%=rs.getString("edb").replace('-','/')%></td>
!                 <td><%=rs.getString("demo_name")%></td>
!                 <!--td align="center" ><%=rs.getString("demographic_no")%> </td-->
!                 <td><%=SxmlMisc.getXmlContent(rs.getString("address"),"age")%></td>
!                 <td><%=SxmlMisc.getXmlContent(rs.getString("address"),"gravida")%></td>
!                 <td><%=SxmlMisc.getXmlContent(rs.getString("address"),"term")%></td>
!                 <td nowrap><%=SxmlMisc.getXmlContent(rs.getString("address"),"phone")%></td>
!                 <td><%=providerNameBean.getShortDef(rs.getString("provider_no"), "", 11)%></td>
!             </tr>
  <%
    }
  
!   if(reportMainBean.getBDoConfigure()) reportMainBean.setBDoConfigure();
!      reportMainBean.closePstmtConn();
  %> 
  
!         </table>
!     <CENTER>
  <br>
  <%
!     int nLastPage=0,nNextPage=0;
!     nNextPage=Integer.parseInt(strLimit2)+Integer.parseInt(strLimit1);
!     nLastPage=Integer.parseInt(strLimit1)-Integer.parseInt(strLimit2);
!     if(nLastPage>=0) {
  %>
  <a href="reportedblist.jsp?startDate=<%=request.getParameter("startDate")%>&endDate=<%=request.getParameter("endDate")%>&limit1=<%=nLastPage%>&limit2=<%=strLimit2%>">Last Page</a> |
***************
*** 160,166 ****
  %>
  <a href="reportedblist.jsp?startDate=<%=request.getParameter("startDate")%>&endDate=<%=request.getParameter("endDate")%>&limit1=<%=nNextPage%>&limit2=<%=strLimit2%>"> Next Page</a>
! <%
! }
! %>
  </body>
  </html>
--- 166,170 ----
  %>
  <a href="reportedblist.jsp?startDate=<%=request.getParameter("startDate")%>&endDate=<%=request.getParameter("endDate")%>&limit1=<%=nNextPage%>&limit2=<%=strLimit2%>"> Next Page</a>
! <%}%>
  </body>
  </html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscardata_bc.sql,1.13,1.14

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

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

Modified Files:
	oscardata_bc.sql 
Log Message:
added billing service codes for bc midwife



Index: oscardata_bc.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata_bc.sql,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** oscardata_bc.sql	15 Dec 2004 14:46:08 -0000	1.13
--- oscardata_bc.sql	25 Feb 2005 19:27:31 -0000	1.14
***************
*** 14819,14822 ****
--- 14819,14843 ----
  INSERT INTO billingservice VALUES (17820,'','13050','CHRONIC CARE BONUS                                ','75.00','','2004-04-02','','BC','00');
  
+ INSERT INTO billingservice VALUES (17821,'','36010','Phase 1 (first trimester) - total care','215.17','','2005-02-16','','BC','00');									
+ INSERT INTO billingservice VALUES (17822,'','36014','Phase 1 (first trimester) - when care is transferred TO another midwife prior to completion of phase 1 (40%)','86.07','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17823,'','36016','Phase 1 (first trimester) - when care has been transferred FROM another midwife during phase 1 (60%)','129.10','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17824,'','36021','Phase 1 - when first visit is in 2nd phase, with no previous care by a physician or other midwife','215.17','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17825,'','36020','Phase 2 (second trimester) - total care','215.17','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17826,'','36024','Phase 2 (second trimester) - when care is transferred TO another midwife prior to completion of phase 2 (40%)','86.07','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17827,'','36026','Phase 2 (second trimester) - when care has been transferred FROM another midwife during phase 2 (60%)','129.10','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17828,'','36030','Phase 3 (third trimester) - total care','430.41','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17829,'','36034','Phase 3 (third trimester) - when care is transferred TO another midwife prior to completion of phase 3 (40%)','172.16','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17830,'','36036','Phase 3 (third trimester) - when care has been transferred FROM another midwife during phase 3 (60%)','258.25','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17831,'','36040','Phase 4 (labour and delivery) - first contact with the client prior to 34 weeks','860.73','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17832,'','36044','Phase 4 (labour and delivery) - first contact with the client after 34 weeks','430.37','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17833,'','36050','Phase 5 (post-partum care) - total care','860.73','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17834,'','36056','Phase 5 (post-partum care) - when care is transferred TO another midwife during the first 2 weeks of postpartum care (60%)','516.44','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17835,'','36054','Phase 5 (post-partum care) - when care is transferred FROM another midwife during the first 2 weeks of postpartum care (40%)','344.29','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17836,'','36061','Supervision of up to 5 births or 4 full courses of care','2582.21','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17837,'','36062','Supervision of 5 full courses of care','5164.42','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17838,'','36063','Supervision of 6-10 full courses of care','7746.63','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17839,'','36064','Supervision of 11-15 full courses of care','10328.84','','2005-02-16','','BC','00');
+ INSERT INTO billingservice VALUES (17840,'','36065','Supervision of 16-30 full courses of care','12911.05','','2005-02-16','','BC','00');
+ 
  
  INSERT INTO billingvisit VALUES ('R','Patient\'s residence','BC');

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util FrmToXMLUtil.java,1.11,1.12

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

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

Modified Files:
	FrmToXMLUtil.java 
Log Message:
put flushot on a seperate record



Index: FrmToXMLUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FrmToXMLUtil.java	25 Feb 2005 16:46:21 -0000	1.11
--- FrmToXMLUtil.java	25 Feb 2005 19:18:30 -0000	1.12
***************
*** 62,65 ****
--- 62,70 ----
              vType = "NurseVisit"; //NurseVisit        
  
+         XmlOptions xmlOptions = new XmlOptions();
+         xmlOptions.setSavePrettyPrint();      
+         xmlOptions.setSavePrettyPrintIndent(3);
+         String xmlStr="";
+       
          SitePatientVisitRecordsDocument visitDocument = SitePatientVisitRecordsDocument.Factory.newInstance();
          SitePatientVisitRecordsDocument.SitePatientVisitRecords visitRecord = visitDocument.addNewSitePatientVisitRecords();
***************
*** 204,214 ****
              }
              if (getFluShotBillingDate((String) dataProps.getProperty("demographic_no"))!=null){
!                 SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug();                
                  drug.setDrugCod("ATC_J07BB01");
                  SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName();                
                  drugName.setSignedHow(how);
                  drugName.setSignedWho(who);
!                 drugName.setSignedWhen(getFluShotBillingDate((String) dataProps.getProperty("demographic_no")));
                  drugName.setValue("flu Shot");
              }
                          
--- 209,232 ----
              }
              if (getFluShotBillingDate((String) dataProps.getProperty("demographic_no"))!=null){
!                 SitePatientVisitRecordsDocument visitDocumentFlu = SitePatientVisitRecordsDocument.Factory.newInstance();
!                 SitePatientVisitRecordsDocument.SitePatientVisitRecords visitRecordFlu = visitDocumentFlu.addNewSitePatientVisitRecords();
!                 SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit visitFlu  = visitRecordFlu.addNewSitePatientVisit();
!             
!                 SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SelVisitType visitTypeFlu = visitFlu.addNewSelVisitType();
!                 visitTypeFlu.setValue(vType);
!                 visitTypeFlu.setSignedWhen(when);
!                 visitTypeFlu.setSignedHow(how);
!                 visitTypeFlu.setSignedWho(who);
! 
!                 visitFlu.setPatientCod(dataProps.getProperty("demographic_no"));
!                 visitFlu.setVisitCod(getFluShotBillingDate((String) dataProps.getProperty("demographic_no")));  
!                 SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visitFlu.addNewSitePatientVisitDrug();                
                  drug.setDrugCod("ATC_J07BB01");
                  SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName();                
                  drugName.setSignedHow(how);
                  drugName.setSignedWho(who);
!                 drugName.setSignedWhen(when);
                  drugName.setValue("flu Shot");
+                 xmlStr = visitDocumentFlu.xmlText(xmlOptions);
              }
                          
***************
*** 225,233 ****
          }
  
!          //System.out.println(" number of records "+vec.size());      //
!       XmlOptions xmlOptions = new XmlOptions();
!       xmlOptions.setSavePrettyPrint();      
!       xmlOptions.setSavePrettyPrintIndent(3);
!       String xmlStr = visitDocument.xmlText(xmlOptions);
        System.out.println("*********************************************************************************");
        System.out.println("************************** XML GENERATED BY OSCAR *******************************");
--- 243,249 ----
          }
  
!       //System.out.println(" number of records "+vec.size());  
!       xmlStr = xmlStr + visitDocument.xmlText(xmlOptions);
!       
        System.out.println("*********************************************************************************");
        System.out.println("************************** XML GENERATED BY OSCAR *******************************");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.32,1.33

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
set to open all section by default



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** formVTForm.jsp	23 Feb 2005 21:07:07 -0000	1.32
--- formVTForm.jsp	25 Feb 2005 17:02:52 -0000	1.33
***************
*** 722,726 ****
                                           <tr>
                                              <td></td>
!                                             <td ><table style="display:none" cellpadding='1' cellspacing='0' id="history">                                            
                                              <tr><td>
                                              <table style="display:none" id="detailHistory" cellpadding='1' cellspacing='0'width="100%">                                                   
--- 722,726 ----
                                           <tr>
                                              <td></td>
!                                             <td ><table cellpadding='1' cellspacing='0' id="history">                                            
                                              <tr><td>
                                              <table style="display:none" id="detailHistory" cellpadding='1' cellspacing='0'width="100%">                                                   
***************
*** 1026,1030 ****
                                           <tr>
                                              <td></td>                                            
!                                             <td><table style="display:none" cellpadding='0' cellspacing='0' id="vital">                                                
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
--- 1026,1030 ----
                                           <tr>
                                              <td></td>                                            
!                                             <td><table cellpadding='0' cellspacing='0' id="vital">                                                
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
***************
*** 1154,1158 ****
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='0' cellspacing='0' id="examination">
                                                  <tr>
                                                      <td class="subTitle" width="28%">                                                        
--- 1154,1158 ----
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='0' cellspacing='0' id="examination">
                                                  <tr>
                                                      <td class="subTitle" width="28%">                                                        
***************
*** 1329,1332 ****
--- 1329,1349 ----
                                                   </tr>
                                                   <tr>
+                                                     <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td>
+                                                     <td class="dataEntryTable" align="center">
+                                                         <table cellpadding='0' cellspacing='0'>                                                            
+                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iDiaLDDate")%></td></tr>
+                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iDiaLastData")%></td></tr>
+ 
+                                                         </table>
+                                                     </td>
+                                                     <td class="dataEntryTable" align="center">
+                                                         <html:radio property="value(iDiaValue)" value="yes" />Yes
+                                                         <html:radio property="value(iDiaValue)" value="no" />No
+                                                         <a title="clear all" href="javascript:clearAll(eyeDiaId, eyeDiaId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
+                                                     </td>
+                                                     <html:hidden property="value(iDiaDate)"/>
+                                                     <html:hidden property="value(iDiaComments)"/>
+                                                  </tr>
+                                                  <tr>
                                                      <td colspan='3'>
                                                          <table cellpadding="0" cellspacing="0" width="100%" style="display:none" id="detailEye">                                                                                                                 
***************
*** 1347,1368 ****
                                                                  <html:hidden property="value(iHypDate)" />
                                                                  <html:hidden property="value(iHypComments)" />
!                                                              </tr>
!                                                              <tr>
!                                                                 <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <table cellpadding='0' cellspacing='0'>                                                            
!                                                                         <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iDiaLDDate")%></td></tr>
!                                                                         <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iDiaLastData")%></td></tr>
! 
!                                                                     </table>
!                                                                 </td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <html:radio property="value(iDiaValue)" value="yes" />Yes
!                                                                     <html:radio property="value(iDiaValue)" value="no" />No
!                                                                     <a title="clear all" href="javascript:clearAll(eyeDiaId, eyeDiaId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                                 </td>
!                                                                 <html:hidden property="value(iDiaDate)"/>
!                                                                 <html:hidden property="value(iDiaComments)"/>
!                                                              </tr>
                                                               <tr>
                                                                  <td class="dataEntryTable"><%=request.getAttribute("iOthDesc")%></td>
--- 1364,1368 ----
                                                                  <html:hidden property="value(iHypDate)" />
                                                                  <html:hidden property="value(iHypComments)" />
!                                                              </tr>                                                             
                                                               <tr>
                                                                  <td class="dataEntryTable"><%=request.getAttribute("iOthDesc")%></td>
***************
*** 1412,1416 ****
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='0' cellspacing='0' id="labs">
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
--- 1412,1416 ----
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='0' cellspacing='0' id="labs">
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
***************
*** 1558,1562 ****
                                                      <tr>                                                        
                                                          <td>
!                                                             <table style="display:none" cellpadding='1' cellspacing='0' id="diagnosis">
                                                              <tr>
                                                                  <td>
--- 1558,1562 ----
                                                      <tr>                                                        
                                                          <td>
!                                                             <table cellpadding='1' cellspacing='0' id="diagnosis">
                                                              <tr>
                                                                  <td>
***************
*** 1588,1592 ****
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='1' cellspacing='0' id="medications">
                                              <tr>
                                                  <td>
--- 1588,1592 ----
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='1' cellspacing='0' id="medications">
                                              <tr>
                                                  <td>
***************
*** 1611,1615 ****
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='1' cellspacing='0' id="medicationAllergies">
                                              <tr>
                                                  <td>
--- 1611,1615 ----
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='1' cellspacing='0' id="medicationAllergies">
                                              <tr>
                                                  <td>
***************
*** 1638,1642 ****
                                                       <tr>
                                                          <td></td>
!                                                         <td><table width="100%" style="display:none" cellpadding='1' cellspacing='0' id="counselling">
                                                              <tr>
                                                                  <td class="subTitle" width="29%">                                                        
--- 1638,1642 ----
                                                       <tr>
                                                          <td></td>
!                                                         <td><table width="100%" cellpadding='1' cellspacing='0' id="counselling">
                                                              <tr>
                                                                  <td class="subTitle" width="29%">                                                        

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util FrmToXMLUtil.java,1.10,1.11

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

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

Modified Files:
	FrmToXMLUtil.java 
Log Message:
added flu shot



Index: FrmToXMLUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/util/FrmToXMLUtil.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** FrmToXMLUtil.java	27 Jan 2005 17:40:39 -0000	1.10
--- FrmToXMLUtil.java	25 Feb 2005 16:46:21 -0000	1.11
***************
*** 27,32 ****
--- 27,35 ----
  import java.lang.reflect.*;
  import java.text.*;
+ import java.sql.ResultSet;
+ import java.sql.SQLException;
  import org.apache.xmlbeans.*;
  import org.apache.xmlbeans.XmlCalendar;
+ import oscar.oscarDB.DBHandler;
  import oscar.oscarEncounter.oscarMeasurements.bean.*;
  import oscar.oscarProvider.data.ProviderData;
***************
*** 200,203 ****
--- 203,216 ----
                  drugName.setValue(prescribedDrugs[i].getDrugName());
              }
+             if (getFluShotBillingDate((String) dataProps.getProperty("demographic_no"))!=null){
+                 SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug drug = visit.addNewSitePatientVisitDrug();                
+                 drug.setDrugCod("ATC_J07BB01");
+                 SitePatientVisitRecordsDocument.SitePatientVisitRecords.SitePatientVisit.SitePatientVisitDrug.TxtDrugName drugName = drug.addNewTxtDrugName();                
+                 drugName.setSignedHow(how);
+                 drugName.setSignedWho(who);
+                 drugName.setSignedWhen(getFluShotBillingDate((String) dataProps.getProperty("demographic_no")));
+                 drugName.setValue("flu Shot");
+             }
+                         
                                          
          }
***************
*** 341,344 ****
--- 354,377 ----
              
      }
+    
+    private static String getFluShotBillingDate(String demoNo) {
+         String s = null;
+         try {
+                 DBHandler dbhandler = new DBHandler(DBHandler.OSCAR_DATA);
+                 String s1 = "select b.billing_no, b.billing_date from billing b, billingdetail bd where b.demographic_no='"
+                                 + demoNo
+                                 + "' and bd.billing_no=b.billing_no and (bd.service_code='G590A' or bd.service_code='G591A') "
+                                 + " and bd.status<>'D' and b.status<>'D' order by b.billing_date desc limit 0,1";
+                 ResultSet rs = dbhandler.GetSQL(s1);
+                 //System.out.println("flushot: " + s1);
+                 if (rs.next())
+                         s = rs.getString("billing_date");
+                 rs.close();
+                 dbhandler.CloseConn();
+             } catch (SQLException sqlexception) {
+                 System.out.println(sqlexception.getMessage());
+         }
+         return s;
+     }
            
  }

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

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

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

Added Files:
	RxShowAllergyAction.java 
Log Message:
Action class to setup Rx Session Bean



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

import oscar.oscarRx.data.*;

import java.io.IOException;
import java.util.Hashtable;
import java.util.Locale;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.action.ActionServlet;
import org.apache.struts.util.MessageResources;


public final class RxShowAllergyAction extends Action {
    
    
    public ActionForward execute(ActionMapping mapping,
    ActionForm form,
    HttpServletRequest request,
    HttpServletResponse response)
    throws IOException, ServletException {
                                 
        if(request.getSession().getAttribute("user") == null  || !( ((String) request.getSession().getAttribute("userprofession")).equalsIgnoreCase("doctor") )  ){
            return (mapping.findForward("Logout"));
        }
        
        String user_no = (String) request.getSession().getAttribute("user");
        String demo_no = (String) request.getParameter("demographicNo");
               
        
        if(demo_no == null){
           return mapping.findForward("failure");
        }
        // Setup bean
        RxSessionBean bean;
        
        if(request.getSession().getAttribute("RxSessionBean")!=null) {
            bean = (oscar.oscarRx.pageUtil.RxSessionBean)request.getSession().getAttribute("RxSessionBean");            
            if( (bean.getProviderNo() != user_no) || (bean.getDemographicNo() != Integer.parseInt(demo_no) ) ) {
                bean = new RxSessionBean();
            }
            
        } else {
            bean = new RxSessionBean();
        }
        
        
        bean.setProviderNo(user_no);
        bean.setDemographicNo(Integer.parseInt(demo_no));
        
        request.getSession().setAttribute("RxSessionBean", bean);
        
        RxPatientData rx = null;
        RxPatientData.Patient patient = null;
        try {
            rx = new RxPatientData();
            patient = rx.getPatient(bean.getDemographicNo());
        }
        catch (java.sql.SQLException ex) {
            throw new ServletException(ex);
        }
        
        if(patient!=null) {
            request.getSession().setAttribute("Patient", patient);
            return (mapping.findForward("success"));            
        } else {//no records found        
            response.sendRedirect("error.html");
            return null;
        }
    }
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarReport oscarReportRehabStudy.jsp,1.2,1.3

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

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

Modified Files:
	oscarReportRehabStudy.jsp 
Log Message:
fixed a typo



Index: oscarReportRehabStudy.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/oscarReportRehabStudy.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** oscarReportRehabStudy.jsp	21 Feb 2005 17:57:00 -0000	1.2
--- oscarReportRehabStudy.jsp	24 Feb 2005 16:46:17 -0000	1.3
***************
*** 222,226 ****
                    </tr>
                    <tr>
!                     <td nowrap><a href="#" onClick="generateResult('formTreamentPref');">Treatment Preference</a></td>
                    </tr>
                    <tr>
--- 222,226 ----
                    </tr>
                    <tr>
!                     <td nowrap><a href="#" onClick="generateResult('formTreatmentPref');">Treatment Preference</a></td>
                    </tr>
                    <tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_pt_BR.properties,1.95,1.96

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

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

Modified Files:
	oscarResources_pt_BR.properties 
Log Message:
added global.allergies = allergias



Index: oscarResources_pt_BR.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pt_BR.properties,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** oscarResources_pt_BR.properties	1 Nov 2004 17:32:24 -0000	1.95
--- oscarResources_pt_BR.properties	24 Feb 2005 15:50:53 -0000	1.96
***************
*** 358,361 ****
--- 358,362 ----
  
  #Global messages. These messages are used on many pages of the system.
+ global.allergies=Alergias
  global.btnClose=Fechar
  global.btnBack=Voltar

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

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

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

Modified Files:
	oscarResources_en.properties 
Log Message:
added global.allergies = allergies



Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.132
retrieving revision 1.133
diff -C2 -d -r1.132 -r1.133
*** oscarResources_en.properties	9 Feb 2005 06:58:04 -0000	1.132
--- oscarResources_en.properties	24 Feb 2005 15:50:07 -0000	1.133
***************
*** 357,360 ****
--- 357,361 ----
  
  #Global messages. These messages are used on many pages of the system.
+ global.allergies=allergies
  global.btnClose=Close
  global.btnBack=Back

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarRx styles.css,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-serv17841

Modified Files:
	styles.css 
Log Message:
Added Property PropSheetLevel1CurrentItemRed its the same as PropSheetLevel1CurrentItemRed but in red text



Index: styles.css
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/styles.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** styles.css	5 Feb 2004 19:26:42 -0000	1.1
--- styles.css	24 Feb 2005 15:23:29 -0000	1.2
***************
*** 349,352 ****
--- 349,361 ----
  		font-weight: bold; }
  
+ .PropSheetLevel1CurrentItemRed
+ 	{
+                 color: Red;
+ 		margin-left: 10px;
+ 		text-indent: -10px;
+ 		margin-top: 5px;
+ 		margin-bottom: 5px;
+ 		font-weight: bold; }
+ 
  .PropSheetLevel2CurrentItem
  	{

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

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
hide less imp fields



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** formVTForm.jsp	3 Feb 2005 20:57:11 -0000	1.31
--- formVTForm.jsp	23 Feb 2005 21:07:07 -0000	1.32
***************
*** 153,157 ****
              color: blue;
          }
!         
  
      </style>
--- 153,159 ----
              color: blue;
          }
!         .detail{
!             d
!         }
  
      </style>
***************
*** 238,241 ****
--- 240,259 ----
  }
  
+ function showHideDetail(){
+     showHideItem('subjective');
+     showHideItem('objective');
+     showHideItem('detailDiag');
+     showHideItem('plan');
+     showHideItem('detailVital');
+     showHideItem('detailHistory');
+     showHideItem('detailFT');
+     showHideItem('detailEye');
+     showHideItem('detailLab');
+     showHideItem('detailCounselling');
+     showHideItem('showDetailTitle');
+     showHideItem('hideDetailTitle');
+     
+ }
+ 
  function updateWaistHip(){
      var r = document.forms[0].elements[ratio].value;
***************
*** 294,298 ****
  function storeSMKSupportData(){
      //getElementbyId function doesn't work on these elements
!     //here is the work around    
      
      document.forms[0].elements[smkSDate].value = document.getElementById('SmkDate').value;
--- 312,316 ----
  function storeSMKSupportData(){
      //getElementbyId function doesn't work on these elements
!     //here is the work around   
      
      document.forms[0].elements[smkSDate].value = document.getElementById('SmkDate').value;
***************
*** 590,593 ****
--- 608,612 ----
      document.forms[0].elements[nRadio].checked=false;
  }
+ 
  </script>
  <body class="BodyStyle" vlink="#0000FF" onload="window.focus();window.resizeTo(680,760); popupDecisionSupport(); initialize();">
***************
*** 605,609 ****
                  <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/>
                  <input type="submit" value="Exit" onclick="javascript:return onExit();"/>
!                 <input type="button" value="Print" onclick="javascript:return onPrint();"/>
              </td>
          </tr>
--- 624,628 ----
                  <input type="submit" value="Save and Exit" onclick="javascript:return onSaveExit();"/>
                  <input type="submit" value="Exit" onclick="javascript:return onExit();"/>
!                 <input type="button" value="Print" onclick="javascript:return onPrint();"/>                
              </td>
          </tr>
***************
*** 629,637 ****
                                                  <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>
!                                                         <td>
!                                                             <table width="60%">
                                                                  <tr>                                                                                                      
                                                                      <td align="left" class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/></td>
--- 648,656 ----
                                                  <table width="95%">
                                                      <tr>
!                                                         <td valign="top" width="22%">
                                                              <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>
!                                                         <td  width="53%">
!                                                             <table>
                                                                  <tr>                                                                                                      
                                                                      <td align="left" class="sixtyPercent"><html:checkbox property="value(DMValue)" onclick="javascript: DMCheck();"/></td>
***************
*** 646,662 ****
                                                                  </tr>
                                                                  <tr>                                                                                                      
!                                                                     <td align="center" class="sixtyPercent"> DM</td>
!                                                                     <td align="center" class="sixtyPercent"> HTN</td>
!                                                                     <td align="center" class="sixtyPercent"> Hyperlipidemia</td>
!                                                                     <td align="center" class="sixtyPercent"> MI</td>
!                                                                     <td align="center" class="sixtyPercent"> Angina</td>
!                                                                     <td align="center" class="sixtyPercent"> ACS</td>
!                                                                     <td align="center" class="sixtyPercent"> Revascularization</td>
!                                                                     <td align="center" class="sixtyPercent"> CVD</td>
!                                                                     <td align="center" class="sixtyPercent"> PVD</td>                                                    
                                                                  </tr>
                                                              </table>
                                                          </td>
!                                                         <td align="right">
                                                              <table>
                                                                  <tr>
--- 665,681 ----
                                                                  </tr>
                                                                  <tr>                                                                                                      
!                                                                     <td valign="top" align="center" class="sixtyPercent"> DM</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> HTN</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> Hyperlipidemia</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> MI</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> Angina</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> Acute coronary syndrome</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> Revascularization</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> Stroke/TIA</td>
!                                                                     <td valign="top" align="center" class="sixtyPercent"> PVD</td>                                                    
                                                                  </tr>
                                                              </table>
                                                          </td>
!                                                         <td valign="top" width="25%" align="right">
                                                              <table>
                                                                  <tr>
***************
*** 672,680 ****
                                                  </table>                                                
                                              </td>
!                                         </tr>                                                                                                                   
                                          <tr>
                                              <th class="soap" width="2%">S</th>
                                              <th>
!                                                 <html:textarea property="value(subjective)" cols="78" style="height:40"></html:textarea>
                                              </th>
                                          </tr>
--- 691,715 ----
                                                  </table>                                                
                                              </td>
!                                         </tr>            
!                                         <tr>                                            
!                                             <th colspan='2'>
!                                                 <table width="100%" id="showDetailTitle" >
!                                                     <tr><th><a href="javascript: showHideDetail();">Show Details >></a></th></tr>
!                                                 </table>
!                                                 <table style="display:none" width="100%" id="hideDetailTitle">
!                                                     <tr><th><a href="javascript: showHideDetail();">Hide Details << </a></th></tr>
!                                                 </table>
!                                             </th>
!                                         </tr>
                                          <tr>
                                              <th class="soap" width="2%">S</th>
                                              <th>
!                                                 <table id="subjective" style="display:none">
!                                                     <tr>
!                                                         <th>
!                                                         <html:textarea property="value(subjective)" cols="78" style="height:40"></html:textarea>
!                                                         </th>
!                                                     </tr> 
!                                                 </table>
                                              </th>
                                          </tr>
***************
*** 684,693 ****
                                              <a href="javascript: showHideItem('history');" >History >> </a>
                                              </th>
!                                         </tr>                                        
                                           <tr>
                                              <td></td>
!                                             <td ><table style="display:none" cellpadding='1' cellspacing='0' id="history">
                                              <tr><td>
!                                             <table cellpadding='1' cellspacing='0'width="100%">   
                                                  <tr>
                                                      <td class="subTitle" style="text-align:left">
--- 719,728 ----
                                              <a href="javascript: showHideItem('history');" >History >> </a>
                                              </th>
!                                         </tr>                                         
                                           <tr>
                                              <td></td>
!                                             <td ><table style="display:none" cellpadding='1' cellspacing='0' id="history">                                            
                                              <tr><td>
!                                             <table style="display:none" id="detailHistory" cellpadding='1' cellspacing='0'width="100%">                                                   
                                                  <tr>
                                                      <td class="subTitle" style="text-align:left">
***************
*** 975,979 ****
                                          <tr>
                                              <th class="soap" width="2%">O</th>
!                                             <th><html:textarea property="value(objective)" cols="78" style="height:40"></html:textarea></th>
                                          </tr>
                                          <tr>
--- 1010,1020 ----
                                          <tr>
                                              <th class="soap" width="2%">O</th>
!                                             <th>
!                                                 <table id="objective" style="display:none">
!                                                     <tr>
!                                                         <th><html:textarea property="value(objective)" cols="78" style="height:40"></html:textarea></th>
!                                                     </tr>
!                                                 </table>
!                                             </th>
                                          </tr>
                                          <tr>
***************
*** 982,989 ****
                                              <a href="javascript: showHideItem('vital');">Vitals >> </a>
                                              </th>
!                                         </tr>
                                           <tr>
                                              <td></td>                                            
!                                             <td><table style="display:none" cellpadding='1' cellspacing='0' id="vital">
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
--- 1023,1030 ----
                                              <a href="javascript: showHideItem('vital');">Vitals >> </a>
                                              </th>
!                                         </tr>                                        
                                           <tr>
                                              <td></td>                                            
!                                             <td><table style="display:none" cellpadding='0' cellspacing='0' id="vital">                                                
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
***************
*** 1046,1079 ****
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("HCDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HCMeasuringInstrc")%></font></td>
!                                                     <td class="dataEntryTable" align="center">
                                                          <logic:present name="HCLastData">
                                                          <table cellpadding='0' cellspacing='0'>                                                            
                                                              <tr><td class="eightyPercent" align="left"><%=request.getAttribute("HCLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("HCLastData")%></td></tr>
!                                                             
                                                          </table>
                                                          </logic:present>
                                                          
                                                      </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>
!                                                  </tr>                                                 
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("WTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WTMeasuringInstrc")%></font></td>
                                                      <td class="dataEntryTable" align="center">
-                                                         <logic:present name="WTLastData">
                                                          <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WTLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WTLastData")%></td></tr>                                                            
                                                          </table>
-                                                         </logic:present>                                                        
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WTValue)" size="5%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WTDate)" size="10%" tabindex="9999"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WTComments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>
                                                   <tr>                                                    
                                                      <td class="dataEntryTable"><%=request.getAttribute("HTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HTMeasuringInstrc")%></font></td>   
--- 1087,1119 ----
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
+                                                  <tr><td colspan="5"><table cellpadding="0" cellspacing="0" width="100%" style="display:none" id="detailVital">
                                                   <tr>
!                                                     <td width="34%" class="dataEntryTable"><%=request.getAttribute("HCDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HCMeasuringInstrc")%></font></td>
!                                                     <td width="16%" class="dataEntryTable" align="center">
                                                          <logic:present name="HCLastData">
                                                          <table cellpadding='0' cellspacing='0'>                                                            
                                                              <tr><td class="eightyPercent" align="left"><%=request.getAttribute("HCLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("HCLastData")%></td></tr>                                                            
                                                          </table>
                                                          </logic:present>
                                                          
                                                      </td>
!                                                     <td width="7%" class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"  onchange="javascript: updateWaistAndRatio();"/></td>
!                                                     <td width="10%" class="dataEntryTable" align="center"><html:text property="value(HCDate)" size="10%" tabindex="9999"/></td>
!                                                     <td width="33%" class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("HRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HRMeasuringInstrc")%></font></td>
                                                      <td class="dataEntryTable" align="center">
                                                          <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("HRLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("HRLastData")%></td></tr>
!                                                             
                                                          </table>
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HRValue)" size="5%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HRDate)" size="10%" tabindex="9999"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HRComments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>                                                 
                                                   <tr>                                                    
                                                      <td class="dataEntryTable"><%=request.getAttribute("HTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HTMeasuringInstrc")%></font></td>   
***************
*** 1089,1105 ****
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HTComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("HRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HRMeasuringInstrc")%></font></td>
                                                      <td class="dataEntryTable" align="center">
                                                          <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("HRLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("HRLastData")%></td></tr>
!                                                             
                                                          </table>
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HRValue)" size="5%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HRDate)" size="10%" tabindex="9999"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HRComments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>
                                              </table></td>
                                          </tr> 
--- 1129,1147 ----
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HTComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
+                                                  </table></td></tr>                                                 
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("WTDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WTMeasuringInstrc")%></font></td>
                                                      <td class="dataEntryTable" align="center">
+                                                         <logic:present name="WTLastData">
                                                          <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WTLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WTLastData")%></td></tr>                                                            
                                                          </table>
+                                                         </logic:present>                                                        
                                                      </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WTValue)" size="5%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WTDate)" size="10%" tabindex="9999"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WTComments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>                                                 
                                              </table></td>
                                          </tr> 
***************
*** 1112,1116 ****
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='1' cellspacing='0' id="examination">
                                                  <tr>
                                                      <td class="subTitle" width="28%">                                                        
--- 1154,1158 ----
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='0' cellspacing='0' id="examination">
                                                  <tr>
                                                      <td class="subTitle" width="28%">                                                        
***************
*** 1133,1137 ****
                                                      <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<%=request.getAttribute("FTNeDate")%>" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" rowspan="8" valign="top" align="center">
!                                                         <textarea name="FTComments" wrap="hard" cols="24" style="height:180" tabindex="9999"><logic:present name="FTExComments"><%=request.getAttribute("FTExComments")%></logic:present></textarea>
                                                      </td>
                                                  </tr>
--- 1175,1179 ----
                                                      <td class="dataEntryTable" valign="top" align="center"><input type="text" id="FTDate" name="FTDate" value="<%=request.getAttribute("FTNeDate")%>" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" rowspan="8" valign="top" align="center">
!                                                         <textarea name="FTComments" wrap="hard" cols="24" style="height:80" tabindex="9999"><logic:present name="FTExComments"><%=request.getAttribute("FTExComments")%></logic:present></textarea>
                                                      </td>
                                                  </tr>
***************
*** 1223,1241 ****
                                                   </tr>
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("FTOtDesc")%></td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("FTOtLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("FTOtLastData")%></td></tr>
!                                                             
                                                          </table>
                                                      </td>
-                                                     <td class="dataEntryTable" align="center">
-                                                         <html:radio property="value(FTOtValue)" value="yes" />Yes
-                                                         <html:radio property="value(FTOtValue)" value="no" />No
-                                                         <a title="clear all" href="javascript:clearAll(ftOtId, ftOtId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
-                                                     </td>
-                                                     <html:hidden property="value(FTOtDate)" />
-                                                     <html:hidden property="value(FTOtComments)" />
                                                   </tr>
                                                   <tr>
--- 1265,1288 ----
                                                   </tr>
                                                   <tr>
!                                                     <td colspan='3'>
!                                                         <table cellpadding="0" cellspacing="0" width="100%" style="display:none" id="detailFT">
!                                                          <tr>
!                                                             <td width="29%" class="dataEntryTable"><%=request.getAttribute("FTOtDesc")%></td>
!                                                             <td width="16%" class="dataEntryTable" align="center">
!                                                                 <table cellpadding='0' cellspacing='0'>                                                            
!                                                                     <tr><td class="eightyPercent" align="left"><%=request.getAttribute("FTOtLDDate")%></td></tr>
!                                                                     <tr><td class="eightyPercent" align="right"><%=request.getAttribute("FTOtLastData")%></td></tr>
!                                                                 </table>
!                                                             </td>
!                                                             <td width="22%" class="dataEntryTable" align="center">
!                                                                 <html:radio property="value(FTOtValue)" value="yes" />Yes
!                                                                 <html:radio property="value(FTOtValue)" value="no" />No
!                                                                 <a title="clear all" href="javascript:clearAll(ftOtId, ftOtId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                             </td>
!                                                             <html:hidden property="value(FTOtDate)" />
!                                                             <html:hidden property="value(FTOtComments)" />
!                                                          </tr>
                                                          </table>
                                                      </td>
                                                   </tr>
                                                   <tr>
***************
*** 1260,1264 ****
                                                      <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<%=request.getAttribute("iDiaDate")%>" size="10%"/></td>
                                                      <td class="dataEntryTable" rowspan="8" valign="top" align="center">
!                                                         <textarea name="iComments" wrap="hard" cols="24" style="height:180"><logic:present name="iExComments"><%=request.getAttribute("iExComments")%></logic:present></textarea>
                                                      </td>
                                                  </tr>
--- 1307,1311 ----
                                                      <td class="dataEntryTable" valign="top" align="center"><input type="text" name="iDate" value="<%=request.getAttribute("iDiaDate")%>" size="10%"/></td>
                                                      <td class="dataEntryTable" rowspan="8" valign="top" align="center">
!                                                         <textarea name="iComments" wrap="hard" cols="24" style="height:80"><logic:present name="iExComments"><%=request.getAttribute("iExComments")%></logic:present></textarea>
                                                      </td>
                                                  </tr>
***************
*** 1282,1335 ****
                                                   </tr>
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("iHypDesc")%></td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iHypLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iHypLastData")%></td></tr>
!                                                             
!                                                         </table>
!                                                     </td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <html:radio property="value(iHypValue)" value="yes" />Yes
!                                                         <html:radio property="value(iHypValue)" value="no" />No
!                                                         <a title="clear all" href="javascript:clearAll(eyeHypId, eyeHypId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                     </td>
!                                                     <html:hidden property="value(iHypDate)" />
!                                                     <html:hidden property="value(iHypComments)" />
!                                                  </tr>
!                                                  <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iDiaLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iDiaLastData")%></td></tr>
!                                                             
!                                                         </table>
!                                                     </td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <html:radio property="value(iDiaValue)" value="yes" />Yes
!                                                         <html:radio property="value(iDiaValue)" value="no" />No
!                                                         <a title="clear all" href="javascript:clearAll(eyeDiaId, eyeDiaId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                     </td>
!                                                     <html:hidden property="value(iDiaDate)"/>
!                                                     <html:hidden property="value(iDiaComments)"/>
!                                                  </tr>
!                                                  <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("iOthDesc")%></td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iOthLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iOthLastData")%></td></tr>
!                                                             
                                                          </table>
                                                      </td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <html:radio property="value(iOthValue)" value="yes" />Yes
!                                                         <html:radio property="value(iOthValue)" value="no" />No
!                                                         <a title="clear all" href="javascript:clearAll(eyeOthId, eyeOthId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                     </td>
!                                                     <html:hidden property="value(iOthDate)"/>
!                                                     <html:hidden property="value(iOthComments)"/>
!                                                  </tr>
                                                   <tr>
                                                      <td class="dataEntryTable"><bean:write name="iRefDesc"/></td>
--- 1329,1388 ----
                                                   </tr>
                                                   <tr>
!                                                     <td colspan='3'>
!                                                         <table cellpadding="0" cellspacing="0" width="100%" style="display:none" id="detailEye">                                                                                                                 
!                                                              <tr>
!                                                                 <td width="29%" class="dataEntryTable"><%=request.getAttribute("iHypDesc")%></td>
!                                                                 <td width="16%" class="dataEntryTable" align="center">
!                                                                     <table cellpadding='0' cellspacing='0'>                                                            
!                                                                         <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iHypLDDate")%></td></tr>
!                                                                         <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iHypLastData")%></td></tr>
! 
!                                                                     </table>
!                                                                 </td>
!                                                                 <td width="22%" class="dataEntryTable" align="center">
!                                                                     <html:radio property="value(iHypValue)" value="yes" />Yes
!                                                                     <html:radio property="value(iHypValue)" value="no" />No
!                                                                     <a title="clear all" href="javascript:clearAll(eyeHypId, eyeHypId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                                 </td>
!                                                                 <html:hidden property="value(iHypDate)" />
!                                                                 <html:hidden property="value(iHypComments)" />
!                                                              </tr>
!                                                              <tr>
!                                                                 <td class="dataEntryTable"><%=request.getAttribute("iDiaDesc")%></td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <table cellpadding='0' cellspacing='0'>                                                            
!                                                                         <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iDiaLDDate")%></td></tr>
!                                                                         <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iDiaLastData")%></td></tr>
! 
!                                                                     </table>
!                                                                 </td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <html:radio property="value(iDiaValue)" value="yes" />Yes
!                                                                     <html:radio property="value(iDiaValue)" value="no" />No
!                                                                     <a title="clear all" href="javascript:clearAll(eyeDiaId, eyeDiaId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                                 </td>
!                                                                 <html:hidden property="value(iDiaDate)"/>
!                                                                 <html:hidden property="value(iDiaComments)"/>
!                                                              </tr>
!                                                              <tr>
!                                                                 <td class="dataEntryTable"><%=request.getAttribute("iOthDesc")%></td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <table cellpadding='0' cellspacing='0'>                                                            
!                                                                         <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iOthLDDate")%></td></tr>
!                                                                         <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iOthLastData")%></td></tr>
! 
!                                                                     </table>
!                                                                 </td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <html:radio property="value(iOthValue)" value="yes" />Yes
!                                                                     <html:radio property="value(iOthValue)" value="no" />No
!                                                                     <a title="clear all" href="javascript:clearAll(eyeOthId, eyeOthId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
!                                                                 </td>
!                                                                 <html:hidden property="value(iOthDate)"/>
!                                                                 <html:hidden property="value(iOthComments)"/>
!                                                              </tr>
                                                          </table>
                                                      </td>
!                                                 </tr>
                                                   <tr>
                                                      <td class="dataEntryTable"><bean:write name="iRefDesc"/></td>
***************
*** 1359,1363 ****
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='1' cellspacing='0' id="labs">
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
--- 1412,1416 ----
                                           <tr>
                                              <td></td>
!                                             <td><table style="display:none" cellpadding='0' cellspacing='0' id="labs">
                                                  <tr>
                                                      <td class="subTitle" width="34%">                                                        
***************
*** 1388,1405 ****
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HbA1Date)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HbA1Comments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>
!                                                  <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("BGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("BGMeasuringInstrc")%></font></td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("BGLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("BGLastData")%></td></tr>
!                                                            
!                                                         </table>
!                                                     </td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(BGValue)" size="4%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(BGDate)" size="10%" tabindex="9999"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(BGComments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>
                                                   <tr>
                                                      <td class="dataEntryTable"><%=request.getAttribute("LDLDesc")%><br><font class="eightyPercent"><%=request.getAttribute("LDLMeasuringInstrc")%></font></td>
--- 1441,1445 ----
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HbA1Date)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HbA1Comments)" size="30%" tabindex="9999"/></td>
!                                                  </tr>                                                 
                                                   <tr>
                                                      <td class="dataEntryTable"><%=request.getAttribute("LDLDesc")%><br><font class="eightyPercent"><%=request.getAttribute("LDLMeasuringInstrc")%></font></td>
***************
*** 1442,1456 ****
                                                   </tr>
                                                   <tr>
!                                                     <td class="dataEntryTable"><%=request.getAttribute("TRIGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("TRIGMeasuringInstrc")%></font></td>
!                                                     <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
!                                                             <tr><td class="eightyPercent" align="left"><%=request.getAttribute("TRIGLDDate")%></td></tr>
!                                                             <tr><td class="eightyPercent" align="right"><%=request.getAttribute("TRIGLastData")%></td></tr>
!                                                             
                                                          </table>
                                                      </td>
-                                                     <td class="dataEntryTable" align="center"><html:text property="value(TRIGValue)" size="4%" /></td>
-                                                     <td class="dataEntryTable" align="center"><html:text property="value(TRIGDate)" size="10%" tabindex="9999"/></td>
-                                                     <td class="dataEntryTable" align="center"><html:text property="value(TRIGComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
                                                   <tr>
--- 1482,1515 ----
                                                   </tr>
                                                   <tr>
!                                                     <td colspan='5'>
!                                                         <table cellpadding="0" cellspacing="0" width="100%" style="display:none" id="detailLab">
!                                                              <tr>
!                                                                 <td width="34%" class="dataEntryTable"><%=request.getAttribute("TRIGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("TRIGMeasuringInstrc")%></font></td>
!                                                                 <td width="16%" class="dataEntryTable" align="center">
!                                                                     <table cellpadding='0' cellspacing='0'>                                                            
!                                                                         <tr><td class="eightyPercent" align="left"><%=request.getAttribute("TRIGLDDate")%></td></tr>
!                                                                         <tr><td class="eightyPercent" align="right"><%=request.getAttribute("TRIGLastData")%></td></tr>
! 
!                                                                     </table>
!                                                                 </td>
!                                                                 <td width="5%" class="dataEntryTable" align="center"><html:text property="value(TRIGValue)" size="4%" /></td>
!                                                                 <td width="10%" class="dataEntryTable" align="center"><html:text property="value(TRIGDate)" size="10%" tabindex="9999"/></td>
!                                                                 <td width="35%" class="dataEntryTable" align="center"><html:text property="value(TRIGComments)" size="30%" tabindex="9999"/></td>
!                                                              </tr>
!                                                              <tr>
!                                                                 <td class="dataEntryTable"><%=request.getAttribute("BGDesc")%><br><font class="eightyPercent"><%=request.getAttribute("BGMeasuringInstrc")%></font></td>
!                                                                 <td class="dataEntryTable" align="center">
!                                                                     <table cellpadding='0' cellspacing='0'>                                                            
!                                                                         <tr><td class="eightyPercent" align="left"><%=request.getAttribute("BGLDDate")%></td></tr>
!                                                                         <tr><td class="eightyPercent" align="right"><%=request.getAttribute("BGLastData")%></td></tr>
! 
!                                                                     </table>
!                                                                 </td>
!                                                                 <td class="dataEntryTable" align="center"><html:text property="value(BGValue)" size="4%" /></td>
!                                                                 <td class="dataEntryTable" align="center"><html:text property="value(BGDate)" size="10%" tabindex="9999"/></td>
!                                                                 <td class="dataEntryTable" align="center"><html:text property="value(BGComments)" size="30%" tabindex="9999"/></td>
!                                                              </tr>
                                                          </table>
                                                      </td>
                                                   </tr>
                                                   <tr>
***************
*** 1490,1513 ****
                                          <tr>
                                              <th></th>
!                                             <th class="title">
!                                             <a href="javascript: showHideItem('diagnosis');">Diagnosis >> </a>
!                                             </th>
!                                         </tr>
!                                         <tr>
!                                             <td></td>
!                                             <td>
!                                                 <table style="display:none" cellpadding='1' cellspacing='0' id="diagnosis">
!                                                 <tr>
!                                                     <td>
!                                                         <html:textarea property="value(diagnosisVT)" cols="78" style="height:40"></html:textarea>
!                                                     </td>
!                                                 </tr>
                                                  </table>
!                                             </td>
                                          </tr>
                                          <tr>
                                              <th class="soap" width="2%">P</th>
                                              <th>
!                                                 <html:textarea property="value(plan)" cols="78" style="height:40"></html:textarea>
                                              </th>
                                          </tr>
--- 1549,1581 ----
                                          <tr>
                                              <th></th>
!                                             <th width="98%">
!                                          ...
 
[truncated message content]

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil BillingDocumentErrorReportUploadAction.java,1.6,1.7

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

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

Modified Files:
	BillingDocumentErrorReportUploadAction.java 
Log Message:
fixed the writing to alert msg problem



Index: BillingDocumentErrorReportUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil/BillingDocumentErrorReportUploadAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** BillingDocumentErrorReportUploadAction.java	18 Feb 2005 03:28:06 -0000	1.6
--- BillingDocumentErrorReportUploadAction.java	22 Feb 2005 19:48:21 -0000	1.7
***************
*** 315,319 ****
                          System.out.println("Select Demo sql: " + sqlAlert);
                          ResultSet rsAlert = db.GetSQL(sqlAlert);
!                         if(rsAlert.next() && rs.next()){
                              String newAlert = rsAlert.getString("cust3") + "\n" + "Invalid old version code: " + bean.getVersion() + "\nReason: " + rs.getString("MOHResponse") + "- " + rs.getString("reason");
                              String newAlertSql = "UPDATE demographiccust SET cust3 = '" + newAlert + "' where demographic_no='" + rsDemo.getString("demographic_no") + "'";
--- 315,319 ----
                          System.out.println("Select Demo sql: " + sqlAlert);
                          ResultSet rsAlert = db.GetSQL(sqlAlert);
!                         if(rsAlert.next()){
                              String newAlert = rsAlert.getString("cust3") + "\n" + "Invalid old version code: " + bean.getVersion() + "\nReason: " + rs.getString("MOHResponse") + "- " + rs.getString("reason");
                              String newAlertSql = "UPDATE demographiccust SET cust3 = '" + newAlert + "' where demographic_no='" + rsDemo.getString("demographic_no") + "'";

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON billingCorrectionValid.jsp,1.3,1.4

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

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

Modified Files:
	billingCorrectionValid.jsp 
Log Message:
updated to allow P022A and P023A to apply premium (percentage) code



Index: billingCorrectionValid.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingCorrectionValid.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** billingCorrectionValid.jsp	18 Feb 2005 04:42:13 -0000	1.3
--- billingCorrectionValid.jsp	21 Feb 2005 19:11:06 -0000	1.4
***************
*** 151,154 ****
--- 151,155 ----
                              scode.compareTo("P038A")==0 || scode.compareTo("P020A")==0 || 
                              scode.compareTo("P031A")==0 || scode.compareTo("Z552A")==0 || 
+                             scode.compareTo("P022A")==0 || scode.compareTo("P023A")==0 || 
                              scode.compareTo("Z716A")==0 || scode.startsWith("S") || 
                              (scode.endsWith("B") && !scode.endsWith("C988B") && !scode.endsWith("C998B") && !scode.endsWith("C999B") ) ){

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

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

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

Modified Files:
	billingReview.jsp 
Log Message:
updated to allow P022A and P023A to apply premium (percentage) code



Index: billingReview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingReview.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** billingReview.jsp	2 Feb 2005 22:52:11 -0000	1.15
--- billingReview.jsp	21 Feb 2005 19:00:35 -0000	1.16
***************
*** 364,367 ****
--- 364,368 ----
                              otherdbcode1.compareTo("P038A")==0 || otherdbcode1.compareTo("P020A")==0 || 
                              otherdbcode1.compareTo("P031A")==0 || otherdbcode1.compareTo("Z552A")==0 || 
+                             otherdbcode1.compareTo("P022A")==0 || otherdbcode1.compareTo("P023A")==0 || 
                              otherdbcode1.compareTo("Z716A")==0 || otherdbcode1.startsWith("S") || 
                              (otherdbcode1.endsWith("B") && !otherdbcode1.endsWith("C988B") && !otherdbcode1.endsWith("C998B") && !otherdbcode1.endsWith("C999B") ) ){
***************
*** 444,447 ****
--- 445,449 ----
                              otherdbcode2.compareTo("P038A")==0 || otherdbcode2.compareTo("P020A")==0 || 
                              otherdbcode2.compareTo("P031A")==0 || otherdbcode2.compareTo("Z552A")==0 || 
+                             otherdbcode2.compareTo("P022A")==0 || otherdbcode2.compareTo("P023A")==0 || 
                              otherdbcode2.compareTo("Z716A")==0 || otherdbcode2.startsWith("S") || 
                              (otherdbcode2.endsWith("B") && !otherdbcode2.endsWith("C988B") && !otherdbcode2.endsWith("C998B") && !otherdbcode2.endsWith("C999B") ) ){
***************
*** 523,526 ****
--- 525,529 ----
                              otherdbcode3.compareTo("P038A")==0 || otherdbcode3.compareTo("P020A")==0 || 
                              otherdbcode3.compareTo("P031A")==0 || otherdbcode3.compareTo("Z552A")==0 || 
+                             otherdbcode3.compareTo("P022A")==0 || otherdbcode3.compareTo("P023A")==0 || 
                              otherdbcode3.compareTo("Z716A")==0 || otherdbcode3.startsWith("S") || 
                              (otherdbcode3.endsWith("B") && !otherdbcode3.endsWith("C988B") && !otherdbcode3.endsWith("C998B") && !otherdbcode3.endsWith("C999B") ) ){
***************
*** 617,620 ****
--- 620,624 ----
                              scode.compareTo("P038A")==0 || scode.compareTo("P020A")==0 || 
                              scode.compareTo("P031A")==0 || scode.compareTo("Z552A")==0 || 
+                             scode.compareTo("P022A")==0 || scode.compareTo("P023A")==0 || 
                              scode.compareTo("Z716A")==0 || scode.startsWith("S") || 
                              (scode.endsWith("B") && !scode.endsWith("C988B") && !scode.endsWith("C998B") && !scode.endsWith("C999B") ) ){

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarReport oscarReportRehabStudy.jsp,1.1,1.2

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

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

Modified Files:
	oscarReportRehabStudy.jsp 
Log Message:
added start and end date for the reports



Index: oscarReportRehabStudy.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarReport/oscarReportRehabStudy.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oscarReportRehabStudy.jsp	25 Jan 2005 22:21:07 -0000	1.1
--- oscarReportRehabStudy.jsp	21 Feb 2005 17:57:00 -0000	1.2
***************
*** 27,32 ****
    if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp");
  %>
  <%@ page language="java" %>
! <%@ page import="java.util.*,oscar.oscarReport.data.*" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
--- 27,37 ----
    if(session.getValue("user") == null) response.sendRedirect("../../logout.jsp");
  %>
+ <%
+ GregorianCalendar now = new GregorianCalendar();
+ GregorianCalendar cal = (GregorianCalendar) now.clone();
+ String today = now.get(Calendar.YEAR)+"-"+(now.get(Calendar.MONTH)+1)+"-"+now.get(Calendar.DATE) ;
+ %>
  <%@ page language="java" %>
! <%@ page import="java.util.*,oscar.oscarReport.data.*, java.net.*" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
***************
*** 61,65 ****
  <head>
  <title>
!     <bean:message key="oscarReport.RptByExample.MsgQueryByExamples"/>
  </title>
  
--- 66,70 ----
  <head>
  <title>
!     Rehab Study Reports
  </title>
  
***************
*** 115,118 ****
--- 120,133 ----
          document.forms[0].submit();
      }
+    function popupPage(vheight,vwidth,varpage) { //open a new popup window
+   var page = "" + varpage;
+   windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,top=10,left=15";//360,680
+   var popup=window.open(page, "scheduleholiday", windowprops);
+   if (popup != null) {
+     if (popup.opener == null) {
+       popup.opener = self; 
+     }
+   }
+ }
  </script>
  
***************
*** 140,148 ****
                  <table class="TopStatusBar" >                 
                      <tr>
!                         <td>
                              <logic:present name="formName">
                                  <bean:write name="formName"/>
                              </logic:present>
!                         </td>                                               
                      </tr>                  
                  </table>
--- 155,171 ----
                  <table class="TopStatusBar" >                 
                      <tr>
!                         <td width="25%">
                              <logic:present name="formName">
                                  <bean:write name="formName"/>
                              </logic:present>
!                         </td> 
!                         <td>
!                             <a HREF="#" onClick ="popupPage(310,430,'../share/CalendarPopup.jsp?urlfrom=../oscarReport/oscarReportRehabStudy.jsp&year=<%=now.get(Calendar.YEAR)%>&month=<%=now.get(Calendar.MONTH)+1%>&param=<%=URLEncoder.encode("&formdatebox=document.forms[0].startDate.value")%>')">
!                             <bean:message key="report.reportindex.formFrom"/></a>
!                             <INPUT TYPE="text" NAME="startDate" VALUE="" size='10'>
!                             <a HREF="#" onClick ="popupPage(310,430,'../share/CalendarPopup.jsp?urlfrom=../oscarReport/oscarReportRehabStudy.jsp&year=<%=now.get(Calendar.YEAR)%>&month=<%=now.get(Calendar.MONTH)+1%>&param=<%=URLEncoder.encode("&formdatebox=document.forms[0].endDate.value")%>')">
!                             <bean:message key="report.reportindex.formTo"/></a>
!                             <INPUT TYPE="text" NAME="endDate" size='10'>
!                         </td>
                      </tr>                  
                  </table>
***************
*** 198,201 ****
--- 221,230 ----
                      <td nowrap><a href="#" onClick="generateResult('formSelfManagement');">Self Management</a></td>
                    </tr>
+                   <tr>
+                     <td nowrap><a href="#" onClick="generateResult('formTreamentPref');">Treatment Preference</a></td>
+                   </tr>
+                   <tr>
+                     <td nowrap><a href="#" onClick="generateResult('formInternetAccess');">Internet Access</a></td>
+                   </tr>
                    
                  </table>