oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet FrmPDFServlet.java,1.6,1.7

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

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

Modified Files:
	FrmPDFServlet.java 
Log Message:
add rx print to paper A6

Index: FrmPDFServlet.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet/FrmPDFServlet.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** FrmPDFServlet.java	1 Nov 2004 01:57:57 -0000	1.6
--- FrmPDFServlet.java	22 Mar 2005 23:57:13 -0000	1.7
***************
*** 1,28 ****
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
!  * along with this program; if not, write to the Free Software 
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
!  * 
   * <OSCAR TEAM>
!  * 
!  * This software was written for the 
!  * Department of Family Medicine 
!  * McMaster Unviersity 
!  * Hamilton 
!  * Ontario, Canada 
   */
  /*
!  * 
!  *  
   */
  // javac -classpath .;..\lib\itext-1.01.jar -d . FrmPDFServlet.java
--- 1,28 ----
  /*
!  *
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License.
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version. *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
!  *
   * <OSCAR TEAM>
!  *
!  * This software was written for the
!  * Department of Family Medicine
!  * McMaster Unviersity
!  * Hamilton
!  * Ontario, Canada
   */
  /*
!  *
!  *
   */
  // javac -classpath .;..\lib\itext-1.01.jar -d . FrmPDFServlet.java
***************
*** 60,71 ****
  
  /**
!  * 
!  *  
   */
  public class FrmPDFServlet extends HttpServlet {
  
      /**
!      * 
!      *  
       */
      public FrmPDFServlet() {
--- 60,71 ----
  
  /**
!  *
!  *
   */
  public class FrmPDFServlet extends HttpServlet {
  
      /**
!      *
!      *
       */
      public FrmPDFServlet() {
***************
*** 143,150 ****
  
      /**
!      *  
       */
      protected ByteArrayOutputStream generatePDFDocumentBytes(final HttpServletRequest req,
              final ServletContext ctx) throws DocumentException, java.io.IOException {
          Document document = new Document();
          //document = new Document(psize, 50, 50, 50, 50);
--- 143,151 ----
  
      /**
!      *
       */
      protected ByteArrayOutputStream generatePDFDocumentBytes(final HttpServletRequest req,
              final ServletContext ctx) throws DocumentException, java.io.IOException {
+         final String PAGESIZE = "printPageSize";
          Document document = new Document();
          //document = new Document(psize, 50, 50, 50, 50);
***************
*** 202,206 ****
              document.addHeader("Expires", "0");
  
!             document.setPageSize(PageSize.LETTER);
              document.open();
  
--- 203,212 ----
              document.addHeader("Expires", "0");
  
!             // A0-A10, LEGAL, LETTER, HALFLETTER, _11x17, LEDGER, NOTE, B0-B5, ARCH_A-ARCH_E, FLSA and FLSE
!             // the following shows a temp way to get a print page size
!             Rectangle pageSize = PageSize.LETTER;
!             if("PageSize.HALFLETTER".equals(props.getProperty(PAGESIZE))) pageSize = PageSize.HALFLETTER;
!             if("PageSize.A6".equals(props.getProperty(PAGESIZE))) pageSize = PageSize.A6;
!             document.setPageSize(pageSize);
              document.open();
  
***************
*** 285,289 ****
                                                  .trim())), 0);
                          cb.endText();
!                     } else { // write prop text 
                          cb.beginText();
                          cb.setFontAndSize(bf, Integer.parseInt(cfgVal[5].trim()));
--- 291,295 ----
                                                  .trim())), 0);
                          cb.endText();
!                     } else { // write prop text
                          cb.beginText();
                          cb.setFontAndSize(bf, Integer.parseInt(cfgVal[5].trim()));

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop oscarRxPrintCfgPg1.txt,NONE,1.1

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

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

Added Files:
	oscarRxPrintCfgPg1.txt 
Log Message:
add rx print to paper A6

--- NEW FILE: oscarRxPrintCfgPg1.txt ---
__R	 : left, 20, 43, 0, BaseFont.HELVETICA, 50 , R
__x	 : left, 40, 56, 0, BaseFont.HELVETICA, 50 , x
doctorName			 : left, 100, 18, 0, BaseFont.HELVETICA, 10
clinicName			 : left, 100, 30, 0, BaseFont.HELVETICA, 10
clinicAddress			 : left, 100, 42, 0, BaseFont.HELVETICA, 10
clinicCityPostal			 : left, 100, 54, 0, BaseFont.HELVETICA, 10
__tel	 : left, 100, 66, 0, BaseFont.HELVETICA, 10 , Tel:
clinicPhone			 : left, 130, 66, 0, BaseFont.HELVETICA, 10
__fax	 : left, 100, 78, 0, BaseFont.HELVETICA, 10 , Fax:
clinicFax			 : left, 130, 78, 0, BaseFont.HELVETICA, 10
__$line1		: 17, 323, 280, 323, 0.8
patientName	 		: left, 20, 103, 0, BaseFont.HELVETICA, 10
rxDate				: left, 200, 103, 0, BaseFont.HELVETICA, 10
patientAddress		: left, 20, 115, 0, BaseFont.HELVETICA, 10
patientCityPostal	: left, 20, 127, 0, BaseFont.HELVETICA, 10
patientPhone		: left, 20, 139, 0, BaseFont.HELVETICA, 10
__$line2		: 17, 260, 280, 260, 0.8
rx		: left, 20, 160, 0, BaseFont.TIMES_ROMAN, 10, _, 250, 350, 12
__signature	 : left, 20, 360, 0, BaseFont.HELVETICA, 10 , Signature:
__$line3		: 75, 50, 280, 50, 0.5
sigDoctorName		: left, 90, 378, 0, BaseFont.HELVETICA, 10

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

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

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

Modified Files:
	BillingDocumentErrorReportUploadAction.java 
Log Message:
This File will be removed.  commented out now



Index: BillingDocumentErrorReportUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil/BillingDocumentErrorReportUploadAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** BillingDocumentErrorReportUploadAction.java	22 Feb 2005 19:48:21 -0000	1.7
--- BillingDocumentErrorReportUploadAction.java	22 Mar 2005 14:48:18 -0000	1.8
***************
*** 1,341 ****
! // -----------------------------------------------------------------------------------------------------------------------
! // *
! // *
! // * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
! // * This software is published under the GPL GNU General Public License. 
! // * This program is free software; you can redistribute it and/or 
! // * modify it under the terms of the GNU General Public License 
! // * as published by the Free Software Foundation; either version 2 
! // * of the License, or (at your option) any later version. * 
! // * This program is distributed in the hope that it will be useful, 
! // * but WITHOUT ANY WARRANTY; without even the implied warranty of 
! // * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
! // * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
! // * along with this program; if not, write to the Free Software 
! // * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
! // * 
! // * <OSCAR TEAM>
! // * This software was written for the 
! // * Department of Family Medicine 
! // * McMaster Unviersity 
! // * Hamilton 
! // * Ontario, Canada 
! // *
! // -----------------------------------------------------------------------------------------------------------------------
! package oscar.oscarBilling.pageUtil;
! 
! import java.io.*;
! import java.util.*;
! import java.lang.*;
! import java.net.*;
! import java.sql.ResultSet;
! import java.sql.SQLException;
! import java.util.ArrayList;
! import javax.servlet.ServletException;
! import javax.servlet.ServletRequest;
! import javax.servlet.http.*;
! import org.apache.struts.action.*;
! import org.apache.struts.validator.*;
! import org.apache.commons.validator.*;
! import org.apache.struts.util.MessageResources;
! import org.apache.struts.upload.FormFile;
! import oscar.oscarDB.DBHandler;
! import oscar.oscarMessenger.util.MsgStringQuote;
! import oscar.oscarBilling.bean.*;
! import oscar.OscarProperties;
! 
! 
! public class BillingDocumentErrorReportUploadAction extends Action {
! 
!     public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
!         throws ServletException, IOException
!     {
!         BillingDocumentErrorReportUploadForm frm = (BillingDocumentErrorReportUploadForm) form;                
!         request.getSession().setAttribute("BillingDocumentErrorReportUploadForm", frm);
!         FormFile file1 = frm.getFile1();
!         ArrayList messages = new ArrayList();
!         ActionErrors errors = new ActionErrors();  
!         
!         if(!saveFile(file1)){
!             errors.add(errors.GLOBAL_ERROR,
!             new ActionError("errors.fileNotAdded"));
!             saveErrors(request, errors);
!             return (new ActionForward(mapping.getInput()));
!         }
!         else{
!             if(getData(file1.getFileName(), request))
!                 return mapping.findForward("success");
!             else{
!                 errors.add(errors.GLOBAL_ERROR,
!                 new ActionError("errors.incorrectFileFormat"));
!                 saveErrors(request, errors);
!                 return (new ActionForward(mapping.getInput()));
!             }
!         }
!     }
!      
!     /**
!      * 
!      * Save a Jakarta FormFile to a preconfigured place.
!      * 
!      * @param file
!      * @return
!      */
!     public static boolean saveFile(FormFile file){
!         String retVal = null;        
!         boolean isAdded = true;
!         
!         try {
!             //retrieve the file data
!             ByteArrayOutputStream baos = new
!             ByteArrayOutputStream();
!             InputStream stream = file.getInputStream();
!             OscarProperties props = OscarProperties.getInstance();
! 
!             //properties must exist            
!             String place= props.getProperty("DOCUMENT_DIR");
!             
!             if(!place.endsWith("/"))
!                     place = new StringBuffer(place).insert(place.length(),"/").toString();
!             retVal = place+file.getFileName();
!             System.out.println(retVal);
!             //write the file to the file specified
!             OutputStream bos = new FileOutputStream(retVal);
!             int bytesRead = 0;
!             byte[] buffer = file.getFileData();
!             while ((bytesRead = stream.read(buffer)) != -1){
!                     bos.write(buffer, 0, bytesRead);
!             }
!             bos.close();
! 
!             //close the stream
!             stream.close();
!         }
!         catch (FileNotFoundException fnfe) {
!             
!             System.out.println("File not found");
!             fnfe.printStackTrace();            
!             return isAdded=false;
!             
!         }
!         catch (IOException ioe) {
!             ioe.printStackTrace();
!             return isAdded=false;
!         }
! 
!         return isAdded;
!     }
!     
!     /**
!     * 
!     * Write to database
!     * 
!     * @param fileName - the filename to store
!     *     
!     */
!     private void write2Database(String fileName){
!          try {
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             String sql = "INSERT INTO measurementCSSLocation(location) VALUES('" + fileName + "')";
!             System.out.println("Sql Statement: " + sql);
!             db.RunSQL(sql);            
!             db.CloseConn();
!         }
!         catch(SQLException e) {
!             System.out.println(e.getMessage());            
!         }       
!     }
!     
!       /**
!      * 
!      * Get Data from the file.
!      * 
!      * @param file
!      * @return
!      */
!     private boolean getData(String fileName, HttpServletRequest request){
!         boolean isGot = false;
!         
!         try{
!             OscarProperties props = OscarProperties.getInstance();        
!             //properties must exist            
!             String filepath= props.getProperty("DOCUMENT_DIR");
!             if(!filepath.endsWith("/"))
!                         filepath = new StringBuffer(filepath).insert(filepath.length(),"/").toString();
!             FileInputStream file = new FileInputStream(filepath + fileName);
!             System.out.println("file path: " + filepath+fileName);
!             //Assign associated report Name
!             ArrayList messages = new ArrayList();
!             String ReportName=""; 
!             String ReportFlag="";
! 
!             if (fileName.substring(0,1).compareTo("E")==0){ 
!                 ReportName="Claims Error Report"; 
!                 BillingClaimsErrorReportBeanHandler hd = generateReportE(file);
!                 request.setAttribute("claimsErrors", hd);
!                 isGot = hd.verdict;
!             }
!             if (fileName.substring(0,1).compareTo("B")==0){ 
!                 ReportName="Claim Batch Acknowledgement Report"; 
!                 BillingClaimBatchAcknowledgementReportBeanHandler hd = generateReportB(file);
!                 request.setAttribute("batchAcks", hd);
!                 isGot = hd.verdict;
!             }
!             if (fileName.substring(0,1).compareTo("X")==0){ 
!                 ReportName="Claim File Rejection Report"; 
!                 messages=generateReportX(file);
!                 request.setAttribute("messages", messages);
!                 isGot = reportXIsGenerated;
!             }
!             if (fileName.substring(0,1).compareTo("R")==0){ 
!                 ReportName="EDT OBEC Output Specification"; 
!                 BillingEDTOBECOutputSpecificationBeanHandler hd = generateReportR(file);
!                 request.setAttribute("outputSpecs", hd);
!                 isGot = hd.verdict;
!             }
!             request.setAttribute("ReportName", ReportName);
!         }
!         catch (FileNotFoundException fnfe) {
!             
!             System.out.println("File not found");
!             fnfe.printStackTrace();            
!             return isGot=false;
!             
!         }
!         catch (IOException ioe) {
!             ioe.printStackTrace();
!             return isGot=false;
!         }
!         return isGot;
!     }
!  
!     /**
!      * 
!      * Generate Claims Error Report (E).
!      * 
!      * @param file
!      * @return BillingClaimsErrorReportBeanHandler
!      */
!      private BillingClaimsErrorReportBeanHandler generateReportE(FileInputStream file){
!         BillingClaimsErrorReportBeanHandler hd = new BillingClaimsErrorReportBeanHandler(file);        
!         
!         return hd;     
!      }
!     
!     /**
!      * 
!      * Generate Claim Batch Acknowledgement Report (B).
!      * 
!      * @param file
!      * @return BillingClaimBatchAcknowlegementReportBeanHandler
!      */
!      private BillingClaimBatchAcknowledgementReportBeanHandler generateReportB(FileInputStream file){
!         BillingClaimBatchAcknowledgementReportBeanHandler hd = new BillingClaimBatchAcknowledgementReportBeanHandler(file);        
!         
!         return hd;     
!      }
!      
!     /**
!      * 
!      * Generate Claim File Rejection Report (X).
!      * 
!      * @param file
!      * @return
!      */
!      private boolean reportXIsGenerated = true;
!      private ArrayList generateReportX(FileInputStream file){
!         ArrayList messages = new ArrayList();
!         messages.add("M01 | Message Reason         Length     Msg Type   Filler  Record Image");
!         messages.add("M02 | File:    File Name    Date:   Mail Date   Time: Mail Time     Process Date");
!         InputStreamReader reader = new InputStreamReader(file);
!         BufferedReader input = new BufferedReader(reader);
!         String nextline;
!         try{
!             while ((nextline=input.readLine())!=null){
!                 String headerCount = nextline.substring(2,3);
! 
!                 if (headerCount.compareTo("1") == 0){
!                     String recordLength=nextline.substring(23,28);
!                     String msgType=nextline.substring(28,31);
!                     String filler=nextline.substring(32,39);
!                     String error=nextline.substring(39,76);
!                     String explain=nextline.substring(3,23);
!                     String msg = "M01 | " +explain+"   " + recordLength + "   " + msgType+"   "+filler+"   "+URLEncoder.encode(error);
!                     messages.add(msg);
! 
!                 }
!                 if (headerCount.compareTo("2") == 0){
!                     String mailFile=nextline.substring(8,20);
!                     String mailDate=nextline.substring(25,33);
!                     String mailTime=nextline.substring(38,44);
!                     String batchProcessDate=nextline.substring(50,58);
!                     String msg = "M02 | File:   "+mailFile+"    "+"Date:   "+mailDate+"   "+"Time: "+mailTime+"     PDate: "+batchProcessDate;         
!                     messages.add(msg);
!                 }
!             }
!             
!         }
!         catch (IOException ioe) {
!             ioe.printStackTrace();            
!         }
!         catch (StringIndexOutOfBoundsException ioe) {
!             reportXIsGenerated =  false;   
!         }
!         return messages;
!      }
! 
! 
!     /**
!      * 
!      * Generate EDT OBEC Output Specification (R).
!      * 
!      * @param file
!      * @return BillingEDTOBECOutputSpecificationBeanHandler
!      */
!      private BillingEDTOBECOutputSpecificationBeanHandler generateReportR(FileInputStream file){
!         BillingEDTOBECOutputSpecificationBeanHandler hd = new BillingEDTOBECOutputSpecificationBeanHandler(file);
!         Vector outputSpecVector = hd.getEDTOBECOutputSecifiationBeanVector();
!         try{
!             DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
!             
!             for(int i=0; i<outputSpecVector.size(); i++){
!                 BillingEDTOBECOutputSpecificationBean bean = (BillingEDTOBECOutputSpecificationBean) outputSpecVector.elementAt(i);
!                 String hin = bean.getHealthNo();
!                 String responseCode = bean.getResponseCode();
!                 String sql = "SELECT * FROM batchEligibility where responseCode='" + responseCode + "'";
!                 ResultSet rs = db.GetSQL(sql);                    
!                 
!                 String sqlDemo = "SELECT * FROM demographic WHERE hin='" + hin + "'";
!                 ResultSet rsDemo = db.GetSQL(sqlDemo);
!                 
!                 if (rsDemo.next() && rs.next()){
!                         String sqlVer = "UPDATE demographic SET ver ='##' WHERE hin='" + hin + "'";
!                         db.RunSQL(sqlVer);
!                         String sqlAlert = "SELECT * FROM demographiccust where demographic_no ='" + rsDemo.getString("demographic_no") + "'";
!                         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") + "'";
!                             System.out.println("Update alert msg: " + newAlertSql);
!                             db.RunSQL(newAlertSql);
!                         }
!                         rsAlert.close();                       
!                     rs.close();                    
!                     rsDemo.close();
!                 }
!                          
!             }
!             db.CloseConn();
!         }
!         catch(SQLException e)
!         {
!             System.out.println(e.getMessage());
!         }            
!            
!         
!         return hd;     
!      }
!      
!      
! }
\ No newline at end of file
--- 1,341 ----
! //// -----------------------------------------------------------------------------------------------------------------------
! //// *
! //// *
! //// * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
! //// * This software is published under the GPL GNU General Public License. 
! //// * This program is free software; you can redistribute it and/or 
! //// * modify it under the terms of the GNU General Public License 
! //// * as published by the Free Software Foundation; either version 2 
! //// * of the License, or (at your option) any later version. * 
! //// * This program is distributed in the hope that it will be useful, 
! //// * but WITHOUT ANY WARRANTY; without even the implied warranty of 
! //// * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
! //// * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
! //// * along with this program; if not, write to the Free Software 
! //// * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
! //// * 
! //// * <OSCAR TEAM>
! //// * This software was written for the 
! //// * Department of Family Medicine 
! //// * McMaster Unviersity 
! //// * Hamilton 
! //// * Ontario, Canada 
! //// *
! //// -----------------------------------------------------------------------------------------------------------------------
! //package oscar.oscarBilling.pageUtil;
! //
! //import java.io.*;
! //import java.util.*;
! //import java.lang.*;
! //import java.net.*;
! //import java.sql.ResultSet;
! //import java.sql.SQLException;
! //import java.util.ArrayList;
! //import javax.servlet.ServletException;
! //import javax.servlet.ServletRequest;
! //import javax.servlet.http.*;
! //import org.apache.struts.action.*;
! //import org.apache.struts.validator.*;
! //import org.apache.commons.validator.*;
! //import org.apache.struts.util.MessageResources;
! //import org.apache.struts.upload.FormFile;
! //import oscar.oscarDB.DBHandler;
! //import oscar.oscarMessenger.util.MsgStringQuote;
! //import oscar.oscarBilling.bean.*;
! //import oscar.OscarProperties;
! //
! //
! //public class BillingDocumentErrorReportUploadAction extends Action {
! //
! //    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)
! //        throws ServletException, IOException
! //    {
! //        BillingDocumentErrorReportUploadForm frm = (BillingDocumentErrorReportUploadForm) form;                
! //        request.getSession().setAttribute("BillingDocumentErrorReportUploadForm", frm);
! //        FormFile file1 = frm.getFile1();
! //        ArrayList messages = new ArrayList();
! //        ActionErrors errors = new ActionErrors();  
! //        
! //        if(!saveFile(file1)){
! //            errors.add(errors.GLOBAL_ERROR,
! //            new ActionError("errors.fileNotAdded"));
! //            saveErrors(request, errors);
! //            return (new ActionForward(mapping.getInput()));
! //        }
! //        else{
! //            if(getData(file1.getFileName(), request))
! //                return mapping.findForward("success");
! //            else{
! //                errors.add(errors.GLOBAL_ERROR,
! //                new ActionError("errors.incorrectFileFormat"));
! //                saveErrors(request, errors);
! //                return (new ActionForward(mapping.getInput()));
! //            }
! //        }
! //    }
! //     
! //    /**
! //     * 
! //     * Save a Jakarta FormFile to a preconfigured place.
! //     * 
! //     * @param file
! //     * @return
! //     */
! //    public static boolean saveFile(FormFile file){
! //        String retVal = null;        
! //        boolean isAdded = true;
! //        
! //        try {
! //            //retrieve the file data
! //            ByteArrayOutputStream baos = new
! //            ByteArrayOutputStream();
! //            InputStream stream = file.getInputStream();
! //            OscarProperties props = OscarProperties.getInstance();
! //
! //            //properties must exist            
! //            String place= props.getProperty("DOCUMENT_DIR");
! //            
! //            if(!place.endsWith("/"))
! //                    place = new StringBuffer(place).insert(place.length(),"/").toString();
! //            retVal = place+file.getFileName();
! //            System.out.println(retVal);
! //            //write the file to the file specified
! //            OutputStream bos = new FileOutputStream(retVal);
! //            int bytesRead = 0;
! //            byte[] buffer = file.getFileData();
! //            while ((bytesRead = stream.read(buffer)) != -1){
! //                    bos.write(buffer, 0, bytesRead);
! //            }
! //            bos.close();
! //
! //            //close the stream
! //            stream.close();
! //        }
! //        catch (FileNotFoundException fnfe) {
! //            
! //            System.out.println("File not found");
! //            fnfe.printStackTrace();            
! //            return isAdded=false;
! //            
! //        }
! //        catch (IOException ioe) {
! //            ioe.printStackTrace();
! //            return isAdded=false;
! //        }
! //
! //        return isAdded;
! //    }
! //    
! //    /**
! //    * 
! //    * Write to database
! //    * 
! //    * @param fileName - the filename to store
! //    *     
! //    */
! //    private void write2Database(String fileName){
! //         try {
! //            DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! //            String sql = "INSERT INTO measurementCSSLocation(location) VALUES('" + fileName + "')";
! //            System.out.println("Sql Statement: " + sql);
! //            db.RunSQL(sql);            
! //            db.CloseConn();
! //        }
! //        catch(SQLException e) {
! //            System.out.println(e.getMessage());            
! //        }       
! //    }
! //    
! //      /**
! //     * 
! //     * Get Data from the file.
! //     * 
! //     * @param file
! //     * @return
! //     */
! //    private boolean getData(String fileName, HttpServletRequest request){
! //        boolean isGot = false;
! //        
! //        try{
! //            OscarProperties props = OscarProperties.getInstance();        
! //            //properties must exist            
! //            String filepath= props.getProperty("DOCUMENT_DIR");
! //            if(!filepath.endsWith("/"))
! //                        filepath = new StringBuffer(filepath).insert(filepath.length(),"/").toString();
! //            FileInputStream file = new FileInputStream(filepath + fileName);
! //            System.out.println("file path: " + filepath+fileName);
! //            //Assign associated report Name
! //            ArrayList messages = new ArrayList();
! //            String ReportName=""; 
! //            String ReportFlag="";
! //
! //            if (fileName.substring(0,1).compareTo("E")==0){ 
! //                ReportName="Claims Error Report"; 
! //                BillingClaimsErrorReportBeanHandler hd = generateReportE(file);
! //                request.setAttribute("claimsErrors", hd);
! //                isGot = hd.verdict;
! //            }
! //            if (fileName.substring(0,1).compareTo("B")==0){ 
! //                ReportName="Claim Batch Acknowledgement Report"; 
! //                BillingClaimBatchAcknowledgementReportBeanHandler hd = generateReportB(file);
! //                request.setAttribute("batchAcks", hd);
! //                isGot = hd.verdict;
! //            }
! //            if (fileName.substring(0,1).compareTo("X")==0){ 
! //                ReportName="Claim File Rejection Report"; 
! //                messages=generateReportX(file);
! //                request.setAttribute("messages", messages);
! //                isGot = reportXIsGenerated;
! //            }
! //            if (fileName.substring(0,1).compareTo("R")==0){ 
! //                ReportName="EDT OBEC Output Specification"; 
! //                BillingEDTOBECOutputSpecificationBeanHandler hd = generateReportR(file);
! //                request.setAttribute("outputSpecs", hd);
! //                isGot = hd.verdict;
! //            }
! //            request.setAttribute("ReportName", ReportName);
! //        }
! //        catch (FileNotFoundException fnfe) {
! //            
! //            System.out.println("File not found");
! //            fnfe.printStackTrace();            
! //            return isGot=false;
! //            
! //        }
! //        catch (IOException ioe) {
! //            ioe.printStackTrace();
! //            return isGot=false;
! //        }
! //        return isGot;
! //    }
! // 
! //    /**
! //     * 
! //     * Generate Claims Error Report (E).
! //     * 
! //     * @param file
! //     * @return BillingClaimsErrorReportBeanHandler
! //     */
! //     private BillingClaimsErrorReportBeanHandler generateReportE(FileInputStream file){
! //        BillingClaimsErrorReportBeanHandler hd = new BillingClaimsErrorReportBeanHandler(file);        
! //        
! //        return hd;     
! //     }
! //    
! //    /**
! //     * 
! //     * Generate Claim Batch Acknowledgement Report (B).
! //     * 
! //     * @param file
! //     * @return BillingClaimBatchAcknowlegementReportBeanHandler
! //     */
! //     private BillingClaimBatchAcknowledgementReportBeanHandler generateReportB(FileInputStream file){
! //        BillingClaimBatchAcknowledgementReportBeanHandler hd = new BillingClaimBatchAcknowledgementReportBeanHandler(file);        
! //        
! //        return hd;     
! //     }
! //     
! //    /**
! //     * 
! //     * Generate Claim File Rejection Report (X).
! //     * 
! //     * @param file
! //     * @return
! //     */
! //     private boolean reportXIsGenerated = true;
! //     private ArrayList generateReportX(FileInputStream file){
! //        ArrayList messages = new ArrayList();
! //        messages.add("M01 | Message Reason         Length     Msg Type   Filler  Record Image");
! //        messages.add("M02 | File:    File Name    Date:   Mail Date   Time: Mail Time     Process Date");
! //        InputStreamReader reader = new InputStreamReader(file);
! //        BufferedReader input = new BufferedReader(reader);
! //        String nextline;
! //        try{
! //            while ((nextline=input.readLine())!=null){
! //                String headerCount = nextline.substring(2,3);
! //
! //                if (headerCount.compareTo("1") == 0){
! //                    String recordLength=nextline.substring(23,28);
! //                    String msgType=nextline.substring(28,31);
! //                    String filler=nextline.substring(32,39);
! //                    String error=nextline.substring(39,76);
! //                    String explain=nextline.substring(3,23);
! //                    String msg = "M01 | " +explain+"   " + recordLength + "   " + msgType+"   "+filler+"   "+URLEncoder.encode(error);
! //                    messages.add(msg);
! //
! //                }
! //                if (headerCount.compareTo("2") == 0){
! //                    String mailFile=nextline.substring(8,20);
! //                    String mailDate=nextline.substring(25,33);
! //                    String mailTime=nextline.substring(38,44);
! //                    String batchProcessDate=nextline.substring(50,58);
! //                    String msg = "M02 | File:   "+mailFile+"    "+"Date:   "+mailDate+"   "+"Time: "+mailTime+"     PDate: "+batchProcessDate;         
! //                    messages.add(msg);
! //                }
! //            }
! //            
! //        }
! //        catch (IOException ioe) {
! //            ioe.printStackTrace();            
! //        }
! //        catch (StringIndexOutOfBoundsException ioe) {
! //            reportXIsGenerated =  false;   
! //        }
! //        return messages;
! //     }
! //
! //
! //    /**
! //     * 
! //     * Generate EDT OBEC Output Specification (R).
! //     * 
! //     * @param file
! //     * @return BillingEDTOBECOutputSpecificationBeanHandler
! //     */
! //     private BillingEDTOBECOutputSpecificationBeanHandler generateReportR(FileInputStream file){
! //        BillingEDTOBECOutputSpecificationBeanHandler hd = new BillingEDTOBECOutputSpecificationBeanHandler(file);
! //        Vector outputSpecVector = hd.getEDTOBECOutputSecifiationBeanVector();
! //        try{
! //            DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
! //            
! //            for(int i=0; i<outputSpecVector.size(); i++){
! //                BillingEDTOBECOutputSpecificationBean bean = (BillingEDTOBECOutputSpecificationBean) outputSpecVector.elementAt(i);
! //                String hin = bean.getHealthNo();
! //                String responseCode = bean.getResponseCode();
! //                String sql = "SELECT * FROM batchEligibility where responseCode='" + responseCode + "'";
! //                ResultSet rs = db.GetSQL(sql);                    
! //                
! //                String sqlDemo = "SELECT * FROM demographic WHERE hin='" + hin + "'";
! //                ResultSet rsDemo = db.GetSQL(sqlDemo);
! //                
! //                if (rsDemo.next() && rs.next()){
! //                        String sqlVer = "UPDATE demographic SET ver ='##' WHERE hin='" + hin + "'";
! //                        db.RunSQL(sqlVer);
! //                        String sqlAlert = "SELECT * FROM demographiccust where demographic_no ='" + rsDemo.getString("demographic_no") + "'";
! //                        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") + "'";
! //                            System.out.println("Update alert msg: " + newAlertSql);
! //                            db.RunSQL(newAlertSql);
! //                        }
! //                        rsAlert.close();                       
! //                    rs.close();                    
! //                    rsDemo.close();
! //                }
! //                         
! //            }
! //            db.CloseConn();
! //        }
! //        catch(SQLException e)
! //        {
! //            System.out.println(e.getMessage());
! //        }            
! //           
! //        
! //        return hd;     
! //     }
! //     
! //     
! //}
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil FrmXmlUploadAction.java,1.1,1.2

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

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

Modified Files:
	FrmXmlUploadAction.java 
Log Message:
Removed unnecessary import to oscar.oscarBilling.bean.*;



Index: FrmXmlUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmXmlUploadAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** FrmXmlUploadAction.java	12 Jul 2004 17:34:52 -0000	1.1
--- FrmXmlUploadAction.java	22 Mar 2005 14:45:40 -0000	1.2
***************
*** 43,47 ****
  import oscar.oscarDB.DBHandler;
  import oscar.oscarMessenger.util.MsgStringQuote;
- import oscar.oscarBilling.bean.*;
  import oscar.OscarProperties;
  import oscar.util.JDBCUtil;
--- 43,46 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formInternetAccess.jsp,1.2,1.3

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

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

Modified Files:
	formInternetAccess.jsp 
Log Message:
added new question " Where do you have access to the Internet"



Index: formInternetAccess.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formInternetAccess.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** formInternetAccess.jsp	19 Feb 2005 03:55:48 -0000	1.2
--- formInternetAccess.jsp	22 Mar 2005 05:05:47 -0000	1.3
***************
*** 157,161 ****
      
      var choiceFormat  = new Array(6,7,8,9,12,13);        
!     var allNumericField = new Array(10,11);
      var allMatch = null;
      var action = "/<%=project_home%>/form/formname.do";        
--- 157,161 ----
      
      var choiceFormat  = new Array(6,7,8,9,12,13);        
!     var allNumericField = new Array(14,15);
      var allMatch = null;
      var action = "/<%=project_home%>/form/formname.do";        
***************
*** 243,246 ****
--- 243,279 ----
                      </td>                                  
                  </tr>                
+                 
+                 <tr>
+                     <td width="5%" valign="top" align="right">2.</td>
+                     <td valign="top">                        
+                         Where do you have access to the Internet?
+                     </td>
+                 </tr>
+                 <tr>                                                
+                 <tr bgcolor="white">                                    
+                     <td width="5%" align="right">                        
+                     </td>
+                     <td width="95%">
+                         <input type="checkbox"  class="checkbox" name="internetHome" <%= props.getProperty("internetHome", "") %>/>
+                         Home
+                     </td>                                  
+                 </tr>
+                 <tr bgcolor="white">                                    
+                     <td width="5%" align="right">                        
+                     </td>
+                     <td width="95%">
+                         <input type="checkbox"  class="checkbox" name="internetWork" <%= props.getProperty("internetWork", "") %>/>
+                         Work
+                     </td>                                  
+                 </tr>                                
+                 <tr bgcolor="white">                                    
+                     <td width="5%" align="right">                        
+                     </td>
+                     <td width="95%">
+                         <input type="checkbox"  class="checkbox" name="internetOther" <%= props.getProperty("internetOther", "") %>/>
+                         Other; Specify where: <input type="text" size="20" name="internetOtherTx" value='<%= props.getProperty("internetOtherTx", "") %>'/>
+                     </td>                                  
+                 </tr>                
+                                 
                  <tr>
                      <td width="5%" valign="top" align="right">3.</td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/dms documentReport.jsp,1.8,1.9

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

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

Modified Files:
	documentReport.jsp 
Log Message:
bug fixed (add a javascriptEscape to doc. name )

Index: documentReport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/dms/documentReport.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** documentReport.jsp	20 Jul 2004 14:54:52 -0000	1.8
--- documentReport.jsp	22 Mar 2005 00:55:17 -0000	1.9
***************
*** 10,18 ****
  
  <%@ page import="java.math.*, java.util.*, java.io.*, java.sql.*, oscar.*, oscar.util.*, java.net.*,oscar.MyDateFormat" %>
  <%@ include file="../admin/dbconnection.jsp" %>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" /> 
  <%@ include file="dbDMS.jsp" %>
  <%
! String nowDate = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy/MM/dd HH:mm:ss"); 
  String function = request.getParameter("function");
  String functionid = request.getParameter("functionid");
--- 10,19 ----
  
  <%@ page import="java.math.*, java.util.*, java.io.*, java.sql.*, oscar.*, oscar.util.*, java.net.*,oscar.MyDateFormat" %>
+ <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
  <%@ include file="../admin/dbconnection.jsp" %>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  <%@ include file="dbDMS.jsp" %>
  <%
! String nowDate = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy/MM/dd HH:mm:ss");
  String function = request.getParameter("function");
  String functionid = request.getParameter("functionid");
***************
*** 24,56 ****
  
  String functionString = getFullName(apptMainBean, function, functionid);
!        
! //String functionString = function.substring(0,1).toUpperCase()+function.substring(1);   
  %>
! <!--  
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
!  * along with this program; if not, write to the Free Software 
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
!  * 
   * <OSCAR TEAM>
!  * 
!  * This software was written for the 
!  * Department of Family Medicine 
!  * McMaster Unviersity 
!  * Hamilton 
!  * Ontario, Canada 
   */
  -->
! <html:html locale="true"> 
  <head>
  <title><bean:message key="dms.documentReport.title"/></title>
--- 25,57 ----
  
  String functionString = getFullName(apptMainBean, function, functionid);
! 
! //String functionString = function.substring(0,1).toUpperCase()+function.substring(1);
  %>
! <!--
  /*
!  *
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License.
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version. *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
!  *
   * <OSCAR TEAM>
!  *
!  * This software was written for the
!  * Department of Family Medicine
!  * McMaster Unviersity
!  * Hamilton
!  * Ontario, Canada
   */
  -->
! <html:html locale="true">
  <head>
  <title><bean:message key="dms.documentReport.title"/></title>
***************
*** 103,119 ****
     <table border="0" cellspacing="0" cellpadding="0" width="100%" >
        <tr bgcolor="#486ebd">
!          <th align='LEFT'><input type='button' name='print' value='<bean:message key="global.btnPrint"/>' onClick='window.print()'></th> 
           <th align='RIGHT'  ><font face="Arial, Helvetica, sans-serif" color="#FFFFFF"><bean:message key="dms.documentReport.msgDocReport"/> &nbsp;&nbsp;&nbsp;&nbsp;</font></th>
           <th align='RIGHT'><input type="button" name="Button" value="<bean:message key="dms.documentReport.btnAddHTML"/>" onclick="window.open('../dms/addhtmldocument.jsp?function=<%=function%>&functionid=<%=functionid%>&creator=<%=request.getParameter("curUser")%>','', 'scrollbars=yes,resizable=yes,width=600,height=600')";><input type="button" name="Button" value="<bean:message key="dms.documentReport.btnAddDoc"/>" onclick="window.open('../dms/adddocument.jsp?function=<%=function%>&functionid=<%=functionid%>&creator=<%=request.getParameter("curUser")%>','', 'scrollbars=yes,resizable=yes,width=600,height=300')";><input type='button' name='close' value='<bean:message key="global.btnClose"/>' onClick='window.close()'></th>
        </tr>
     </table>
!    
!    
  
  
     <table BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C4D9E7">
!       <tr valign="top">       
!          <td rowspan="2" ALIGN="center" valign="middle"> 
!  
              <table width="100%" border="1" cellspacing="0" cellpadding="0">
                 <tr><td colspan='5'><b><%=functionString%>'s folder</b></td></td>
--- 104,120 ----
     <table border="0" cellspacing="0" cellpadding="0" width="100%" >
        <tr bgcolor="#486ebd">
!          <th align='LEFT'><input type='button' name='print' value='<bean:message key="global.btnPrint"/>' onClick='window.print()'></th>
           <th align='RIGHT'  ><font face="Arial, Helvetica, sans-serif" color="#FFFFFF"><bean:message key="dms.documentReport.msgDocReport"/> &nbsp;&nbsp;&nbsp;&nbsp;</font></th>
           <th align='RIGHT'><input type="button" name="Button" value="<bean:message key="dms.documentReport.btnAddHTML"/>" onclick="window.open('../dms/addhtmldocument.jsp?function=<%=function%>&functionid=<%=functionid%>&creator=<%=request.getParameter("curUser")%>','', 'scrollbars=yes,resizable=yes,width=600,height=600')";><input type="button" name="Button" value="<bean:message key="dms.documentReport.btnAddDoc"/>" onclick="window.open('../dms/adddocument.jsp?function=<%=function%>&functionid=<%=functionid%>&creator=<%=request.getParameter("curUser")%>','', 'scrollbars=yes,resizable=yes,width=600,height=300')";><input type='button' name='close' value='<bean:message key="global.btnClose"/>' onClick='window.close()'></th>
        </tr>
     </table>
! 
! 
  
  
     <table BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C4D9E7">
!       <tr valign="top">
!          <td rowspan="2" ALIGN="center" valign="middle">
! 
              <table width="100%" border="1" cellspacing="0" cellpadding="0">
                 <tr><td colspan='5'><b><%=functionString%>'s folder</b></td></td>
***************
*** 121,131 ****
                     <td width="34%"><b><bean:message key="dms.documentReport.msgDocDesc"/></b></td>
                     <td width="15%"><b><bean:message key="dms.documentReport.msgDocType"/></b></td>
!                    <td width="17%"><b><bean:message key="dms.documentReport.msgCreator"/></b></td>                   
!                    <td width="21%"><b><bean:message key="dms.documentReport.msgUpdate" /></b></td> 
                     <td width="13%"><b><bean:message key="dms.documentReport.msgAction" /></b></td>
                 </tr>
!   
    <%
!     
      int count0 = 0;
      if(request.getParameter("creator") != null) creator= request.getParameter("creator") ;
--- 122,132 ----
                     <td width="34%"><b><bean:message key="dms.documentReport.msgDocDesc"/></b></td>
                     <td width="15%"><b><bean:message key="dms.documentReport.msgDocType"/></b></td>
!                    <td width="17%"><b><bean:message key="dms.documentReport.msgCreator"/></b></td>
!                    <td width="21%"><b><bean:message key="dms.documentReport.msgUpdate" /></b></td>
                     <td width="13%"><b><bean:message key="dms.documentReport.msgAction" /></b></td>
                 </tr>
! 
    <%
! 
      int count0 = 0;
      if(request.getParameter("creator") != null) creator= request.getParameter("creator") ;
***************
*** 133,137 ****
      if(request.getParameter("doctype") != null) doctype= request.getParameter("doctype") ;
      if(request.getParameter("docdesc") != null) docdesc= request.getParameter("docdesc") ;
!     
  
      String[] param0 = new String[3];
--- 134,138 ----
      if(request.getParameter("doctype") != null) doctype= request.getParameter("doctype") ;
      if(request.getParameter("docdesc") != null) docdesc= request.getParameter("docdesc") ;
! 
  
      String[] param0 = new String[3];
***************
*** 139,144 ****
               param0[1] = functionid;
               param0[2] = "%"; // doctype;
!     
!           
       ResultSet rslocal2 = null;
   	  rslocal2 = apptMainBean.queryResults(param0, "match_document");
--- 140,145 ----
               param0[1] = functionid;
               param0[2] = "%"; // doctype;
! 
! 
       ResultSet rslocal2 = null;
   	  rslocal2 = apptMainBean.queryResults(param0, "match_document");
***************
*** 152,171 ****
          dispStatus = rslocal2.getString("status");
          count0 = count0 + 1;
!   
          if (dispStatus.compareTo("A") == 0) dispStatus="active";
!         if (dispStatus.compareTo("H") == 0) dispStatus="html";    
     //   if (function.compareTo("demographic") == 0){
!      
!         
          String creatorName = getFullName(apptMainBean,"provider",dispCreator);
  //  }
  %>
                 <tr>
!                   <td width="34%"><a href=# onClick="javascript:rs('new','documentGetFile.jsp?document=<%=dispFilename%>&type=<%=dispStatus%>&doc_no=<%=dispDocNo%>', 480,480,1)"><%=dispDesc%></td>
                    <td width="15%"><%=dispType%></td>
                    <td width="17%"><%=creatorName%></td>
                    <td width="21%"><%=dispUpdatedate%></td>
                    <td width="13%"><a href=# onClick="checkDelete('documentDelete.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&functionid=<%=functionid%>','<%=dispCreator%>','<%=curUser_no%>','<%=userlastname%>')"><bean:message key="dms.documentReport.btnDelete"/></a> &nbsp; &nbsp; <a href=# onClick="popPage('documentEdit.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&doctype=<%=URLEncoder.encode(dispType)%>&desc=<%=URLEncoder.encode(dispDesc)%>')"><bean:message key="dms.documentReport.btnEdit"/></a></td>
!                </tr> 
  
  <%   }
--- 153,172 ----
          dispStatus = rslocal2.getString("status");
          count0 = count0 + 1;
! 
          if (dispStatus.compareTo("A") == 0) dispStatus="active";
!         if (dispStatus.compareTo("H") == 0) dispStatus="html";
     //   if (function.compareTo("demographic") == 0){
! 
! 
          String creatorName = getFullName(apptMainBean,"provider",dispCreator);
  //  }
  %>
                 <tr>
!                   <td width="34%"><a href=# onClick="javascript:rs('new','documentGetFile.jsp?document=<%=StringEscapeUtils.escapeJavaScript(dispFilename)%>&type=<%=dispStatus%>&doc_no=<%=dispDocNo%>', 480,480,1)"><%=dispDesc%></td>
                    <td width="15%"><%=dispType%></td>
                    <td width="17%"><%=creatorName%></td>
                    <td width="21%"><%=dispUpdatedate%></td>
                    <td width="13%"><a href=# onClick="checkDelete('documentDelete.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&functionid=<%=functionid%>','<%=dispCreator%>','<%=curUser_no%>','<%=userlastname%>')"><bean:message key="dms.documentReport.btnDelete"/></a> &nbsp; &nbsp; <a href=# onClick="popPage('documentEdit.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&doctype=<%=URLEncoder.encode(dispType)%>&desc=<%=URLEncoder.encode(dispDesc)%>')"><bean:message key="dms.documentReport.btnEdit"/></a></td>
!                </tr>
  
  <%   }
***************
*** 180,186 ****
  <%if (function.compareTo("provider") == 0){ %>
     <table BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C4E9E7">
!       <tr valign="top">               
!          <td rowspan="2" ALIGN="center" valign="middle"> 
!             <table width="100%" border="1" cellspacing="0" cellpadding="0" >  
                  <tr><td colspan='5'><b><bean:message key="dms.documentReport.msgShareFolder"/></b></td></tr>
                  <tr>
--- 181,187 ----
  <%if (function.compareTo("provider") == 0){ %>
     <table BORDER="0" CELLPADDING="1" CELLSPACING="0" WIDTH="100%" BGCOLOR="#C4E9E7">
!       <tr valign="top">
!          <td rowspan="2" ALIGN="center" valign="middle">
!             <table width="100%" border="1" cellspacing="0" cellpadding="0" >
                  <tr><td colspan='5'><b><bean:message key="dms.documentReport.msgShareFolder"/></b></td></tr>
                  <tr>
***************
*** 188,192 ****
                    <td width="15%"><b><bean:message key="dms.documentReport.msgDocType"/></b></td>
                    <td width="17%"><b><%=function.substring(0,1).toUpperCase()%><%=function.substring(1)%></b></td>
!                   <td width="21%"><b><bean:message key="dms.documentReport.msgUpdate"/></b></td> 
                    <td width="13%"><b><bean:message key="dms.documentReport.msgActive"/></b></td>
                  </tr>
--- 189,193 ----
                    <td width="15%"><b><bean:message key="dms.documentReport.msgDocType"/></b></td>
                    <td width="17%"><b><%=function.substring(0,1).toUpperCase()%><%=function.substring(1)%></b></td>
!                   <td width="21%"><b><bean:message key="dms.documentReport.msgUpdate"/></b></td>
                    <td width="13%"><b><bean:message key="dms.documentReport.msgActive"/></b></td>
                  </tr>
***************
*** 196,201 ****
        String[] param1 = new String[1];
                 param1[0] = function;
!                   
!             
        rslocal2 = null;
     	rslocal2 = apptMainBean.queryResults(param1, "share_document");
--- 197,202 ----
        String[] param1 = new String[1];
                 param1[0] = function;
! 
! 
        rslocal2 = null;
     	rslocal2 = apptMainBean.queryResults(param1, "share_document");
***************
*** 209,243 ****
           dispStatus = rslocal2.getString("status");
           count = count + 1;
!     
           if (dispStatus.compareTo("A") == 0) dispStatus="active";
!          if (dispStatus.compareTo("H") == 0) dispStatus="html";    
!      
  	      ResultSet    rslocal = null;
! 	      rslocal = apptMainBean.queryResults(dispCreator, "search_"+function+"_details");  
! 	     	while(rslocal.next()){	         
  	         proFirst = rslocal.getString("first_name");
  	         proLast = rslocal.getString("last_name");
  	    //   proOHIP = rslocal.getString("provider_no");
           }
!   
    %>
                  <tr>
!                     <td width="34%"><a href=# onClick="javascript:rs('new','documentGetFile.jsp?document=<%=dispFilename%>&type=<%=dispStatus%>&doc_no=<%=dispDocNo%>', 480,480,1)"><%=dispDesc%></td>
                      <td width="15%"><%=dispType%></td>
                      <td width="17%"><%=proLast%>, <%=proFirst%></td>
                      <td width="21%"><%=dispUpdatedate%></td>
                      <td width="13%"><a href=# onClick="checkDelete('documentDelete.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&functionid=<%=functionid%>','<%=dispCreator%>','<%=curUser_no%>', '<%=userlastname%>')"><bean:message key="dms.documentReport.btnDelete"/></a>&nbsp; &nbsp;<a href=# onClick="popPage('documentEdit.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&doctype=<%=URLEncoder.encode(dispType)%>&desc=<%=URLEncoder.encode(dispDesc)%>')"><bean:message key="dms.documentReport.btnEdit"/></a>&nbsp; &nbsp;</td>
!                 </tr> 
!   
  <%	   }
  	   if (count == 0) { %>
! 	   
                  <tr><td colspan='5'><bean:message key="dms.documentReport.msgNoMatch"/></td></td>
! <%	   }%> 
              </table>
          </td>
      </tr>
  </table>
! <%} 
  apptMainBean.closePstmtConn(); %>
  
--- 210,244 ----
           dispStatus = rslocal2.getString("status");
           count = count + 1;
! 
           if (dispStatus.compareTo("A") == 0) dispStatus="active";
!          if (dispStatus.compareTo("H") == 0) dispStatus="html";
! 
  	      ResultSet    rslocal = null;
! 	      rslocal = apptMainBean.queryResults(dispCreator, "search_"+function+"_details");
! 	     	while(rslocal.next()){
  	         proFirst = rslocal.getString("first_name");
  	         proLast = rslocal.getString("last_name");
  	    //   proOHIP = rslocal.getString("provider_no");
           }
! 
    %>
                  <tr>
!                     <td width="34%"><a href=# onClick="javascript:rs('new','documentGetFile.jsp?document=<%=StringEscapeUtils.escapeJavaScript(dispFilename)%>&type=<%=dispStatus%>&doc_no=<%=dispDocNo%>', 480,480,1)"><%=dispDesc%></td>
                      <td width="15%"><%=dispType%></td>
                      <td width="17%"><%=proLast%>, <%=proFirst%></td>
                      <td width="21%"><%=dispUpdatedate%></td>
                      <td width="13%"><a href=# onClick="checkDelete('documentDelete.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&functionid=<%=functionid%>','<%=dispCreator%>','<%=curUser_no%>', '<%=userlastname%>')"><bean:message key="dms.documentReport.btnDelete"/></a>&nbsp; &nbsp;<a href=# onClick="popPage('documentEdit.jsp?document_no=<%=dispDocNo%>&function=<%=function%>&doctype=<%=URLEncoder.encode(dispType)%>&desc=<%=URLEncoder.encode(dispDesc)%>')"><bean:message key="dms.documentReport.btnEdit"/></a>&nbsp; &nbsp;</td>
!                 </tr>
! 
  <%	   }
  	   if (count == 0) { %>
! 
                  <tr><td colspan='5'><bean:message key="dms.documentReport.msgNoMatch"/></td></td>
! <%	   }%>
              </table>
          </td>
      </tr>
  </table>
! <%}
  apptMainBean.closePstmtConn(); %>
  
***************
*** 251,260 ****
  
  public String getFullName(oscar.AppointmentMainBean apptMainBean, String function, String functionid) throws Exception{
!     ResultSet rslocal = apptMainBean.queryResults(functionid, "search_"+function+"_details");  
      String proFirst = "";
      String proLast = "";
!     if(rslocal.next()){       
         proFirst = rslocal.getString("first_name");
!        proLast = rslocal.getString("last_name");      
      }
      return proLast+", "+proFirst ;
--- 252,261 ----
  
  public String getFullName(oscar.AppointmentMainBean apptMainBean, String function, String functionid) throws Exception{
!     ResultSet rslocal = apptMainBean.queryResults(functionid, "search_"+function+"_details");
      String proFirst = "";
      String proLast = "";
!     if(rslocal.next()){
         proFirst = rslocal.getString("first_name");
!        proLast = rslocal.getString("last_name");
      }
      return proLast+", "+proFirst ;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/bean BillingClaimBatchAcknowledgementReportBean.java,1.1,NONE BillingClaimBatchAcknowledgementReportBeanHandler.java,1.2,NONE BillingClaimsErrorReportBean.java,1.1,NONE BillingClaimsErrorReportBeanHandler.java,1.2,NONE BillingEDTOBECOutputSpecificationBean.java,1.1,NONE BillingEDTOBECOutputSpecificationBeanHandler.java,1.2,NONE

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

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

Removed Files:
	BillingClaimBatchAcknowledgementReportBean.java 
	BillingClaimBatchAcknowledgementReportBeanHandler.java 
	BillingClaimsErrorReportBean.java 
	BillingClaimsErrorReportBeanHandler.java 
	BillingEDTOBECOutputSpecificationBean.java 
	BillingEDTOBECOutputSpecificationBeanHandler.java 
Log Message:
Old file structure not need anymore



--- BillingClaimBatchAcknowledgementReportBeanHandler.java DELETED ---

--- BillingClaimBatchAcknowledgementReportBean.java DELETED ---

--- BillingClaimsErrorReportBean.java DELETED ---

--- BillingEDTOBECOutputSpecificationBean.java DELETED ---

--- BillingClaimsErrorReportBeanHandler.java DELETED ---

--- BillingEDTOBECOutputSpecificationBeanHandler.java DELETED ---

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

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

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

Modified Files:
	oscarinit.sql 
Log Message:
added Fields 

 WHRBValue varchar(10),
  WHRBDate varchar(10),
  WHRBComments varchar(255),
  WHRBLastData varchar(10),
  WHRBLastDataEnteredDate varchar(10),

to table formVTForm



Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** oscarinit.sql	3 Mar 2005 18:38:44 -0000	1.74
--- oscarinit.sql	21 Mar 2005 19:00:00 -0000	1.75
***************
*** 4838,4841 ****
--- 4838,4846 ----
    Assessment Text,
    Plan Text,
+   WHRBValue varchar(10),
+   WHRBDate varchar(10),
+   WHRBComments varchar(255),
+   WHRBLastData varchar(10),
+   WHRBLastDataEnteredDate varchar(10),
    PRIMARY KEY  (ID),
    INDEX (ID),

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

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
added field for Waist hip ratio boolean



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** formVTForm.jsp	21 Mar 2005 17:33:35 -0000	1.40
--- formVTForm.jsp	21 Mar 2005 18:53:10 -0000	1.41
***************
*** 1126,1141 ****
                                              
                                              <tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("WHRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WHRMeasuringInstrc")%></font></td>
                                                  <td class="dataEntryTable" align="center">
!                                                     <logic:present name="WHRLastData">
                                                      <table cellpadding='0' cellspacing='0'>                                                            
                                                      <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WHRLDDate")%></td></tr>
                                                      <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WHRLastData")%></td></tr>
                                                      </table>
!                                                     </logic:present>
                                                  </td>
                                                  <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onchange="javascript: updateWaistHip();"/></td>                                                    
                                                  <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td>
!                                             </tr>
                                              <tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("WCDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WCMeasuringInstrc")%></font></td>
--- 1126,1159 ----
                                              
                                              <tr>
+                                                 <td class="dataEntryTable"><%=request.getAttribute("WHRBDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WHRBMeasuringInstrc")%></font></td>
+                                                 <td class="dataEntryTable" align="center">
+                                                     <logic:present name="WHRBLastData">
+                                                     <table cellpadding='0' cellspacing='0'>                                                            
+                                                     <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WHRBLDDate")%></td></tr>
+                                                     <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WHRBLastData")%></td></tr>
+                                                     </table>
+                                                     </logic:present>
+                                                 </td>
+                                                 <td class="dataEntryTable" align="center">
+                                                     <html:radio property="value(WHRBValue)" value="yes" />Yes
+                                                     <html:radio property="value(WHRBValue)" value="no" />No
+                                                     <a title="clear all" href="javascript:clearAll(MedAId, MedAId-1)">&nbsp <font style="text-decoration:underline; color:blue;">clr</font> </a>
+                                                 </td>                                                    
+                                                 <td class="dataEntryTable" align="center"><html:text property="value(WHRBComments)" size="30%" tabindex="9999"/></td>
+                                             </tr-->
+                                             
+                                             <!--tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("WHRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WHRMeasuringInstrc")%></font></td>
                                                  <td class="dataEntryTable" align="center">
!                                                     logic:present name="WHRLastData">
                                                      <table cellpadding='0' cellspacing='0'>                                                            
                                                      <tr><td class="eightyPercent" align="left"><%=request.getAttribute("WHRLDDate")%></td></tr>
                                                      <tr><td class="eightyPercent" align="right"><%=request.getAttribute("WHRLastData")%></td></tr>
                                                      </table>
!                                                     /logic:present>
                                                  </td>
                                                  <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onchange="javascript: updateWaistHip();"/></td>                                                    
                                                  <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td>
!                                             </tr-->
                                              <tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("WCDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WCMeasuringInstrc")%></font></td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form VTForm.xml,1.8,1.9

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

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

Modified Files:
	VTForm.xml 
Log Message:
added measurement type WHRB    "waist hip ratio boolean question"  



Index: VTForm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm.xml,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** VTForm.xml	30 Jan 2005 01:46:28 -0000	1.8
--- VTForm.xml	21 Mar 2005 18:33:23 -0000	1.9
***************
*** 44,47 ****
--- 44,59 ----
          </validationRule>
       </measurement>
+      
+      <measurement>
+         <type>WHRB</type>
+         <typeDesc>Waist Hip Ratio</typeDesc>
+         <typeDisplayName>Waist:hip</typeDisplayName>
+         <measuringInstrc>Waist/Hip ratio > 0.95 (if male) or > 0.90 (if female)?</measuringInstrc>
+         <validationRule>
+            <name>Yes/No</name>
+            <regularExp>YES|yes|Yes|Y|NO|no|No|N</regularExp>           
+         </validationRule>
+      </measurement>
+      
       <measurement>
          <type>WHR</type>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form VTForm2Osdsf.properties,1.6,1.7

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

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

Modified Files:
	VTForm2Osdsf.properties 
Log Message:
added WHRBValue=BWaistHipRatioExceedsThreshold



Index: VTForm2Osdsf.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTForm2Osdsf.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** VTForm2Osdsf.properties	31 Jan 2005 21:29:48 -0000	1.6
--- VTForm2Osdsf.properties	21 Mar 2005 18:19:24 -0000	1.7
***************
*** 110,111 ****
--- 110,114 ----
  
  HchlValue=BHypercholesterolemia
+ 
+ 
+ WHRBValue=BWaistHipRatioExceedsThreshold
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form VTFormFromOsdsf.properties,1.5,1.6

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

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

Modified Files:
	VTFormFromOsdsf.properties 
Log Message:
WHRBValue=B_WaistHipRatioExceedsThreshold



Index: VTFormFromOsdsf.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/VTFormFromOsdsf.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** VTFormFromOsdsf.properties	6 Jan 2005 21:40:43 -0000	1.5
--- VTFormFromOsdsf.properties	21 Mar 2005 18:15:52 -0000	1.6
***************
*** 95,96 ****
--- 95,99 ----
  
  HchlValue=B_Hypercholesterolemia
+ 
+ 
+ WHRBValue=B_WaistHipRatioExceedsThreshold

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.39,1.40

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
move hip Circ from long form to short form



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** formVTForm.jsp	16 Mar 2005 21:09:27 -0000	1.39
--- formVTForm.jsp	21 Mar 2005 17:33:35 -0000	1.40
***************
*** 1123,1126 ****
--- 1123,1128 ----
                                                  <td class="dataEntryTable" align="center"><html:text property="value(BPComments)" size="30%" tabindex="9999"/></td>
                                              </tr>
+                                                  
+                                             
                                              <tr>
                                                  <td class="dataEntryTable"><%=request.getAttribute("WHRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("WHRMeasuringInstrc")%></font></td>
***************
*** 1149,1168 ****
                                                  <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
                                              </tr>
                                              <tr>
                                                  <td colspan="5">
                                                      <table cellpadding="1" cellspacing="0" width="100%" style="display:none" id="detailVital">
!                                                         <tr>
!                                                             <td width="36%" 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="18%" class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"  onchange="javascript: updateWaistAndRatio();"/></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>
--- 1151,1173 ----
                                                  <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
                                              </tr>
+                                             <!--new-->
+                                             <tr>
+                                                 <td width="36%" 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="18%" class="dataEntryTable" align="center"><html:text property="value(HCValue)" size="5%"  onchange="javascript: updateWaistAndRatio();"/></td>                                                    
+                                                 <td width="33%" class="dataEntryTable" align="center"><html:text property="value(HCComments)" size="30%" tabindex="9999"/></td>
+                                             </tr>
+                                             
                                              <tr>
                                                  <td colspan="5">
                                                      <table cellpadding="1" cellspacing="0" width="100%" style="display:none" id="detailVital">
!                                                         
                                                          <tr>
                                                              <td class="dataEntryTable"><%=request.getAttribute("HRDisplay")%><br><font class="eightyPercent"><%=request.getAttribute("HRMeasuringInstrc")%></font></td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup AtividadeSaudeAction.java,1.2,1.3

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

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

Modified Files:
	AtividadeSaudeAction.java 
Log Message:
changed method call from perform to execute



Index: AtividadeSaudeAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/billing/popup/AtividadeSaudeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AtividadeSaudeAction.java	21 Jul 2004 14:13:26 -0000	1.2
--- AtividadeSaudeAction.java	20 Mar 2005 21:09:38 -0000	1.3
***************
*** 41,45 ****
      static Category cat = Category.getInstance(AtividadeSaudeAction.class.getName());
  
!     public ActionForward perform(ActionMapping mapping, ActionForm form,
          HttpServletRequest request, HttpServletResponse response) {
          ActionForward myforward = null;
--- 41,45 ----
      static Category cat = Category.getInstance(AtividadeSaudeAction.class.getName());
  
!     public ActionForward execute(ActionMapping mapping, ActionForm form,
          HttpServletRequest request, HttpServletResponse response) {
          ActionForward myforward = null;

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

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

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

Modified Files:
	billingReview.jsp 
Log Message:
updates to allow P030A to apply premium code



Index: billingReview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingReview.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** billingReview.jsp	21 Feb 2005 19:00:35 -0000	1.16
--- billingReview.jsp	20 Mar 2005 20:39:10 -0000	1.17
***************
*** 365,368 ****
--- 365,369 ----
                              otherdbcode1.compareTo("P031A")==0 || otherdbcode1.compareTo("Z552A")==0 || 
                              otherdbcode1.compareTo("P022A")==0 || otherdbcode1.compareTo("P023A")==0 || 
+                             otherdbcode1.compareTo("P030A")==0 ||
                              otherdbcode1.compareTo("Z716A")==0 || otherdbcode1.startsWith("S") || 
                              (otherdbcode1.endsWith("B") && !otherdbcode1.endsWith("C988B") && !otherdbcode1.endsWith("C998B") && !otherdbcode1.endsWith("C999B") ) ){
***************
*** 446,449 ****
--- 447,451 ----
                              otherdbcode2.compareTo("P031A")==0 || otherdbcode2.compareTo("Z552A")==0 || 
                              otherdbcode2.compareTo("P022A")==0 || otherdbcode2.compareTo("P023A")==0 || 
+                             otherdbcode2.compareTo("P030A")==0 ||
                              otherdbcode2.compareTo("Z716A")==0 || otherdbcode2.startsWith("S") || 
                              (otherdbcode2.endsWith("B") && !otherdbcode2.endsWith("C988B") && !otherdbcode2.endsWith("C998B") && !otherdbcode2.endsWith("C999B") ) ){
***************
*** 526,529 ****
--- 528,532 ----
                              otherdbcode3.compareTo("P031A")==0 || otherdbcode3.compareTo("Z552A")==0 || 
                              otherdbcode3.compareTo("P022A")==0 || otherdbcode3.compareTo("P023A")==0 || 
+                             otherdbcode3.compareTo("P030A")==0 ||
                              otherdbcode3.compareTo("Z716A")==0 || otherdbcode3.startsWith("S") || 
                              (otherdbcode3.endsWith("B") && !otherdbcode3.endsWith("C988B") && !otherdbcode3.endsWith("C998B") && !otherdbcode3.endsWith("C999B") ) ){
***************
*** 621,624 ****
--- 624,628 ----
                              scode.compareTo("P031A")==0 || scode.compareTo("Z552A")==0 || 
                              scode.compareTo("P022A")==0 || scode.compareTo("P023A")==0 || 
+                             scode.compareTo("P030A")==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 billingCorrectionValid.jsp,1.4,1.5

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

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

Modified Files:
	billingCorrectionValid.jsp 
Log Message:
Update to allow P030A premium 



Index: billingCorrectionValid.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingCorrectionValid.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** billingCorrectionValid.jsp	21 Feb 2005 19:11:06 -0000	1.4
--- billingCorrectionValid.jsp	20 Mar 2005 20:26:37 -0000	1.5
***************
*** 152,155 ****
--- 152,156 ----
                              scode.compareTo("P031A")==0 || scode.compareTo("Z552A")==0 || 
                              scode.compareTo("P022A")==0 || scode.compareTo("P023A")==0 || 
+                             scode.compareTo("P030A")==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 addEditServiceCode.jsp,1.3,1.4

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

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

Modified Files:
	addEditServiceCode.jsp 
Log Message:
add javascript to check the type in lower case/upper case

Index: addEditServiceCode.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/addEditServiceCode.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** addEditServiceCode.jsp	7 Mar 2005 21:35:28 -0000	1.3
--- addEditServiceCode.jsp	20 Mar 2005 00:32:38 -0000	1.4
***************
*** 177,186 ****
  		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;
--- 177,201 ----
  		function checkServiceCode() {
  	        var b = true;
! 	        if(document.forms[0].service_code.value.length!=5 || !isServiceCode(document.forms[0].service_code.value)){
  	            b = false;
! 	            alert ("You must type in a service code with 5 (upper case) letters/digits. The service code ends with \'A\' or \'B\'...");
  	        }
  	        return b;
  	    }
+     function isServiceCode(s){
+         // temp for 0.
+     	if(s.length==0) return true;
+     	if(s.length!=5) return false;
+         if((s.charAt(0) < "A") || (s.charAt(0) > "Z")) return false;
+         if((s.charAt(4) < "A") || (s.charAt(4) > "Z")) return false;
+ 
+         var i;
+         for (i = 1; i < s.length-1; i++){
+             // Check that current character is number.
+             var c = s.charAt(i);
+             if (((c < "0") || (c > "9"))) return false;
+         }
+         return true;
+     }
  		function checkAllFields() {
  	        var b = true;

[Oscarmcmaster-cvscommit] oscar_mcmaster/mdsFileManagement IncomingLabManagement.java,1.4,1.5

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16774

Modified Files:
	IncomingLabManagement.java 
Log Message:
changed checkForBusyFile call to prefix busy file with incoming directory



Index: IncomingLabManagement.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/IncomingLabManagement.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** IncomingLabManagement.java	9 Dec 2004 15:30:12 -0000	1.4
--- IncomingLabManagement.java	18 Mar 2005 18:58:26 -0000	1.5
***************
*** 99,103 ****
          IncomingMDSFiles inMDS = new IncomingMDSFiles();
                  
!         if (!inMDS.checkForBusyFile(busyFile) ){                                                //CHeck for "BUSY.TXT"
              
              logger.info("Busy File Not Found");
--- 99,103 ----
          IncomingMDSFiles inMDS = new IncomingMDSFiles();
                  
!         if (!inMDS.checkForBusyFile(incomingHL7dir+"/"+busyFile) ){                                                //CHeck for "BUSY.TXT"
              
              logger.info("Busy File Not Found");

[Oscarmcmaster-cvscommit] oscar_mcmaster/mdsFileManagement AuditLine.java,1.4,1.5

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

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15623

Modified Files:
	AuditLine.java 
Log Message:
changed end of the line character from \n to \n\r



Index: AuditLine.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/mdsFileManagement/AuditLine.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** AuditLine.java	29 Nov 2004 21:12:58 -0000	1.4
--- AuditLine.java	18 Mar 2005 18:56:07 -0000	1.5
***************
*** 33,37 ****
                 getPaddedString(orderingClient,8,bl)+delimiter+
                 getPaddedString(messageDate,11,bl)+delimiter+
!                getPaddedString(messageTime,8,bl)+"\n";             
     
  	}
--- 33,37 ----
                 getPaddedString(orderingClient,8,bl)+delimiter+
                 getPaddedString(messageDate,11,bl)+delimiter+
!                getPaddedString(messageTime,8,bl)+"\n\r";             
     
  	}

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

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

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

Modified Files:
	oscarResources_pt_BR.properties 
Log Message:
remove \'s from keys 
oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group
and 
oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes

These still need to be translated



Index: oscarResources_pt_BR.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_pt_BR.properties,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** oscarResources_pt_BR.properties	24 Feb 2005 15:50:53 -0000	1.96
--- oscarResources_pt_BR.properties	17 Mar 2005 20:09:15 -0000	1.97
***************
*** 3235,3240 ****
  oscarEncounter.oscarMeasurements.SelectMeasurementGroup.selectGroup=Please select a group to edit
  oscarEncounter.oscarMeasurements.MeasurementsAction.deleteBtn=Remover
! oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group=Please Select types and press Add button to add types into the group\ 
! oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes=Select types and press Delete button to delete types from the group\ 
  oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes=All Types
  oscarEncounter.Index.measurements.editMeasurementGroup=Edit Measurement Group
--- 3235,3240 ----
  oscarEncounter.oscarMeasurements.SelectMeasurementGroup.selectGroup=Please select a group to edit
  oscarEncounter.oscarMeasurements.MeasurementsAction.deleteBtn=Remover
! oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group=Please Select types and press Add button to add types into the group
! oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes=Select types and press Delete button to delete types from the group 
  oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes=All Types
  oscarEncounter.Index.measurements.editMeasurementGroup=Edit Measurement Group

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

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

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

Modified Files:
	oscarResources_en.properties 
Log Message:
removed \ 's from the end of 
oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes
oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes




Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.133
retrieving revision 1.134
diff -C2 -d -r1.133 -r1.134
*** oscarResources_en.properties	24 Feb 2005 15:50:07 -0000	1.133
--- oscarResources_en.properties	17 Mar 2005 20:07:10 -0000	1.134
***************
*** 3244,3249 ****
  oscarEncounter.oscarMeasurements.SelectMeasurementGroup.selectGroup=Please select a group to edit
  oscarEncounter.oscarMeasurements.MeasurementsAction.deleteBtn=Delete
! oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group=Please Select types and press Add button to add types into the group\
! oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes=Select types and press Delete button to delete types from the group\
  oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes=All Types
  oscarEncounter.Index.measurements.editMeasurementGroup=Edit Measurement Group
--- 3244,3249 ----
  oscarEncounter.oscarMeasurements.SelectMeasurementGroup.selectGroup=Please select a group to edit
  oscarEncounter.oscarMeasurements.MeasurementsAction.deleteBtn=Delete
! oscarEncounter.oscarMeasurements.MeasurementGroup.add2Group=Please Select types and press Add button to add types into the group
! oscarEncounter.oscarMeasurements.MeasurementGroup.deleteTypes=Select types and press Delete button to delete types from the group
  oscarEncounter.oscarMeasurements.MeasurementGroup.allTypes=All Types
  oscarEncounter.Index.measurements.editMeasurementGroup=Edit Measurement Group

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.38,1.39

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
restructured alot of html  hide more items by default



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** formVTForm.jsp	16 Mar 2005 14:40:17 -0000	1.38
--- formVTForm.jsp	16 Mar 2005 21:09:27 -0000	1.39
***************
*** 250,284 ****
  function showHideDetail(){
      showHideItem('subjective');
-     showHideItem('objective');
-     showHideItem('detailDiag');
-     showHideItem('plan');
-     showHideItem('detailVital');
-     showHideItem('detailHistory');
-     showHideItem('detailFT');
-     showHideItem('detailEye');
-     showHideItem('detailLab');
[...2322 lines suppressed...]
!                                                     <td class="dataEntryTable" align="center"><html:checkbox property="value(OthCValue)" /></td>
!                                                     <html:hidden property="value(OthCDate)"/>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(OthCComments)" size="45" tabindex="9999"/></td>
!                                                 </tr>
!                                             </table>                                                                                                            
!                                     </td>
!                                 </tr>                                
!                                 
!                                 
!                                 
!                             </table>
!                         </td>   
!                     </tr>
!                 </table>                    
              </td>
!         </tr>      
      </table>
!     <table class="Head" class="hidePrint" width="640">
          <tr>
              <td align="left">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.37,1.38

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
more condensing, now hide Foot and Eye Exam if they are blocked out



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -d -r1.37 -r1.38
*** formVTForm.jsp	16 Mar 2005 05:43:49 -0000	1.37
--- formVTForm.jsp	16 Mar 2005 14:40:17 -0000	1.38
***************
*** 240,243 ****
--- 240,251 ----
  }
  
+ function showItem(id){
+         document.getElementById(id).style.display = 'block'; 
+ }
+ 
+ function hideItem(id){
+         document.getElementById(id).style.display = 'none'; 
+ }
+ 
  function showHideDetail(){
      showHideItem('subjective');
***************
*** 270,274 ****
      showHideItem('medHead3');
      showHideItem('medHead4');
!     
      
      
--- 278,284 ----
      showHideItem('medHead3');
      showHideItem('medHead4');
!     showHideItem('vitalHead1');
!     showHideItem('vitalHead2');
!     showHideItem('vitalHead3');
      
      
***************
*** 585,593 ****
      if(document.forms[0].elements[DMValue].checked==false && document.forms[0].elements[PVDValue].checked==false){
          disableFTExam(true);
      }    
      else{
!         disableFTExam(false);        
      }    
      if(document.forms[0].elements[DMValue].checked==false){
          disableEyeExam(true);
          document.forms[0].elements[HbA1Value].disabled= true;
--- 595,606 ----
      if(document.forms[0].elements[DMValue].checked==false && document.forms[0].elements[PVDValue].checked==false){
          disableFTExam(true);
+         hideItem('examinationFoot');
      }    
      else{
!         disableFTExam(false);    
!         showItem('examinationFoot');
      }    
      if(document.forms[0].elements[DMValue].checked==false){
+         hideItem('examinationEye');
          disableEyeExam(true);
          document.forms[0].elements[HbA1Value].disabled= true;
***************
*** 599,602 ****
--- 612,616 ----
      }
      else{        
+         showItem('examinationEye');
          disableEyeExam(false);
          document.forms[0].elements[HbA1Value].disabled= false;
***************
*** 1061,1077 ****
                                              <td><table cellpadding='0' cellspacing='0' id="vital">                                                
                                                  <tr>
!                                                     <td class="subTitle" width="34%">                                                        
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data<br> Entered on
                                                      </td>
!                                                     <td class="subTitle" width="7%">
!                                                         New Data
                                                      </td>                                                    
!                                                     <td class="subTitle" width="10%">
                                                          Ob. Date<br> (yyyy-MM-dd)
!                                                     </td>
!                                                     <td class="subTitle" width="33%">
!                                                         <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
                                                      </td>                                                    
                                                  </tr>
--- 1075,1091 ----
                                              <td><table cellpadding='0' cellspacing='0' id="vital">                                                
                                                  <tr>
!                                                     <td class="subTitle" width="36%">                                                        
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         <span id="vitalHead1" style="display:none;" >Last Data<br> Entered on</span>
                                                      </td>
!                                                     <td class="subTitle" width="18%">
!                                                         <span id="vitalHead2" style="display:none;" >New Data</span>
                                                      </td>                                                    
!                                                     <!--td class="subTitle" width="10%">
                                                          Ob. Date<br> (yyyy-MM-dd)
!                                                     </td-->
!                                                     <td class="subTitle" width="30%">
!                                                         <span id="vitalHead3" style="display:none;" ><bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/></span>
                                                      </td>                                                    
                                                  </tr>
***************
*** 1085,1089 ****
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(BPValue)" size="5%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(BPDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(BPComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
--- 1099,1103 ----
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(BPValue)" size="5%" /></td>
!                                                     <!--td class="dataEntryTable" align="center">html:text property="value(BPDate)" size="10%" tabindex="9999"/</td-->
                                                      <td class="dataEntryTable" align="center"><html:text property="value(BPComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
***************
*** 1101,1105 ****
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onchange="javascript: updateWaistHip();"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
--- 1115,1119 ----
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRValue)" size="5%" onchange="javascript: updateWaistHip();"/></td>
!                                                     <!--td class="dataEntryTable" align="center">html:text property="value(WHRDate)" size="10%" tabindex="9999"/></td-->
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WHRComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
***************
*** 1117,1121 ****
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%" onchange="javascript: updateHipAndRatio();"/></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(WCDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
--- 1131,1135 ----
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCValue)" size="5%" onchange="javascript: updateHipAndRatio();"/></td>
!                                                     <!--td class="dataEntryTable" align="center">html:text property="value(WCDate)" size="10%" tabindex="9999"/></td-->
                                                      <td class="dataEntryTable" align="center"><html:text property="value(WCComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
***************
*** 1133,1137 ****
                                                      </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>
--- 1147,1151 ----
                                                      </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>
***************
*** 1146,1150 ****
                                                      </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>                                                 
--- 1160,1164 ----
                                                      </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>                                                 
***************
*** 1159,1163 ****
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HTValue)" size="5%" /></td>
!                                                     <td class="dataEntryTable" align="center"><html:text property="value(HTDate)" size="10%" tabindex="9999"/></td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HTComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
--- 1173,1177 ----
                                                      </td>
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HTValue)" size="5%" /></td>
!                                                     <!--td class="dataEntryTable" align="center">html:text property="value(HTDate)" size="10%" tabindex="9999"/></td-->
                                                      <td class="dataEntryTable" align="center"><html:text property="value(HTComments)" size="30%" tabindex="9999"/></td>
                                                   </tr>
***************
*** 1174,1178 ****
                                                      </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>                                                 
--- 1188,1192 ----
                                                      </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>                                                 
***************
*** 1182,1206 ****
                                              <th></th>
                                              <th class="title">
!                                             <span id="examLabel" style="display:none;"><a href="javascript: showHideItem('examination');" >Examination >> </a></span>
                                              </th>
                                          </tr>
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='0' cellspacing='0' id="examination" border="0">
                                                  <tr>
!                                                     <td class="subTitle" width="28%">                                                        
!                                                     </td>                                                    
!                                                     <td class="subTitle" width="17%">
!                                                         Last Data<br>Entered on
!                                                     </td>
!                                                     <td class="subTitle" width="22%">
!                                                         New Data
!                                                     </td>                                                    
!                                                     <td class="subTitle" width="10%">
!                                                         Ob. Date<br> (yyyy-MM-dd)
!                                                     </td>
!                                                     <td class="subTitle" width="23%">
!                                                         <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
!                                                     </td>                                                    
                                                  </tr>
                                                  <tr>
--- 1196,1212 ----
                                              <th></th>
                                              <th class="title">
!                                             <span id="examLabel" style="display:none;"><a href="javascript: showHideItem('examinationFoot'); showHideItem('examinationEye');" >Examination >> </a></span>
                                              </th>
                                          </tr>
                                           <tr>
                                              <td></td>
!                                             <td>
!                                                 <table cellpadding='0' cellspacing='0'  border="0" width="100%" id="examinationFoot">
                                                  <tr>
!                                                     <td class="subTitle" width="28%">&nbsp;</td>                                                    
!                                                     <td class="subTitle" width="17%">Last Data<br>Entered on</td>
!                                                     <td class="subTitle" width="22%">New Data</td>                                                    
!                                                     <td class="subTitle" width="10%">Ob. Date<br> (yyyy-MM-dd)</td>
!                                                     <td class="subTitle" width="23%"><bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/></td>                                                    
                                                  </tr>
                                                  <tr>
***************
*** 1336,1339 ****
--- 1342,1355 ----
                                                      <html:hidden property="value(FTReComments)" />
                                                   </tr>
+                                                  </table>
+                                                  <table cellpadding='0' cellspacing='0'  border="1" width="100%" id="examinationEye">
+                                                  <tr>
+                                                     <td class="subTitle" width="28%">&nbsp;</td>                                                    
+                                                     <td class="subTitle" width="17%">Last Data<br>Entered on</td>
+                                                     <td class="subTitle" width="22%">New Data</td>                                                    
+                                                     <td class="subTitle" width="10%">Ob. Date<br> (yyyy-MM-dd)</td>
+                                                     <td class="subTitle" width="23%"><bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/></td>                                                    
+                                                 </tr>
+                                                  
                                                   <tr>
                                                      <th class="dataEntryTable" colspan="3">Eye Exam</th>                                                    

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.36,1.37

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
More condensing of the form

including 
hiding the :
historyLabel, vitalsLabel, examLabel, labsLabel

psychHeadings 

Medical Adherence headings    



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** formVTForm.jsp	15 Mar 2005 14:35:32 -0000	1.36
--- formVTForm.jsp	16 Mar 2005 05:43:49 -0000	1.37
***************
*** 258,261 ****
--- 258,275 ----
      showHideItem('bigP');
      showHideItem('assessment');
+     showHideItem('historyLabel');
+     showHideItem('vitalsLabel');
+     showHideItem('examLabel');
+     showHideItem('labsLabel');
+     showHideItem('psychHead1');
+     showHideItem('psychHead2');
+     showHideItem('psychHead3');
+     showHideItem('psychHead4');    
+     showHideItem('medHead1');
+     showHideItem('medHead2');
+     showHideItem('medHead3');
+     showHideItem('medHead4');
+     
+     
      
  }
***************
*** 728,733 ****
                                          <tr>
                                              <th></th>
!                                             <th class="title" width="98%">
!                                             <a href="javascript: showHideItem('history');" >History >> </a>
                                              </th>
                                          </tr>                                         
--- 742,747 ----
                                          <tr>
                                              <th></th>
!                                             <th class="title" width="98%">                                            
!                                             <span id="historyLabel" style="display:none;"><a href="javascript: showHideItem('history');" >History >> </a></span>
                                              </th>
                                          </tr>                                         
***************
*** 751,760 ****
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='6'>
!                                                         Cigarette Smoking
                                                      </td>
                                                  </tr>
                                                  <tr>
                                                      <td class="subTitle" width="12%">
!                                                        &nbsp;
                                                      </td>
                                                      <td class="subTitle" width="15%">
--- 765,774 ----
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='6'>
!                                                         <!--Cigarette Smoking-->
                                                      </td>
                                                  </tr>
                                                  <tr>
                                                      <td class="subTitle" width="12%">
!                                                        Cigarette<br>Smoking
                                                      </td>
                                                      <td class="subTitle" width="15%">
***************
*** 812,830 ****
                                              <tr><td>
                                               <table cellpadding='1' cellspacing='0' width="100%">
!                                                 <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
                                                          Lifestyle
                                                      </td>
!                                                 </tr>
                                                  <tr>
!                                                     <td class="subTitle" width="39%">                                                        
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
                                                          Last Data
                                                      </td>
!                                                     <td class="subTitle" width="10%">
                                                          New Data
                                                      </td>                                                                                                        
!                                                     <td class="subTitle" width="35%">
                                                          <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
                                                      </td>                                                    
--- 826,845 ----
                                              <tr><td>
                                               <table cellpadding='1' cellspacing='0' width="100%">
!                                                 <!--tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
                                                          Lifestyle
                                                      </td>
!                                                 </tr-->
                                                  <tr>
!                                                     <td class="subTitle" width="36%" style="text-align:left">
!                                                         Lifestyle
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
                                                          Last Data
                                                      </td>
!                                                     <td class="subTitle" width="18%">
                                                          New Data
                                                      </td>                                                                                                        
!                                                     <td class="subTitle" width="30%">
                                                          <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
                                                      </td>                                                    
***************
*** 859,878 ****
                                              <tr><td>
                                               <table cellpadding='1' cellspacing='0' width="100%">
!                                                 <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
                                                          Psychosocial Screen
                                                      </td>
!                                                 </tr>
                                                  <tr>
!                                                     <td class="subTitle" width="36%">                                                        
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data
                                                      </td>
                                                      <td class="subTitle" width="18%">
!                                                         New Data
                                                      </td>                                                                                                        
                                                      <td class="subTitle" width="30%">
!                                                         <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
                                                      </td>                                                    
                                                  </tr>                                                
--- 874,896 ----
                                              <tr><td>
                                               <table cellpadding='1' cellspacing='0' width="100%">
!                                                 <!--tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
                                                          Psychosocial Screen
                                                      </td>
!                                                 </tr-->
                                                  <tr>
!                                                     <td class="subTitle" width="36%" style="text-align:left" >                                                        
!                                                     <span id="psychHead1" style="display:none;" >Psychosocial Screen</span
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         <span id="psychHead2" style="display:none;" >Last Data</span>
                                                      </td>
                                                      <td class="subTitle" width="18%">
!                                                         <span id="psychHead3" style="display:none;" >New Data</span>
                                                      </td>                                                                                                        
                                                      <td class="subTitle" width="30%">
!                                                         <span id="psychHead4" style="display:none;" >
!                                                             <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
!                                                         </span>
                                                      </td>                                                    
                                                  </tr>                                                
***************
*** 931,950 ****
                                              <tr><td>
                                               <table cellpadding='1' cellspacing='0' width="100%">
!                                                 <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
                                                          Medication Adherence screen
                                                      </td>
!                                                 </tr>
                                                  <tr>
!                                                     <td class="subTitle" width="36%">                                                        
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data
                                                      </td>
                                                      <td class="subTitle" width="18%">
!                                                         New Data
                                                      </td>                                                                                                        
                                                      <td class="subTitle" width="30%">
                                                          <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
                                                      </td>                                                    
                                                  </tr>                                                
--- 949,971 ----
                                              <tr><td>
                                               <table cellpadding='1' cellspacing='0' width="100%">
!                                                 <!--tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
                                                          Medication Adherence screen
                                                      </td>
!                                                 </tr-->
                                                  <tr>
!                                                     <td class="subTitle" width="36%" style="text-align:left">                                                        
!                                                         <span id="medHead1" style="display:none;" >Medication Adherence screen</span>
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         <span id="medHead2" style="display:none;" >Last Data</span>
                                                      </td>
                                                      <td class="subTitle" width="18%">
!                                                         <span id="medHead3" style="display:none;" >New Data</span>
                                                      </td>                                                                                                        
                                                      <td class="subTitle" width="30%">
+                                                         <span id="medHead4" style="display:none;" >
                                                          <bean:message key="oscarEncounter.oscarMeasurements.Measurements.headingComments"/>
+                                                         </span>
                                                      </td>                                                    
                                                  </tr>                                                
***************
*** 1032,1037 ****
                                          <tr>
                                              <th></th>
!                                             <th class="title">
!                                             <a href="javascript: showHideItem('vital');">Vitals >> </a>
                                              </th>
                                          </tr>                                        
--- 1053,1058 ----
                                          <tr>
                                              <th></th>
!                                             <th class="title">                                            
!                                             <span id="vitalsLabel" style="display:none;"><a href="javascript: showHideItem('vital');">Vitals >> </a></span>
                                              </th>
                                          </tr>                                        
***************
*** 1161,1170 ****
                                              <th></th>
                                              <th class="title">
!                                             <a href="javascript: showHideItem('examination');" >Examination >> </a>
                                              </th>
                                          </tr>
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='0' cellspacing='0' id="examination">
                                                  <tr>
                                                      <td class="subTitle" width="28%">                                                        
--- 1182,1191 ----
                                              <th></th>
                                              <th class="title">
!                                             <span id="examLabel" style="display:none;"><a href="javascript: showHideItem('examination');" >Examination >> </a></span>
                                              </th>
                                          </tr>
                                           <tr>
                                              <td></td>
!                                             <td><table cellpadding='0' cellspacing='0' id="examination" border="0">
                                                  <tr>
                                                      <td class="subTitle" width="28%">                                                        
***************
*** 1325,1329 ****
                                                      <td class="dataEntryTable"><%=request.getAttribute("iExDesc")%></td>   
                                                      <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0'>                                                            
                                                              <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iExLDDate")%></td></tr>
                                                              <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iExLastData")%></td></tr>
--- 1346,1350 ----
                                                      <td class="dataEntryTable"><%=request.getAttribute("iExDesc")%></td>   
                                                      <td class="dataEntryTable" align="center">
!                                                         <table cellpadding='0' cellspacing='0' border="0">         
                                                              <tr><td class="eightyPercent" align="left"><%=request.getAttribute("iExLDDate")%></td></tr>
                                                              <tr><td class="eightyPercent" align="right"><%=request.getAttribute("iExLastData")%></td></tr>
***************
*** 1419,1423 ****
                                              <th></th>
                                              <th class="title" widht="98%">
!                                             <a href="javascript: showHideItem('labs');" >Labs >> </a>
                                              </th>
                                          </tr>
--- 1440,1444 ----
                                              <th></th>
                                              <th class="title" widht="98%">
!                                             <span id="labsLabel" style="display:none;"><a href="javascript: showHideItem('labs');" >Labs >> </a></span>
                                              </th>
                                          </tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formVTForm.jsp,1.35,1.36

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

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

Modified Files:
	formVTForm.jsp 
Log Message:
Made Rows Smoking , Lifestyle , Psychosocial Screen, Medication Adherence screen 100% width

Removed "entered on" from heading to compact view



Index: formVTForm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formVTForm.jsp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** formVTForm.jsp	10 Mar 2005 19:45:51 -0000	1.35
--- formVTForm.jsp	15 Mar 2005 14:35:32 -0000	1.36
***************
*** 811,815 ****
                                              </table></td></tr>
                                              <tr><td>
!                                              <table cellpadding='1' cellspacing='0'>
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
--- 811,815 ----
                                              </table></td></tr>
                                              <tr><td>
!                                              <table cellpadding='1' cellspacing='0' width="100%">
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
***************
*** 858,862 ****
                                               </table></td></tr>
                                              <tr><td>
!                                              <table cellpadding='1' cellspacing='0'>
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
--- 858,862 ----
                                               </table></td></tr>
                                              <tr><td>
!                                              <table cellpadding='1' cellspacing='0' width="100%">
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
***************
*** 868,872 ****
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data<br> Entered on
                                                      </td>
                                                      <td class="subTitle" width="18%">
--- 868,872 ----
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data
                                                      </td>
                                                      <td class="subTitle" width="18%">
***************
*** 930,934 ****
                                               </table></td></tr>
                                              <tr><td>
!                                              <table cellpadding='1' cellspacing='0'>
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
--- 930,934 ----
                                               </table></td></tr>
                                              <tr><td>
!                                              <table cellpadding='1' cellspacing='0' width="100%">
                                                  <tr>
                                                      <td class="subTitle"  style="text-align:left" colspan='4'>
***************
*** 940,944 ****
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data<br> Entered on
                                                      </td>
                                                      <td class="subTitle" width="18%">
--- 940,944 ----
                                                      </td>                                                    
                                                      <td class="subTitle" width="16%">
!                                                         Last Data
                                                      </td>
                                                      <td class="subTitle" width="18%">