oscarmcmaster-cvscommit

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

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

Modified Files:
	FrmPDFServlet.java 
Log Message:
for form growth charts

Index: FrmPDFServlet.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pdfservlet/FrmPDFServlet.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** FrmPDFServlet.java	22 Mar 2005 23:57:13 -0000	1.7
--- FrmPDFServlet.java	3 Apr 2005 06:16:02 -0000	1.8
***************
*** 44,47 ****
--- 44,48 ----
  
  import oscar.form.graphic.FrmPdfGraphicAR;
+ import oscar.form.graphic.FrmPdfGraphicGrowthChart;
  
  import com.lowagie.text.Document;
***************
*** 73,78 ****
      }
  
!     public void doGet(HttpServletRequest req, HttpServletResponse res)
!             throws javax.servlet.ServletException, java.io.IOException {
          doPost(req, res);
      }
--- 74,79 ----
      }
  
!     public void doGet(HttpServletRequest req, HttpServletResponse res) throws javax.servlet.ServletException,
!             java.io.IOException {
          doPost(req, res);
      }
***************
*** 82,87 ****
       * @param resp HTTP response object
       */
!     public void doPost(HttpServletRequest req, HttpServletResponse res)
!             throws javax.servlet.ServletException, java.io.IOException {
          DocumentException ex = null;
  
--- 83,88 ----
       * @param resp HTTP response object
       */
!     public void doPost(HttpServletRequest req, HttpServletResponse res) throws javax.servlet.ServletException,
!             java.io.IOException {
          DocumentException ex = null;
  
***************
*** 128,133 ****
              res.setContentType("text/html");
              PrintWriter writer = res.getWriter();
!             writer.println("Exception from: " + this.getClass().getName() + " "
!                     + dex.getClass().getName() + "<br>");
              writer.println("<pre>");
              dex.printStackTrace(writer);
--- 129,133 ----
              res.setContentType("text/html");
              PrintWriter writer = res.getWriter();
!             writer.println("Exception from: " + this.getClass().getName() + " " + dex.getClass().getName() + "<br>");
              writer.println("<pre>");
              dex.printStackTrace(writer);
***************
*** 145,150 ****
       *
       */
!     protected ByteArrayOutputStream generatePDFDocumentBytes(final HttpServletRequest req,
!             final ServletContext ctx) throws DocumentException, java.io.IOException {
          final String PAGESIZE = "printPageSize";
          Document document = new Document();
--- 145,150 ----
       *
       */
!     protected ByteArrayOutputStream generatePDFDocumentBytes(final HttpServletRequest req, final ServletContext ctx)
!             throws DocumentException, java.io.IOException {
          final String PAGESIZE = "printPageSize";
          Document document = new Document();
***************
*** 158,171 ****
              writer = PdfWriter.getInstance(document, baosPDF);
  
!             String title = req.getParameter("__title") != null ? req.getParameter("__title")
!                     : "Unknown";
              String[] cfgFile = req.getParameterValues("__cfgfile");
!             String template = req.getParameter("__template") != null ? req
!                     .getParameter("__template")
!                     + ".pdf" : "";
!             //for page 1 picture only
!             String cfgGraphicFile = req.getParameter("__cfgGraphicFile") != null ? req
!                     .getParameter("__cfgGraphicFile")
!                     + ".txt" : "";
  
              int cfgFileNo = 0;
--- 158,164 ----
              writer = PdfWriter.getInstance(document, baosPDF);
  
!             String title = req.getParameter("__title") != null ? req.getParameter("__title") : "Unknown";
              String[] cfgFile = req.getParameterValues("__cfgfile");
!             String template = req.getParameter("__template") != null ? req.getParameter("__template") + ".pdf" : "";
  
              int cfgFileNo = 0;
***************
*** 182,186 ****
              }
  
!             Properties graphicCfg = cfgGraphicFile.equals("") ? null : getCfgProp(cfgGraphicFile);
  
              String[] cfgVal = null;
--- 175,190 ----
              }
  
!             //for page 1 picture only
!             String[] cfgGraphicFile = req.getParameterValues("__cfgGraphicFile");
!             int cfgGraphicFileNo = cfgGraphicFile == null ? 0 : cfgGraphicFile.length;
!             //System.out.println("processed page : " + cfgGraphicFileNo);
!             Properties[] graphicCfg = null;
!             if (cfgGraphicFileNo > 0) {
!                 graphicCfg = new Properties[cfgGraphicFileNo];
!                 for (int i = 0; i < cfgGraphicFileNo; i++) {
!                     cfgGraphicFile[i] += ".txt";
!                     graphicCfg[i] = getCfgProp(cfgGraphicFile[i]);
!                 }
!             }
  
              String[] cfgVal = null;
***************
*** 203,211 ****
              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();
--- 207,218 ----
              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();
***************
*** 233,238 ****
                  //System.err.println(cfgFileNo + "processed page " + i);
  
!                 BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252,
!                         BaseFont.NOT_EMBEDDED);
                  cb.setRGBColorStroke(0, 0, 255);
                  //cb.setFontAndSize(bf, 8);
--- 240,244 ----
                  //System.err.println(cfgFileNo + "processed page " + i);
  
!                 BaseFont bf = BaseFont.createFont(BaseFont.HELVETICA, BaseFont.CP1252, BaseFont.NOT_EMBEDDED);
                  cb.setRGBColorStroke(0, 0, 255);
                  //cb.setFontAndSize(bf, 8);
***************
*** 256,266 ****
                          // xxxxx xxxxx xxxx xxxxx xxxxxx xxxx xxxxxxx xxxxx
                          // xxxx", font));
!                         ct.setSimpleColumn(Integer.parseInt(cfgVal[1].trim()), (height - Integer
!                                 .parseInt(cfgVal[2].trim())), Integer.parseInt(cfgVal[7].trim()),
!                                 (height - Integer.parseInt(cfgVal[8].trim())), Integer
!                                         .parseInt(cfgVal[9].trim()), Element.ALIGN_LEFT);
!                         ct
!                                 .addText(new Phrase(12, props.getProperty(tempName.toString(), ""),
!                                         font)); // page size leading
                          // space between two
                          // lines
--- 262,271 ----
                          // xxxxx xxxxx xxxx xxxxx xxxxxx xxxx xxxxxxx xxxxx
                          // xxxx", font));
!                         ct.setSimpleColumn(Integer.parseInt(cfgVal[1].trim()), (height - Integer.parseInt(cfgVal[2]
!                                 .trim())), Integer.parseInt(cfgVal[7].trim()), (height - Integer.parseInt(cfgVal[8]
!                                 .trim())), Integer.parseInt(cfgVal[9].trim()), Element.ALIGN_LEFT);
!                         ct.addText(new Phrase(12, props.getProperty(tempName.toString(), ""), font)); // page
!                         // size
!                         // leading
                          // space between two
                          // lines
***************
*** 277,293 ****
                          // stroke the lines
                          cb.stroke();
!                     // write text directly
                      } else if (tempName.toString().startsWith("__")) {
                          cb.beginText();
                          cb.setFontAndSize(bf, Integer.parseInt(cfgVal[5].trim()));
                          cb
!                                 .showTextAligned(
!                                         (cfgVal[0].trim().equals("left") ? PdfContentByte.ALIGN_LEFT
!                                                 : (cfgVal[0].trim().equals("right") ? PdfContentByte.ALIGN_RIGHT
!                                                         : PdfContentByte.ALIGN_CENTER)),
!                                         (cfgVal.length >= 7 ? (cfgVal[6].trim()) : props.getProperty(tempName
!                                                 .toString(), "")), Integer.parseInt(cfgVal[1]
!                                                 .trim()), (height - Integer.parseInt(cfgVal[2]
!                                                 .trim())), 0);
                          cb.endText();
                      } else { // write prop text
--- 282,295 ----
                          // stroke the lines
                          cb.stroke();
!                         // write text directly
                      } else if (tempName.toString().startsWith("__")) {
                          cb.beginText();
                          cb.setFontAndSize(bf, Integer.parseInt(cfgVal[5].trim()));
                          cb
!                                 .showTextAligned((cfgVal[0].trim().equals("left") ? PdfContentByte.ALIGN_LEFT
!                                         : (cfgVal[0].trim().equals("right") ? PdfContentByte.ALIGN_RIGHT
!                                                 : PdfContentByte.ALIGN_CENTER)), (cfgVal.length >= 7 ? (cfgVal[6]
!                                         .trim()) : props.getProperty(tempName.toString(), "")), Integer
!                                         .parseInt(cfgVal[1].trim()), (height - Integer.parseInt(cfgVal[2].trim())), 0);
                          cb.endText();
                      } else { // write prop text
***************
*** 295,308 ****
                          cb.setFontAndSize(bf, Integer.parseInt(cfgVal[5].trim()));
                          cb
!                                 .showTextAligned(
!                                         (cfgVal[0].trim().equals("left") ? PdfContentByte.ALIGN_LEFT
!                                                 : (cfgVal[0].trim().equals("right") ? PdfContentByte.ALIGN_RIGHT
!                                                         : PdfContentByte.ALIGN_CENTER)),
!                                         (cfgVal.length >= 7 ? ((props.getProperty(
!                                                 tempName.toString(), "").equals("") ? ""
!                                                 : cfgVal[6].trim())) : props.getProperty(tempName
!                                                 .toString(), "")), Integer.parseInt(cfgVal[1]
!                                                 .trim()), (height - Integer.parseInt(cfgVal[2]
!                                                 .trim())), 0);
                          cb.endText();
                      }
--- 297,306 ----
                          cb.setFontAndSize(bf, Integer.parseInt(cfgVal[5].trim()));
                          cb
!                                 .showTextAligned((cfgVal[0].trim().equals("left") ? PdfContentByte.ALIGN_LEFT
!                                         : (cfgVal[0].trim().equals("right") ? PdfContentByte.ALIGN_RIGHT
!                                                 : PdfContentByte.ALIGN_CENTER)), (cfgVal.length >= 7 ? ((props
!                                         .getProperty(tempName.toString(), "").equals("") ? "" : cfgVal[6].trim()))
!                                         : props.getProperty(tempName.toString(), "")), Integer.parseInt(cfgVal[1]
!                                         .trim()), (height - Integer.parseInt(cfgVal[2].trim())), 0);
                          cb.endText();
                      }
***************
*** 310,315 ****
  
                  //graphic
!                 if (i == 1 && graphicCfg != null) {
!                     System.err.println("processed page " + i);
                      int origX = 0;
                      int origY = 0;
--- 308,314 ----
  
                  //graphic
!                 if (i == 1 && cfgGraphicFileNo > 0) {
!                     System.out.println("processed page " + i);
!                     boolean bFormAR = false;
                      int origX = 0;
                      int origY = 0;
***************
*** 325,386 ****
                      String className = null;
  
!                     Vector xDate = new Vector();
!                     Vector yHeight = new Vector();
  
!                     for (Enumeration e = graphicCfg.propertyNames(); e.hasMoreElements();) {
!                         tempName = new StringBuffer(e.nextElement().toString());
!                         tempValue = graphicCfg.getProperty(tempName.toString()).trim();
  
!                         if (tempName.toString().equals("__finalEDB"))
!                             fEDB = props.getProperty(tempValue);
!                         else if (tempName.toString().equals("__dateFormat"))
!                             dateFormat = tempValue;
!                         else if (tempName.toString().equals("__nMaxPixX"))
!                             nMaxPixX = tempValue;
!                         else if (tempName.toString().equals("__nMaxPixY"))
!                             nMaxPixY = tempValue;
!                         else if (tempName.toString().equals("__fStartX"))
!                             fStartX = tempValue;
!                         else if (tempName.toString().equals("__fEndX"))
!                             fEndX = tempValue;
!                         else if (tempName.toString().equals("__fStartY"))
!                             fStartY = tempValue;
!                         else if (tempName.toString().equals("__fEndY"))
!                             fEndY = tempValue;
!                         else if (tempName.toString().equals("__origX"))
!                             origX = Integer.parseInt(tempValue);
!                         else if (tempName.toString().equals("__origY"))
!                             origY = Integer.parseInt(tempValue);
!                         else if (tempName.toString().equals("__className"))
!                             className = tempValue;
!                         else {
!                             xDate.add(props.getProperty(tempName.toString()));
!                             yHeight.add(props.getProperty(tempValue));
!                         }
!                     }
  
!                     if (fEDB != null && fEDB.length() >= 8) {
!                         //make the graphic class
!                         FrmPdfGraphicAR myClass = new FrmPdfGraphicAR();
!                         myClass.init(nMaxPixX, nMaxPixY, fStartX, fEndX, fStartY, fEndY,
!                                 dateFormat, fEDB);
!                         Properties gProp = myClass.getGraphicXYProp(xDate, yHeight);
  
!                         //draw the pic
!                         cb.setLineWidth(1.5f);
!                         //cb.setRGBColorStrokeF(0f, 255f, 0f); //cb.circle(52f,
!                         // height - 751f, 1f);//cb.circle(52f, height - 609f,
!                         // 1f);
!                         for (Enumeration e = gProp.propertyNames(); e.hasMoreElements();) {
!                             tempName = new StringBuffer(e.nextElement().toString());
!                             tempValue = gProp.getProperty(tempName.toString(), "");
!                             if (tempValue.equals(""))
!                                 continue;
  
!                             cb.circle((origX + Float.parseFloat(tempName.toString())), (height
!                                     - origY + Float.parseFloat(tempValue)), 1.5f);
!                             cb.stroke();
                          }
!                     }
                  }
  
--- 324,408 ----
                      String className = null;
  
!                     for (int k = 0; k < cfgGraphicFileNo; k++) {
!                         Vector xDate = new Vector();
!                         Vector yHeight = new Vector();
  
!                         for (Enumeration e = graphicCfg[k].propertyNames(); e.hasMoreElements();) {
!                             tempName = new StringBuffer(e.nextElement().toString());
!                             tempValue = graphicCfg[k].getProperty(tempName.toString()).trim();
  
!                             if (tempName.toString().equals("__finalEDB")) {
!                                 bFormAR = true;
!                                 fEDB = props.getProperty(tempValue);
!                             } else if (tempName.toString().equals("__dateFormat"))
!                                 dateFormat = tempValue;
!                             else if (tempName.toString().equals("__nMaxPixX"))
!                                 nMaxPixX = tempValue;
!                             else if (tempName.toString().equals("__nMaxPixY"))
!                                 nMaxPixY = tempValue;
!                             else if (tempName.toString().equals("__fStartX"))
!                                 fStartX = tempValue;
!                             else if (tempName.toString().equals("__fEndX"))
!                                 fEndX = tempValue;
!                             else if (tempName.toString().equals("__fStartY"))
!                                 fStartY = tempValue;
!                             else if (tempName.toString().equals("__fEndY"))
!                                 fEndY = tempValue;
!                             else if (tempName.toString().equals("__origX"))
!                                 origX = Integer.parseInt(tempValue);
!                             else if (tempName.toString().equals("__origY"))
!                                 origY = Integer.parseInt(tempValue);
!                             else if (tempName.toString().equals("__className"))
!                                 className = tempValue;
!                             else {
!                                 xDate.add(props.getProperty(tempName.toString()));
!                                 yHeight.add(props.getProperty(tempValue));
!                             }
!                         } // end for read in
  
!                         if (fEDB != null && fEDB.length() >= 8) {
!                             //make the graphic class
!                             FrmPdfGraphicAR myClass = new FrmPdfGraphicAR();
!                             myClass.init(nMaxPixX, nMaxPixY, fStartX, fEndX, fStartY, fEndY, dateFormat, fEDB);
!                             Properties gProp = myClass.getGraphicXYProp(xDate, yHeight);
  
!                             //draw the pic
!                             cb.setLineWidth(1.5f);
!                             //cb.setRGBColorStrokeF(0f, 255f, 0f); //cb.circle(52f,
!                             // height - 751f, 1f);//cb.circle(52f, height - 609f,
!                             // 1f);
!                             for (Enumeration e = gProp.propertyNames(); e.hasMoreElements();) {
!                                 tempName = new StringBuffer(e.nextElement().toString());
!                                 tempValue = gProp.getProperty(tempName.toString(), "");
!                                 if (tempValue.equals(""))
!                                     continue;
  
!                                 cb.circle((origX + Float.parseFloat(tempName.toString())), (height - origY + Float
!                                         .parseFloat(tempValue)), 1.5f);
!                                 cb.stroke();
!                             }
                          }
! 
!                         // general chart
!                         if (!bFormAR) {
!                             //make the graphic class
!                             FrmPdfGraphicGrowthChart myClass = new FrmPdfGraphicGrowthChart();
!                             myClass.init(nMaxPixX, nMaxPixY, fStartX, fEndX, fStartY, fEndY);
!                             Properties gProp = myClass.getGraphicXYProp(xDate, yHeight);
! 
!                             //draw the pic
!                             cb.setLineWidth(1.5f);
!                             for (Enumeration e = gProp.propertyNames(); e.hasMoreElements();) {
!                                 tempName = new StringBuffer(e.nextElement().toString());
!                                 tempValue = gProp.getProperty(tempName.toString(), "");
!                                 if (tempValue.equals(""))
!                                     continue;
! 
!                                 cb.circle((origX + Float.parseFloat(tempName.toString())), (height - origY + Float
!                                         .parseFloat(tempValue)), 1.5f);
!                                 cb.stroke();
!                             }
!                         } // end of first pic
!                     } // end of for loop
                  }
  
***************
*** 408,417 ****
  
          try {
-             //InputStream is = cLoader.getResourceAsStream(cfgFilename);
              InputStream is = getServletContext().getResourceAsStream(propPath + cfgFilename);
- 
              if (is != null) {
                  ret.load(is);
- 
                  is.close();
              }
--- 430,436 ----
***************
*** 419,423 ****
              e.printStackTrace();
          }
- 
          return ret;
      }
--- 438,441 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/graphic FrmPdfGraphicGrowthChart.java,NONE,1.1

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

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

Added Files:
	FrmPdfGraphicGrowthChart.java 
Log Message:
for form growth charts

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

package oscar.form.graphic;

import java.util.Properties;
import java.util.Vector;

/**
 * Class FrmPdfGraphicGrowthChart : all pdf class files are temp. Need OO design
 */
public final class FrmPdfGraphicGrowthChart {

    public static void main(String[] arg) {
        FrmPdfGraphicGrowthChart test = new FrmPdfGraphicGrowthChart();
        test.init(50, 50, 20, 40, 15, 40);
        test.getGraphicXYProp("12/08/2004", "18.5");
    }

    float fEndX = 0f;
    float fEndY = 0f;
    float fStartX = 0f;
    float fStartY = 0f;
    int nMaxPixX = 0;
    int nMaxPixY = 0;
    Properties prop = new Properties();

    public String[] getGraphicXYProp(String xDate, String yHeight) {
        String[] ret = new String[2];
        float xNum = Float.parseFloat(xDate);
        float yNum = Float.parseFloat(yHeight);

        if (xNum < fStartX || xNum > fEndX || yNum < fStartY || yNum > fEndY)
            return null;

        float deltaX = nMaxPixX / (fEndX - fStartX);
        float deltaY = nMaxPixY / (fEndY - fStartY);
        xNum = deltaX * (xNum - fStartX);
        yNum = deltaY * (yNum - fStartY);

        ret[0] = "" + xNum;
        ret[1] = "" + yNum;
        System.out.println(xNum + " : " + yNum + "|" + deltaX + ":" + deltaY);
        return ret;
    }

    public Properties getGraphicXYProp(Vector xDate, Vector yHeight) {
        prop = new Properties();
        for (int i = 0; i < xDate.size(); i++) {
            System.out.println(i );
            if (xDate.get(i) != null && yHeight.get(i) != null && !"".equals((String) xDate.get(i))
                    && !"".equals((String) yHeight.get(i))) {
                System.out.println(i + " " + xDate.get(i) + " | " + yHeight.get(i));
                String[] xy = getGraphicXYProp((String) xDate.get(i), (String) yHeight.get(i));
                if (xy != null)
                    prop.setProperty(xy[0], xy[1]);
            }
        }
        return prop;
    }

    public void init(int mx, int my, float fsx, float fex, float fsy, float fey) {
        nMaxPixX = mx;
        nMaxPixY = my;
        fStartX = fsx;
        fEndX = fex;
        fStartY = fsy;
        fEndY = fey;
    }

    public void init(String mx, String my, String fsx, String fex, String fsy, String fey) {
        int tmx = isDigitNum(mx) ? Integer.parseInt(mx) : 0;
        int tmy = isDigitNum(my) ? Integer.parseInt(my) : 0;
        float tfsx = isDigitNum(fsx) ? Float.parseFloat(fsx) : 0f;
        float tfex = isDigitNum(fex) ? Float.parseFloat(fex) : 0f;
        float tfsy = isDigitNum(fsy) ? Float.parseFloat(fsy) : 0f;
        float tfey = isDigitNum(fey) ? Float.parseFloat(fey) : 0f;

        init(tmx, tmy, tfsx, tfex, tfsy, tfey);
    }

    private boolean isDigit(String str) {
        boolean ret = true;
        if (str == null || str.length() == 0)
            return false;

        int N = str.length();
        StringBuffer sb = new StringBuffer(N);
        for (int i = 0; i < N; i++) {
            char c = str.charAt(i);
            if (c >= '0' && c <= '9')
                continue;
            else {
                ret = false;
                break;
            }
        }
        return ret;
    }

    private boolean isDigitNum(String str) {
        boolean ret = true;
        if (str == null || str.length() == 0)
            return false;

        String[] sb = str.split("[0-9.]");
        if (sb.length > 0) {
            ret = false;
        }
        //System.out.println("array length is:" + sb.length);
        return ret;
    }
}

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON billingShortcutPg2.jsp,1.2,1.3 searchRefDoc.jsp,1.1,1.2 billingShortcutPg1.jsp,1.3,1.4 addEditRefDoc.jsp,1.1,1.2

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

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

Modified Files:
	billingShortcutPg2.jsp searchRefDoc.jsp billingShortcutPg1.jsp 
	addEditRefDoc.jsp 
Log Message:
for ON users - update hospital billing

Index: searchRefDoc.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/searchRefDoc.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** searchRefDoc.jsp	2 Apr 2005 19:46:51 -0000	1.1
--- searchRefDoc.jsp	3 Apr 2005 06:14:12 -0000	1.2
***************
*** 31,34 ****
--- 31,35 ----
    Properties prop = null;
    String param = request.getParameter("param")==null?"":request.getParameter("param") ;
+   String param2 = request.getParameter("param2")==null?"":request.getParameter("param2") ;
    String keyword = request.getParameter("keyword");
  
***************
*** 139,148 ****
  		  opener.<%=param%> = data;
  		}
  		function typeInData2(data1, data2) {
- 		  self.close();
  		  opener.<%=param%> = data1;
! 		  opener.<%=param%> = data2;
  		}
! 		<%}%>
  -->
  
--- 140,150 ----
  		  opener.<%=param%> = data;
  		}
+ 		<%if(param2.length()>0) {%>
  		function typeInData2(data1, data2) {
  		  opener.<%=param%> = data1;
! 		  opener.<%=param2%> = data2;
! 		  self.close();
  		}
! 		<%}}%>
  -->
  
***************
*** 175,178 ****
--- 177,181 ----
            </tr>
            <input type='hidden' name='param' value="<%=StringEscapeUtils.escapeHtml(param)%>">
+           <input type='hidden' name='param2' value="<%=StringEscapeUtils.escapeHtml(param2)%>">
          </form>
        </table>
***************
*** 217,224 ****
          	prop = (Properties) vec.get(i);
  			String bgColor = i%2==0?"#EEEEFF":"ivory";
          %>
  		<tr align="center"  bgcolor="<%=bgColor%>" align="center"
  onMouseOver="this.style.cursor='hand';this.style.backgroundColor='pink';" onMouseout="this.style.backgroundColor='<%=bgColor%>';"
! onClick="typeInData1('<%=prop.getProperty("referral_no", "")%>')" >
  		  <td><%=prop.getProperty("referral_no", "")%></td>
  		  <td><%=prop.getProperty("last_name", "")%></td>
--- 220,229 ----
          	prop = (Properties) vec.get(i);
  			String bgColor = i%2==0?"#EEEEFF":"ivory";
+ 			String strOnClick = param2.length()>0? "typeInData2('" + prop.getProperty("referral_no", "") + "','"+prop.getProperty("last_name", "")+ "," + prop.getProperty("first_name", "") + "')"
+ 				: "typeInData1('" + prop.getProperty("referral_no", "") + "')";
          %>
  		<tr align="center"  bgcolor="<%=bgColor%>" align="center"
  onMouseOver="this.style.cursor='hand';this.style.backgroundColor='pink';" onMouseout="this.style.backgroundColor='<%=bgColor%>';"
! onClick="<%=strOnClick%>" >
  		  <td><%=prop.getProperty("referral_no", "")%></td>
  		  <td><%=prop.getProperty("last_name", "")%></td>

Index: addEditRefDoc.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/addEditRefDoc.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** addEditRefDoc.jsp	2 Apr 2005 19:46:51 -0000	1.1
--- addEditRefDoc.jsp	3 Apr 2005 06:14:12 -0000	1.2
***************
*** 377,381 ****
--- 377,383 ----
              <td align="center" bgcolor="#CCCCFF" colspan="2">
                <input type="hidden" name="action" value='<%=action%>'>
+               <% if(!"search".equals(action)) {%>
                <input type="submit" name="submit" value="<bean:message key="admin.resourcebaseurl.btnSave"/>" onclick="javascript:return onSave();">
+               <% }%>
                <input type="button" name="Cancel" value="<bean:message key="admin.resourcebaseurl.btnExit"/>" onClick="window.close()">
              </td>

Index: billingShortcutPg2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg2.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** billingShortcutPg2.jsp	26 Mar 2005 19:09:25 -0000	1.2
--- billingShortcutPg2.jsp	3 Apr 2005 06:14:12 -0000	1.3
***************
*** 23,26 ****
--- 23,31 ----
    <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" />
  <%
+   if(request.getParameter("submit")!=null && "Back to Edit".equals(request.getParameter("button")  ) ) {
+ %>
+ <jsp:forward page="billingShortcutPg1.jsp" />
+ <%}%>
+ <%
    String            clinicview        = oscarVariables.getProperty("clinic_view", "");
    String            clinicNo          = oscarVariables.getProperty("clinic_no", "");
***************
*** 43,47 ****
  
    BillingONDataHelp dbObj             = new BillingONDataHelp();
!   String            msg               = "The calculation:<br>";
    String            action            = "edit";
    Properties        propHist          = null;
--- 48,52 ----
  
    BillingONDataHelp dbObj             = new BillingONDataHelp();
!   String            msg               = "<tr><td colspan='2'>Calculation</td></tr>";
    String            action            = "edit";
    Properties        propHist          = null;
***************
*** 215,219 ****
      	if(i==rulePercLabelNum) bdPercBase = bdTotal;
  System.out.println(i + " :" + price + " x " + unit + " = " + bdTotal);
! 		msg += vecServiceCode.get(i) + ": + " + price + " x " + unit + " = " + bdTotal + "<br>";
  	}
  	if(vecServiceCodePerc.size()>1) {
--- 220,224 ----
      	if(i==rulePercLabelNum) bdPercBase = bdTotal;
  System.out.println(i + " :" + price + " x " + unit + " = " + bdTotal);
! 		msg += "<tr bgcolor='#EEEEFF'><td align='right' width='20%'>" + vecServiceCode.get(i) + " ("+Math.round(unit.floatValue())+")</td><td align='right'>" + (i==0?"":" + ") + price + " x " + unit + " = " + bdTotal + "</td></tr>";
  	}
  	if(vecServiceCodePerc.size()>1) {
***************
*** 226,230 ****
  		bdPerc = bdPercBase.multiply(perc).setScale(2, BigDecimal.ROUND_HALF_UP);
  System.out.println("Percentage :" + bdPercBase + " x " + perc + " = " + bdPerc);
! 		msg += "Percentage :" + bdPercBase + " x " + perc + " = " + bdPerc + "<br>";
  		// adjust perc by min/max
  		if(bLimit) {
--- 231,235 ----
  		bdPerc = bdPercBase.multiply(perc).setScale(2, BigDecimal.ROUND_HALF_UP);
  System.out.println("Percentage :" + bdPercBase + " x " + perc + " = " + bdPerc);
! 		msg += "<tr bgcolor='#EEEEFF'><td align='right'>"+vecServiceCodePerc.get(0)+" (1)</td><td align='right'>Percentage : " + bdPercBase + " x " + perc + " = " + bdPerc + "</td></tr>";
  		// adjust perc by min/max
  		if(bLimit) {
***************
*** 232,236 ****
  			bdPerc = bdPerc.max(new BigDecimal(Double.parseDouble(minFee) ).setScale(2, BigDecimal.ROUND_HALF_UP) );
  System.out.println("Adjust to (" + minFee + ", " + maxFee + "): " + bdPerc);
! 		msg += "Adjust to (" + minFee + ", " + maxFee + "): " + bdPerc + "<br>";
  		}
      	bdTotal = bdTotal.add(bdPerc);
--- 237,241 ----
  			bdPerc = bdPerc.max(new BigDecimal(Double.parseDouble(minFee) ).setScale(2, BigDecimal.ROUND_HALF_UP) );
  System.out.println("Adjust to (" + minFee + ", " + maxFee + "): " + bdPerc);
! 		msg += "<tr bgcolor='ivory'><td align='right' colspan='2'>Adjust to (" + minFee + ", " + maxFee + "): </td><td align='right'>" + bdPerc + "</td></tr>";
  		}
      	bdTotal = bdTotal.add(bdPerc);
***************
*** 239,244 ****
      total = "" + bdTotal;
      System.out.println("***************total****************:" + bdTotal);
! 		msg += "Total: " + bdTotal + "<br>";
! 		msg += "<input type=\"button\" name=\"submit\" value=\" Re-Edit \" onclick=\"history.go(-1)\" />";
  	// referral
      content = "";
--- 244,248 ----
      total = "" + bdTotal;
      System.out.println("***************total****************:" + bdTotal);
! 		msg += "<tr><td align='right' colspan='2'>Total: " + bdTotal + "</td></tr>";
  	// referral
      content = "";
***************
*** 272,276 ****
  			param[9]= tempDate[k] ; // parse(billingDate) ;//request.getParameter("appointment_date");
  			param[10]=request.getParameter("start_time");
! 			param[11]=request.getParameter("xml_location"); //request.getParameter("clinic_ref_code");
  			param[12]=content; //request.getParameter("content");
  			param[13]=total; // calculate total; //request.getParameter("total");
--- 276,280 ----
  			param[9]= tempDate[k] ; // parse(billingDate) ;//request.getParameter("appointment_date");
  			param[10]=request.getParameter("start_time");
! 			param[11]=request.getParameter("xml_location").substring(0,request.getParameter("xml_location").indexOf("|")).trim(); //request.getParameter("clinic_ref_code");
  			param[12]=content; //request.getParameter("content");
  			param[13]=total; // calculate total; //request.getParameter("total");
***************
*** 342,346 ****
  
    // create msg
!   msg += errorMsg + warningMsg;
  System.out.println(" * ******************************" + sql);
  
--- 346,351 ----
  
    // create msg
!   String wrongMsg = errorMsg + warningMsg;
!   //msg += errorMsg + warningMsg;
  System.out.println(" * ******************************" + sql);
  
***************
*** 349,362 ****
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
!   <title>OscarBilling - shortcut</title>
!   <!-- calendar stylesheet -->
!   <link rel="stylesheet" type="text/css" media="all" href="../../../share/calendar/calendar.css" title="win2k-cold-1" />
!   <!-- main calendar program -->
!   <script type="text/javascript" src="../../../share/calendar/calendar.js"></script>
!   <!-- language for the calendar -->
!   <script type="text/javascript" src="../../../share/calendar/lang/calendar-en.js"></script>
!   <!-- the following script defines the Calendar.setup helper function, which makes
!        adding a calendar a matter of 1 or 2 lines of code. -->
!   <script type="text/javascript" src="../../../share/calendar/calendar-setup.js"></script>
  	<script language="JavaScript">
  	<!--
--- 354,358 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
!   <title>OscarBilling</title>
  	<script language="JavaScript">
  	<!--
***************
*** 366,370 ****
  	        if(ret==true)
  	        {
! 	            ret = confirm("Are you sure you want to save this form?");
  	        }
  	        return ret;
--- 362,366 ----
  	        if(ret==true)
  	        {
! 	            ret = confirm("Are you sure you want to do the action?");
  	        }
  	        return ret;
***************
*** 382,389 ****
            <table border="0" cellspacing="0" cellpadding="0" width="100%">
              <tr><td>
!           	<b>OscarBilling </b>
          	</td>
  			<td align="right">
-             <input type="submit" name="submit" value="Save" />
              <input type="hidden" name="addition" value="Confirm" />
              </td>
--- 378,384 ----
            <table border="0" cellspacing="0" cellpadding="0" width="100%">
              <tr><td>
!           	<b>Confirmation </b>
          	</td>
  			<td align="right">
              <input type="hidden" name="addition" value="Confirm" />
              </td>
***************
*** 397,408 ****
              <tr bgcolor="#33CCCC">
                <td nowrap bgcolor="#FFCC99" width="10%" align="center">
!                 <%= demoname %>
                </td>
!               <td bgcolor="#99CCCC" align="center">
!                 <font color="black"><%= msg %></font>
                </td>
              </tr>
            </table>
  
  <%
  	for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) {
--- 392,489 ----
              <tr bgcolor="#33CCCC">
                <td nowrap bgcolor="#FFCC99" width="10%" align="center">
!                 <%= demoname %> <%= demoSex.equals("1")?"Male":"Female" %> <%= " DOB: " + demoDOBYY + "/" + demoDOBMM + "/" + demoDOBDD + " HIN: " + demoHIN %>
                </td>
!               <td bgcolor="#99CCCC" align="center"><%= wrongMsg %>
                </td>
              </tr>
            </table>
  
+           <table border="1" cellspacing="0" cellpadding="0" width="100%" bordercolorlight="#99A005" bordercolordark="#FFFFFF" bgcolor="#FFFFFF">
+             <tr >
+               <td width="50%">
+ 
+               <table border="1" cellspacing="2" cellpadding="0" width="100%" bordercolorlight="#99A005" bordercolordark="#FFFFFF" bgcolor="ivory">
+               <tr><td nowrap width="30%" align="center" valign="top">
+                 <b>Service Date</b><br>
+                 <%=request.getParameter("billDate").replaceAll("\\n", "<br>")%>
+               </td>
+               <td align="center" width="33%">
+                 <b>Diagnostic Code</b><br>
+                 <%=request.getParameter("dxCode")%>
+                 <hr>
+ 	                <b>Cal.% mode</b><br>
+ 					<%=request.getParameter("rulePerc")%>
+               </td>
+               <td valign="top">
+                 <b>Refer. Doctor</b><br><%=request.getParameter("referralDocName")%><br>
+                 <b>Refer. Doctor #</b><br><%=request.getParameter("referralCode")%>
+               </td>
+               </tr>
+               </table>
+ 
+               </td><td valign="top">
+ 
+               <table border="1" cellspacing="2" cellpadding="0" width="100%" bordercolorlight="#99A005" bordercolordark="#FFFFFF" bgcolor="#EEEEFF">
+               <tr><td nowrap width="30%">
+ 				<b>Billing Physician</b></td>
+ 				<td width="20%">
+ 				<%=providerBean.getProperty(request.getParameter("xml_provider"), "")%></td>
+ 				<td nowrap width="30%"><b>Assig. Physician</b></td>
+ 				<td width="20%"><%=providerBean.getProperty(assgProvider_no, "")%>
+               	</td>
+               </tr>
+               <tr>
+ 
+ 				<td width="30%"><b>Visit Type</b></td>
+ 				<td width="20%">
+ 				<%=request.getParameter("xml_visittype").substring(request.getParameter("xml_visittype").indexOf("|")+1)%>
+ 				</td>
+ 
+ 				<td width="30%"><b>Billing Type</b></td>
+ 				<td width="20%">
+ 				<%=request.getParameter("xml_billtype").substring(request.getParameter("xml_billtype").indexOf("|")+1)%>
+ 				</td>
+               </tr>
+               <tr>
+ 				<td><b>Visit Location</b></td>
+ 				<td colspan="3">
+ 				<%=request.getParameter("xml_location").substring(request.getParameter("xml_location").indexOf("|")+1)%></td>
+               </tr>
+               <tr>
+ 				<td><b>Admission Date</b></td>
+ 				<td >
+ 				<%=request.getParameter("xml_vdate")%>
+ 				</td>
+ 				<td colspan="2">
+ 				</td>
+ 
+               </tr>
+               </table>
+ 
+ 
+               </td>
+             </tr>
+           </table>
+ 
+         </td>
+ 
+       </tr>
+       <tr><td align="center">
+ 			<table border = "1" width="50%" bordercolorlight="#99A005" bordercolordark="#FFFFFF">
+ 
+                 <%= msg %>
+ 
+ 			  <tr>
+ 
+                 <td colspan='2' align='center' bgcolor="silver">
+                 <input type="submit" name="button" value="Back to Edit"  style="width: 120px;" />
+                 <input type="submit" name="submit" value="Save"  style="width: 120px;"/>
+ 				</td>
+               </tr>
+             </table>
+ 		</td>
+ 	  </tr>
+ 
+ 
  <%
  	for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) {

Index: billingShortcutPg1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg1.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** billingShortcutPg1.jsp	2 Apr 2005 19:46:51 -0000	1.3
--- billingShortcutPg1.jsp	3 Apr 2005 06:14:12 -0000	1.4
***************
*** 305,308 ****
--- 305,310 ----
  <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
+ <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="PRIVATE">
+ <META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=UTF-8">
    <title>OscarBilling - shortcut</title>
    <!-- calendar stylesheet -->
***************
*** 437,445 ****
    args="width="+w+",height="+h+",resizable=yes,scrollbars=yes,status=0,top=60,left=30";
    remote=window.open(u,n,args);
!   if (remote != null) {
!     if (remote.opener == null)
!       remote.opener = self;
!   }
!   if (x == 1) { return remote; }
  }
  var awnd=null;
--- 439,447 ----
    args="width="+w+",height="+h+",resizable=yes,scrollbars=yes,status=0,top=60,left=30";
    remote=window.open(u,n,args);
!   //if (remote != null) {
!   //  if (remote.opener == null)
!   //    remote.opener = self;
!   //}
!   //if (x == 1) { return remote; }
  }
  var awnd=null;
***************
*** 452,455 ****
--- 454,464 ----
       awnd.focus();
  }
+ function referralScriptAttach2(elementName, name2) {
+      var d = elementName;
+      t0 = escape("document.forms[0].elements[\'"+d+"\'].value");
+      t1 = escape("document.forms[0].elements[\'"+name2+"\'].value");
+      rs('att',('searchRefDoc.jsp?param='+t0+'&param2='+t1),600,600,1);
+      //awnd.focus();
+ }
  
  //-->
***************
*** 548,568 ****
                <tr><td nowrap width="30%" align="center">
                  <a id="trigger" href="#">[Service Date]</a><br>
!                 <textarea name="billDate" cols="11" rows="5" readonly></textarea>
                </td>
                <td align="center" width="33%">
                  Service Code x Unit<br>
!                 <input type="text" name="serviceDate0" size="5" maxlength="5" value="">x<input type="text" name="serviceUnit0" size="2" maxlength="2" value=""><br>
!                 <input type="text" name="serviceDate1" size="5" maxlength="5" value="">x<input type="text" name="serviceUnit1" size="2" maxlength="2" value=""><br>
!                 <input type="text" name="serviceDate2" size="5" maxlength="5" value="">x<input type="text" name="serviceUnit2" size="2" maxlength="2" value=""><br>
                </td>
                <td valign="top">
                	<table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td>
  	                <a href="#" onClick="showHideLayers('Layer2','','show','Layer1','','hide'); return false;">Dx</a><br>
! 	                <input type="text" name="dxCode" size="5" maxlength="5" value="<%=dxCode%>">
  	                </td><td>
  	                Cal.% mode<br>
  					<select name="rulePerc" >
! 					<option value="onlyAboveCode" >Only Above</option>
! 					<option value="allAboveCode" >All</option>
  	                </select>
  	                </td></tr>
--- 557,581 ----
                <tr><td nowrap width="30%" align="center">
                  <a id="trigger" href="#">[Service Date]</a><br>
!                 <textarea name="billDate" cols="11" rows="5" readonly><%=request.getParameter("billDate")!=null?request.getParameter("billDate"):""%></textarea>
                </td>
                <td align="center" width="33%">
                  Service Code x Unit<br>
!                 <input type="text" name="serviceDate0" size="5" maxlength="5" value="<%=request.getParameter("serviceDate0")!=null?request.getParameter("serviceDate0"):""%>">x
!                 <input type="text" name="serviceUnit0" size="2" maxlength="2" style="width=20px" value="<%=request.getParameter("serviceUnit0")!=null?request.getParameter("serviceUnit0"):""%>"><br>
!                 <input type="text" name="serviceDate1" size="5" maxlength="5" value="<%=request.getParameter("serviceDate1")!=null?request.getParameter("serviceDate1"):""%>">x
!                 <input type="text" name="serviceUnit1" size="2" maxlength="2" style="width=20px" value="<%=request.getParameter("serviceUnit1")!=null?request.getParameter("serviceUnit1"):""%>"><br>
!                 <input type="text" name="serviceDate2" size="5" maxlength="5" value="<%=request.getParameter("serviceDate2")!=null?request.getParameter("serviceDate2"):""%>">x
!                 <input type="text" name="serviceUnit2" size="2" maxlength="2" style="width=20px" value="<%=request.getParameter("serviceUnit2")!=null?request.getParameter("serviceUnit2"):""%>"><br>
                </td>
                <td valign="top">
                	<table border="0" cellspacing="0" cellpadding="0" width="100%"><tr><td>
  	                <a href="#" onClick="showHideLayers('Layer2','','show','Layer1','','hide'); return false;">Dx</a><br>
! 	                <input type="text" name="dxCode" size="5" maxlength="5" value="<%=request.getParameter("dxCode")!=null?request.getParameter("dxCode"):dxCode%>">
  	                </td><td>
  	                Cal.% mode<br>
  					<select name="rulePerc" >
! 					<% String rulePerc= request.getParameter("rulePerc")!=null?request.getParameter("rulePerc"):""; %>
! 					<option value="onlyAboveCode" <%="onlyAboveCode".equals(rulePerc)?"selected":""%> >Only Above</option>
! 					<option value="allAboveCode" <%="allAboveCode".equals(rulePerc)?"selected":""%> >All</option>
  	                </select>
  	                </td></tr>
***************
*** 570,576 ****
  
                  <hr>
!                 Refer. Doctor<br>
!                 <input type="text" name="referralCode" size="5" maxlength="6" value="<%=r_doctor_ohip%>" title="<%=r_doctor%>">
!                 <a href="javascript:referralScriptAttach('referralCode')">Code search</a>
                </td>
                </tr>
--- 583,589 ----
  
                  <hr>
!                 <a href="javascript:referralScriptAttach2('referralCode','referralDocName')">Refer. Doctor #</a>
!                 <input type="text" name="referralCode" size="5" maxlength="6" value="<%=request.getParameter("referralCode")!=null?request.getParameter("referralCode"):r_doctor_ohip%>" ><br>
!                 <input type="text" name="referralDocName" size="22" maxlength="30" value="<%=request.getParameter("referralDocName")!=null?request.getParameter("referralDocName"):r_doctor%>" >
                </td>
                </tr>
***************
*** 609,618 ****
  				<td width="20%">
  				<select name="xml_visittype" datafld='xml_visittype'>
! 					<option value="00| Clinic Visit" <%=visitType.equals("00")?"selected":""%>>00 | Clinic Visit</option>
! 					<option value="01| Outpatient Visit" <%=visitType.equals("01")?"selected":""%>>01 | Outpatient Visit</option>
! 					<option value="02| Hospital Visit" <%=visitType.equals("02")?"selected":""%>>02 | Hospital Visit</option>
! 					<option value="03| ER" <%=visitType.equals("03")?"selected":""%>>03 | ER</option>
! 					<option value="04| Nursing Home" <%=visitType.equals("04")?"selected":""%>>04 | Nursing Home</option>
! 					<option value="05| Home Visit" <%=visitType.equals("05")?"selected":""%>>05 | Home Visit</option>
  				</select>
  				</td>
--- 622,631 ----
  				<td width="20%">
  				<select name="xml_visittype" datafld='xml_visittype'>
! 					<option value="00| Clinic Visit" <%=visitType.startsWith("00")?"selected":""%>>00 | Clinic Visit</option>
! 					<option value="01| Outpatient Visit" <%=visitType.startsWith("01")?"selected":""%>>01 | Outpatient Visit</option>
! 					<option value="02| Hospital Visit" <%=visitType.startsWith("02")?"selected":""%>>02 | Hospital Visit</option>
! 					<option value="03| ER" <%=visitType.startsWith("03")?"selected":""%>>03 | ER</option>
! 					<option value="04| Nursing Home" <%=visitType.startsWith("04")?"selected":""%>>04 | Nursing Home</option>
! 					<option value="05| Home Visit" <%=visitType.startsWith("05")?"selected":""%>>05 | Home Visit</option>
  				</select>
  				</td>
***************
*** 620,627 ****
  				<td width="30%"><b>Billing Type</b></td>
  				<td width="20%">
  				<select name="xml_billtype" datafld='xml_billtype' >
! 					<option value="ODP | Bill OHIP" selected>Bill OHIP</option>
! 					<option value="PAT | Bill Patient">Bill Patient</option>
! 					<option value="WCB | Worker's Compensation Board">WSIB</option>
  				</select>
  				</td>
--- 633,641 ----
  				<td width="30%"><b>Billing Type</b></td>
  				<td width="20%">
+ 				<% String srtBillType = request.getParameter("xml_billtype")!=null? request.getParameter("xml_billtype"):""; %>
  				<select name="xml_billtype" datafld='xml_billtype' >
! 					<option value="ODP | Bill OHIP" <%=srtBillType.startsWith("ODP")?"selected" : ""%> >Bill OHIP</option>
! 					<option value="PAT | Bill Patient" <%=srtBillType.startsWith("PAT")?"selected" : ""%>>Bill Patient</option>
! 					<option value="WCB | Worker's Compensation Board" <%=srtBillType.startsWith("WCB")?"selected" : ""%>>WSIB</option>
  				</select>
  				</td>
***************
*** 630,639 ****
  				<td><b>Visit Location</b></td>
  				<td colspan="3">
! 				<select name="xml_location" datafld='xml_location'>
  				<%
  				for(int i=0; i<vecLocation.size(); i++) {
  					propT = (Properties) vecLocation.get(i);
  				%>
! 					<option value="<%=propT.getProperty("clinic_location_no") + "|" + propT.getProperty("clinic_location_name")%>" <%=clinicview.equals(propT.getProperty("clinic_location_no"))?"selected":""%>>
  					<%=propT.getProperty("clinic_location_name")%></option>
  				<%
--- 644,654 ----
  				<td><b>Visit Location</b></td>
  				<td colspan="3">
! 				<select name="xml_location">
  				<%
  				for(int i=0; i<vecLocation.size(); i++) {
  					propT = (Properties) vecLocation.get(i);
+ 					String strLocation = request.getParameter("xml_location")!=null? request.getParameter("xml_location"):clinicview;
  				%>
! 					<option value="<%=propT.getProperty("clinic_location_no") + "|" + propT.getProperty("clinic_location_name")%>" <%=strLocation.startsWith(propT.getProperty("clinic_location_no"))?"selected":""%>>
  					<%=propT.getProperty("clinic_location_name")%></option>
  				<%
***************
*** 645,649 ****
  				<td><b>Admission Date</b></td>
  				<td >
! 				<input type="text" name="xml_vdate" value="<%=visitdate%>" size='10' maxlength='10' readonly>
                	<img src="../../../images/cal.gif" id="xml_vdate_cal">
  				</td>
--- 660,664 ----
  				<td><b>Admission Date</b></td>
  				<td >
! 				<input type="text" name="xml_vdate" value="<%=request.getParameter("xml_vdate")!=null? request.getParameter("xml_vdate"):visitdate%>" size='10' maxlength='10' readonly>
                	<img src="../../../images/cal.gif" id="xml_vdate_cal">
  				</td>
***************
*** 694,700 ****
  			<tr bgcolor=<%=i%2==0?"#FFFFFF":"#EEEEFF"%>>
  				<td nowrap>
! 				<input type="checkbox" name="code_xml_<%=serviceCode%>" value="checked" >
  				<b><font size="-1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>
! 				<input type="text" name="unit_xml_<%=serviceCode%>" value="" size="1" maxlength="2" style="width:20px; height:20px;">
  				</td>
  				<td <%=serviceDesc.length()>30?"title=\""+serviceDesc+"\"":""%>><font size="-1" ><%=serviceDesc.length()>30?serviceDesc.substring(0,30)+"...":serviceDesc%>
--- 709,715 ----
  			<tr bgcolor=<%=i%2==0?"#FFFFFF":"#EEEEFF"%>>
  				<td nowrap>
! 				<input type="checkbox" name="code_xml_<%=serviceCode%>" value="checked" <%="checked".equals(request.getParameter("code_xml_"+serviceCode))? "checked":""%>>
  				<b><font size="-1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>
! 				<input type="text" name="unit_xml_<%=serviceCode%>" value="<%=request.getParameter("unit_xml_"+serviceCode)!=null? request.getParameter("unit_xml_"+serviceCode):""%>" size="1" maxlength="2" style="width:20px; height:20px;">
  				</td>
  				<td <%=serviceDesc.length()>30?"title=\""+serviceDesc+"\"":""%>><font size="-1" ><%=serviceDesc.length()>30?serviceDesc.substring(0,30)+"...":serviceDesc%>
***************
*** 737,743 ****
  			<tr bgcolor=<%=i%2==0?"#FFFFFF":"#EEEEFF"%>>
  				<td nowrap>
! 				<input type="checkbox" name="code_xml_<%=serviceCode%>" value="checked" >
  				<b><font size="-1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>
! 				<input type="text" name="unit_xml_<%=serviceCode%>" value="" size="1" maxlength="2" style="width:20px; height:20px;">
  				</td>
  				<td <%=serviceDesc.length()>30?"title=\""+serviceDesc+"\"":""%>><font size="-1" ><%=serviceDesc.length()>30?serviceDesc.substring(0,30)+"...":serviceDesc%>
--- 752,758 ----
  			<tr bgcolor=<%=i%2==0?"#FFFFFF":"#EEEEFF"%>>
  				<td nowrap>
! 				<input type="checkbox" name="code_xml_<%=serviceCode%>" value="checked" <%="checked".equals(request.getParameter("code_xml_"+serviceCode))? "checked":""%>>
  				<b><font size="-1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>
! 				<input type="text" name="unit_xml_<%=serviceCode%>" value="<%=request.getParameter("unit_xml_"+serviceCode)!=null? request.getParameter("unit_xml_"+serviceCode):""%>" size="1" maxlength="2" style="width:20px; height:20px;">
  				</td>
  				<td <%=serviceDesc.length()>30?"title=\""+serviceDesc+"\"":""%>><font size="-1" ><%=serviceDesc.length()>30?serviceDesc.substring(0,30)+"...":serviceDesc%>
***************
*** 781,787 ****
  			<tr bgcolor=<%=i%2==0?"#FFFFFF":"#EEEEFF"%>>
  				<td nowrap>
! 				<input type="checkbox" name="code_xml_<%=serviceCode%>" value="checked" >
  				<b><font size="-1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>
! 				<input type="text" name="unit_xml_<%=serviceCode%>" value="" size="1" maxlength="2" style="width:20px; height:20px;">
  				</td>
  				<td <%=serviceDesc.length()>30?"title=\""+serviceDesc+"\"":""%>><font size="-1" ><%=serviceDesc.length()>30?serviceDesc.substring(0,30)+"...":serviceDesc%>
--- 796,802 ----
  			<tr bgcolor=<%=i%2==0?"#FFFFFF":"#EEEEFF"%>>
  				<td nowrap>
! 				<input type="checkbox" name="code_xml_<%=serviceCode%>" value="checked" <%="checked".equals(request.getParameter("code_xml_"+serviceCode))? "checked":""%>>
  				<b><font size="-1" color="<%=premiumFlag.equals("A")? "#993333" : "black"%>"><%=serviceCode%></font></b>
! 				<input type="text" name="unit_xml_<%=serviceCode%>" value="<%=request.getParameter("unit_xml_"+serviceCode)!=null? request.getParameter("unit_xml_"+serviceCode):""%>" size="1" maxlength="2" style="width:20px; height:20px;">
  				</td>
  				<td <%=serviceDesc.length()>30?"title=\""+serviceDesc+"\"":""%>><font size="-1" ><%=serviceDesc.length()>30?serviceDesc.substring(0,30)+"...":serviceDesc%>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/demographic demographiceditdemographic.jsp,1.40,1.41

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

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

Modified Files:
	demographiceditdemographic.jsp 
Log Message:
for Ontario users - add refer. doc. search

Index: demographiceditdemographic.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** demographiceditdemographic.jsp	24 Mar 2005 23:29:43 -0000	1.40
--- demographiceditdemographic.jsp	3 Apr 2005 06:12:59 -0000	1.41
***************
*** 191,194 ****
--- 191,204 ----
    //history.go(0);
  }
+ function rs(n,u,w,h,x) {
+   args="width="+w+",height="+h+",resizable=yes,scrollbars=yes,status=0,top=60,left=30";
+   remote=window.open(u,n,args);
+ }
+ function referralScriptAttach2(elementName, name2) {
+      var d = elementName;
+      t0 = escape("document.forms[1].elements[\'"+d+"\'].value");
+      t1 = escape("document.forms[1].elements[\'"+name2+"\'].value");
+      rs('att',('../billing/CA/ON/searchRefDoc.jsp?param='+t0+'&param2='+t1),600,600,1);
+ }
  
  function newStatus() {
***************
*** 315,321 ****
--- 325,333 ----
                  </td></tr>
                  <% } %>
+                 <% if("ON".equals(prov)) { %>
                  <tr><td>
                      <a href=# onclick="popupPage(700, 1000, '../billing/CA/ON/billingShortcutPg1.jsp?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=&appointment_no=0&demographic_name=<%=URLEncoder.encode(rs.getString("last_name"))%>%2C<%=URLEncoder.encode(rs.getString("first_name"))%>&demographic_no=<%=rs.getString("demographic_no")%>&providerview=1&user_no=<%=curProvider_no%>&apptProvider_no=none&appointment_date=<%=dateString%>&start_time=0:00&bNewForm=1&status=t');return false;" title="bill a patient">Hospital Billing</a>
                  </td></tr>
+                 <% } %>
                  <tr><td>
                      <a href=# onclick="window.open('../billing/CA/ON/inr/addINRbilling.jsp?function=demographic&functionid=<%=rs.getString("demographic_no")%>&creator=<%=curProvider_no%>&demographic_name=<%=URLEncoder.encode(rs.getString("last_name"))%>%2C<%=URLEncoder.encode(rs.getString("first_name"))%>&hin=<%=URLEncoder.encode(rs.getString("hin"))%><%=URLEncoder.encode(rs.getString("ver"))%>&dob=<%=MyDateFormat.getStandardDate(Integer.parseInt(rs.getString("year_of_birth")),Integer.parseInt(rs.getString("month_of_birth")),Integer.parseInt(rs.getString("date_of_birth")))%>','', 'scrollbars=yes,resizable=yes,width=600,height=400');return false;" title='Add INR Billing'>Add INR</a></th>
***************
*** 673,677 ****
                                    <td align="right" nowrap><b><bean:message key="demographic.demographiceditdemographic.formRefDocNo"/>: </b></td>
                                    <td align="left">
!                                     <input type="text" name="r_doctor_ohip" size="30" maxlength="6" value="<%=rdohip%>">
                                    </td>
                              </tr>
--- 685,692 ----
                                    <td align="right" nowrap><b><bean:message key="demographic.demographiceditdemographic.formRefDocNo"/>: </b></td>
                                    <td align="left">
!                                     <input type="text" name="r_doctor_ohip" size="20" maxlength="6" value="<%=rdohip%>">
!                 					<% if("ON".equals(prov)) { %>
! 									<a href="javascript:referralScriptAttach2('r_doctor_ohip','r_doctor')">Search #</a>
!                 					<% } %>
                                    </td>
                              </tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON searchRefDoc.jsp,NONE,1.1 addEditRefDoc.jsp,NONE,1.1 billingShortcutPg1.jsp,1.2,1.3

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

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

Modified Files:
	billingShortcutPg1.jsp 
Added Files:
	searchRefDoc.jsp addEditRefDoc.jsp 
Log Message:
update for hospital billing

--- NEW FILE: searchRefDoc.jsp ---
<!--
/*
 *
 * 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>
 */
-->
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../logout.jsp");
  }
  String strLimit1="0";
  String strLimit2="10";
  if(request.getParameter("limit1")!=null) strLimit1 = request.getParameter("limit1");
  if(request.getParameter("limit2")!=null) strLimit2 = request.getParameter("limit2");

  int nItems = 0;
  Vector vec = new Vector();
  Properties prop = null;
  String param = request.getParameter("param")==null?"":request.getParameter("param") ;
  String keyword = request.getParameter("keyword");

	if (request.getParameter("submit") != null && (request.getParameter("submit").equals("Search")
		|| request.getParameter("submit").equals("Next Page") || request.getParameter("submit").equals("Last Page")) ) {
	  BillingONDataHelp dbObj = new BillingONDataHelp();
	  String search_mode = request.getParameter("search_mode");
	  String orderBy = request.getParameter("orderby");
	  String where = "";
	  if("search_name".equals(search_mode)) {
	    String[] temp = keyword.split("\\,\\p{Space}*");
	    if(temp.length>1) {
	      where = "last_name like '" + StringEscapeUtils.escapeSql(temp[0]) + "%' and first_name like '" + StringEscapeUtils.escapeSql(temp[1]) + "%'";
	    } else {
	      where = "last_name like '" + StringEscapeUtils.escapeSql(temp[0]) + "%'";
	    }
	  } else {
	    where = search_mode + " like '" + StringEscapeUtils.escapeSql(keyword) + "%'";
	  }
	  String	sql   = "select * from billingreferral where " + where + " order by " + orderBy + " limit " +strLimit1+"," +strLimit2;
	  ResultSet rs = dbObj.searchDBRecord(sql);
		System.out.println(sql);
	  while (rs.next()) {
	  	prop = new Properties();
	  	prop.setProperty("referral_no",rs.getString("referral_no"));
	  	prop.setProperty("last_name",rs.getString("last_name"));
	  	prop.setProperty("first_name",rs.getString("first_name"));
	  	prop.setProperty("specialty",rs.getString("specialty"));
	  	prop.setProperty("phone",rs.getString("phone"));
	  	vec.add(prop);
	  }
	}
%>
  <%@ page errorPage="../appointment/errorpage.jsp"import="java.util.*,
                                                           java.sql.*" %>
  <%@ page import="oscar.oscarBilling.ca.on.data.BillingONDataHelp" %>
  <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <html:html locale="true">
    <head>
      <title>
        Add/Edit Service Code
      </title>
      <meta http-equiv="Expires" content="Monday, 8 Aug 88 18:18:18 GMT">
      <meta http-equiv="Cache-Control" content="no-cache">
      <style type="text/css">
          BODY{
              FONT-SIZE: Normal;
              FONT-FAMILY: Verdana, Tahoma, Arial, sans-serif;
          }
          TABLE{
              font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;
          }
          TD{
              font-size:11pt;
          }
          TH{
              font-size:11pt;
          }
          .blueText{
              font-size:9pt;
              vertical-align: top;
          }
          .mbttn {
              background: #D7DBF2;
              border-bottom: 1px solid #104A7B;
              border-right: 1px solid #104A7B;
              border-left: 1px solid #AFC4D5;
              border-top:1px solid #AFC4D5;
              color:#000066;height:19px;
              text-decoration:none;
              cursor: hand
          }
          .subject {
              background-color: #003399;
              color: #FFFFFF;
              font-size: 14pt;
              font-weight: bold;
              text-align: centre;
          }
          .searchTitle {
              background-color: #6699CC;
              color: #000000;
              font-weight: bold;
              text-align: left;
              height="20px"
          }
          .title {
              background-color: #6699CC;
              color: #000000;
              font-weight: bold;
              text-align: center;
              height="20px"
          }
      </style>
      <script language="JavaScript">

<!--
		function setfocus() {
		  this.focus();
		  document.forms[0].keyword.focus();
		  document.forms[0].keyword.select();
		}
		<%if(param.length()>0) {%>
		function typeInData1(data) {
		  self.close();
		  opener.<%=param%> = data;
		}
		function typeInData2(data1, data2) {
		  self.close();
		  opener.<%=param%> = data1;
		  opener.<%=param%> = data2;
		}
		<%}%>
-->

      </script>
    </head>
    <body bgcolor="white" bgproperties="fixed" onload="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
      <table border="0" cellpadding="1" cellspacing="0" width="100%" bgcolor="#CCCCFF">
        <form method="post" name="titlesearch" action="searchRefDoc.jsp" onsubmit="return checkTypeIn()">
          <tr>
            <td class="searchTitle" colspan="4">
              Search Referral Doctor
            </td>
          </tr>
          <tr>
            <td class="blueText" width="10%" nowrap>
              <input type="radio" name="search_mode" value="search_name" checked>
              Name
            </td>
            <td class="blueText" nowrap>
              <input type="radio" name="search_mode" value="specialty">
              Specialty
            </td>
            <td valign="middle" rowspan="2" align="left">
              <input type="text" name="keyword" value="" size="17" maxlength="100">
              <input type="hidden" name="orderby" value="last_name, first_name">
              <input type="hidden" name="limit1" value="<%=strLimit1%>">
              <input type="hidden" name="limit2" value="<%=strLimit2%>">
              <input type="submit" class="mbttn" name="submit" value='Search' size="17">
            </td>
          </tr>
          <input type='hidden' name='param' value="<%=StringEscapeUtils.escapeHtml(param)%>">
        </form>
      </table>
		<table width="95%" border="0">
		<tr>
		<td align="left">Results based on keyword(s): <%=keyword==null?"":keyword%></td>
		</tr>
		</table>
      <script language="JavaScript">
        var fullname = "";

        function addName(demographic_no, lastname, firstname, chartno, messageID) {
          fullname = lastname + "," + firstname;
          document.addform.action = "../appointment/addappointment.jsp?demographic_no=" + demographic_no + "&name=" +
                  fullname + "&chart_no=" + chartno + "&bFirstDisp=false" + "&messageID=" + messageID;

          //+"\"" ;
          document.addform.submit();
          //
  //return;

        }
      </script>
      <center>
      <table width="100%" border="0" cellpadding="0" cellspacing="2" bgcolor="#C0C0C0">
        <tr class="title"><th width="20%"><b>Ref. No.</b>
          </th>
          <th width="20%">
            Last Name</b>
          </th>
          <th width="20%">
            First Name</b>
          </th>
          <th width="20%">
            Specialty</b>
          </th>
          <th width="20%">
            Phone</b>
          </th>
        </tr>
        <%for(int i=0; i<vec.size(); i++) {
        	prop = (Properties) vec.get(i);
			String bgColor = i%2==0?"#EEEEFF":"ivory";
        %>
		<tr align="center"  bgcolor="<%=bgColor%>" align="center"
onMouseOver="this.style.cursor='hand';this.style.backgroundColor='pink';" onMouseout="this.style.backgroundColor='<%=bgColor%>';"
onClick="typeInData1('<%=prop.getProperty("referral_no", "")%>')" >
		  <td><%=prop.getProperty("referral_no", "")%></td>
		  <td><%=prop.getProperty("last_name", "")%></td>
		  <td><%=prop.getProperty("first_name", "")%></td>
		  <td><%=prop.getProperty("specialty", "")%></td>
		  <td><%=prop.getProperty("phone", "")%></td>
		</tr>
		<% } %>
      </table>

<%
  nItems=vec.size();
  int nLastPage=0,nNextPage=0;
  nNextPage=Integer.parseInt(strLimit2)+Integer.parseInt(strLimit1);
  nLastPage=Integer.parseInt(strLimit1)-Integer.parseInt(strLimit2);
%>


<%
  if(nItems==0 && nLastPage<=0) {
%>
  <bean:message key="demographic.search.noResultsWereFound"/>
<%
  }
%>
<script language="JavaScript">
<!--
function last() {
  document.nextform.action="searchRefDoc.jsp?keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nLastPage%>&limit2=<%=strLimit2%>" ;
  //document.nextform.submit();
}
function next() {
  document.nextform.action="searchRefDoc.jsp?keyword=<%=request.getParameter("keyword")%>&search_mode=<%=request.getParameter("search_mode")%>&orderby=<%=request.getParameter("orderby")%>&limit1=<%=nNextPage%>&limit2=<%=strLimit2%>" ;
  //document.nextform.submit();
}
//-->
</SCRIPT>

<form method="post" name="nextform" action="searchRefDoc.jsp" >
<%
  if(nLastPage>=0) {
%>
<input type="submit" class="mbttn" name="submit" value="<bean:message key="demographic.demographicsearch2apptresults.btnPrevPage"/>"  onClick="last()">
<%
  }
  if(nItems==Integer.parseInt(strLimit2)) {
%>
<input type="submit" class="mbttn" name="submit" value="<bean:message key="demographic.demographicsearch2apptresults.btnNextPage"/>"  onClick="next()">
<%
}
%>
</form>
<br>
  <a href="addEditRefDoc.jsp">Add/Edit Referral Doctor</a>
      </center></body>
  </html:html>

--- NEW FILE: addEditRefDoc.jsp ---
<!--
/*
 *
 * 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>
 */
-->
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../logout.jsp");
  }
%>
  <%@ page errorPage="../appointment/errorpage.jsp"import="java.util.*,
                                                           java.sql.*" %>
  <%@ page import="oscar.oscarBilling.ca.on.data.BillingONDataHelp" %>
  <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
<%
  int referralNoLen = 6;
  String msg = "Type in a doctor's ref. # and search first to see if it is available.";
  String action = "search"; // add/edit
  //BillingServiceCode serviceCodeObj = new BillingServiceCode();
  Properties	prop  = new Properties();
  BillingONDataHelp dbObj = new BillingONDataHelp();
  if (request.getParameter("submit") != null && request.getParameter("submit").equals("Save")) {
    // check the input data

    if(request.getParameter("action").startsWith("edit")) {
      	// update the service code
		String referral_no = request.getParameter("referral_no");
		if(referral_no.equals(request.getParameter("action").substring("edit".length()))) {
			String	sql   = "update billingreferral set last_name='" + StringEscapeUtils.escapeSql(request.getParameter("last_name")) + "', ";
			sql += " first_name='" + request.getParameter("first_name") + "', ";
			sql += " specialty='" + request.getParameter("specialty") + "', ";
			sql += " address1='" + request.getParameter("address1") + "', ";
			sql += " address2='" + request.getParameter("address2") + "', ";
			sql += " city='" + request.getParameter("city") + "', ";
			sql += " province='" + request.getParameter("province") + "', ";
			sql += " country='" + request.getParameter("country") + "', ";
			sql += " postal='" + request.getParameter("postal") + "', ";
			sql += " phone='" + request.getParameter("phone") + "', ";
			sql += " fax='" + request.getParameter("fax") + "' ";
			sql += "where referral_no='" + referral_no + "'";
			System.out.println(sql);
			if(dbObj.updateDBRecord(sql)) {
	  			msg = referral_no + " is updated.<br>" + "Type in a doctor's ref. # and search first to see if it is available.";
	  			action = "search";
			    prop.setProperty("referral_no", referral_no);
			} else {
	  			msg = referral_no + " is <font color='red'>NOT</font> updated. Action failed! Try edit it again." ;
			    action = "edit" + referral_no;
			    prop.setProperty("referral_no", referral_no);
			    prop.setProperty("last_name", request.getParameter("last_name"));
			    prop.setProperty("first_name", request.getParameter("first_name"));
			    prop.setProperty("specialty", request.getParameter("specialty"));
			    prop.setProperty("address1", request.getParameter("address1"));
			    prop.setProperty("address2", request.getParameter("address2"));
			    prop.setProperty("city", request.getParameter("city"));
			    prop.setProperty("province", request.getParameter("province"));
			    prop.setProperty("country", request.getParameter("country"));
			    prop.setProperty("postal", request.getParameter("postal"));
			    prop.setProperty("phone", request.getParameter("phone"));
			    prop.setProperty("fax", request.getParameter("fax"));
			}
		} else {
      		msg = "You can <font color='red'>NOT</font> save the doctor's ref. # - " + referral_no + ". Please search the doctor's ref. # first.";
  			action = "search";
		    prop.setProperty("referral_no", referral_no);
		}
    } else if (request.getParameter("action").startsWith("add")) {
      	// insert into the referral_no
		String referral_no = request.getParameter("referral_no");
		if(referral_no.equals(request.getParameter("action").substring("add".length()))) {
			String	sql   = "insert into billingreferral (referral_no, last_name, first_name, specialty, address1, address2, "
				+ "	city, province, country, postal, phone, fax) values ('";
			sql += referral_no + "', '";
			sql += request.getParameter("last_name") + "', '";
			sql += request.getParameter("first_name") + "', '";
			sql += request.getParameter("specialty") + "', '";
			sql += request.getParameter("address1") + "', '";
			sql += request.getParameter("address2") + "', '";
			sql += request.getParameter("city") + "', '";
			sql += request.getParameter("province") + "', '";
			sql += request.getParameter("country") + "', '";
			sql += request.getParameter("postal") + "', '";
			sql += request.getParameter("phone") + "', '";
			sql += request.getParameter("fax") + "' )";
			if(dbObj.updateDBRecord(sql) ) {
	  			msg = referral_no + " is added.<br>" + "Type in a doctor's ref. # and search first to see if it is available.";
	  			action = "search";
			    prop.setProperty("referral_no", referral_no);
			} else {
	  			msg = referral_no + " is <font color='red'>NOT</font> added. Action failed! Try edit it again." ;
			    action = "add" + referral_no;
			    prop.setProperty("referral_no", referral_no);
			    prop.setProperty("last_name", request.getParameter("last_name"));
			    prop.setProperty("first_name", request.getParameter("first_name"));
			    prop.setProperty("specialty", request.getParameter("specialty"));
			    prop.setProperty("address1", request.getParameter("address1"));
			    prop.setProperty("address2", request.getParameter("address2"));
			    prop.setProperty("city", request.getParameter("city"));
			    prop.setProperty("province", request.getParameter("province"));
			    prop.setProperty("country", request.getParameter("country"));
			    prop.setProperty("postal", request.getParameter("postal"));
			    prop.setProperty("phone", request.getParameter("phone"));
			    prop.setProperty("fax", request.getParameter("fax"));
			}
		} else {
      		msg = "You can <font color='red'>NOT</font> save the ref. code - " + referral_no + ". Please search the ref. # first.";
  			action = "search";
		    prop.setProperty("referral_no", referral_no);
		}
    } else {
      msg = "You can <font color='red'>NOT</font> save the ref. code. Please search the ref. code first.";
    }
  } else if (request.getParameter("submit") != null && request.getParameter("submit").equals("Search")) {
    // check the input data
    if(request.getParameter("referral_no") == null || request.getParameter("referral_no").length() != referralNoLen) {
      msg = "Please type in a ref. code.";
    } else {
        String referral_no = request.getParameter("referral_no");
		String	sql   = "select * from billingreferral where referral_no='" + referral_no + "'";
		ResultSet rs = dbObj.searchDBRecord(sql);
System.out.println(sql);

		if (rs.next()) {
		    prop.setProperty("referral_no", referral_no);
		    prop.setProperty("last_name", rs.getString("last_name"));
		    prop.setProperty("first_name", rs.getString("first_name"));
		    prop.setProperty("specialty", rs.getString("specialty"));
		    prop.setProperty("address1", rs.getString("address1"));
		    prop.setProperty("address2", rs.getString("address2"));
		    prop.setProperty("city", rs.getString("city"));
		    prop.setProperty("province", rs.getString("province"));
		    prop.setProperty("country", rs.getString("country"));
		    prop.setProperty("postal", rs.getString("postal"));
		    prop.setProperty("phone", rs.getString("phone"));
		    prop.setProperty("fax", rs.getString("fax"));
		    msg = "You can edit the ref. code.";
		    action = "edit" + referral_no;
		} else {
		    prop.setProperty("referral_no", referral_no);
		    msg = "It is a NEW ref. code. You can add it.";
		    action = "add" + referral_no;
		}
	}
  }
%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <html:html locale="true">
    <head>
      <title>
        Add/Edit Service Code
      </title>
      <meta http-equiv="Expires" content="Monday, 8 Aug 88 18:18:18 GMT">
      <meta http-equiv="Cache-Control" content="no-cache">
      <script language="JavaScript">

      <!--
		function setfocus() {
		  this.focus();
		  document.forms[0].referral_no.focus();
		  document.forms[0].referral_no.select();
		}
	    function onSearch() {
	        //document.forms[0].submit.value="Search";
	        var ret = checkreferral_no();
	        return ret;
	    }
	    function onSave() {
	        //document.forms[0].submit.value="Save";
	        var ret = checkreferral_no();
	        if(ret==true) {
				ret = checkAllFields();
			}
	        if(ret==true) {
	            ret = confirm("Are you sure you want to save?");
	        }
	        return ret;
	    }
		function checkreferral_no() {
	        var b = true;
	        if(document.forms[0].referral_no.value.length!=6 || !isreferral_no(document.forms[0].referral_no.value)){
	            b = false;
	            alert ("You must type in a ref. code with 6 digits.");
	        }
	        return b;
	    }
    function isreferral_no(s){
        // temp for 0.
    	if(s.length==0) return true;
    	if(s.length!=6) return false;
        var i;
        for (i = 0; i < s.length; 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;
	        if(document.forms[0].last_name.value.length<=0){
	            b = false;
	            alert ("The field \"Last Name\" is empty.");
	        } else if(document.forms[0].first_name.value.length<=0) {
	            b = false;
	            alert ("The field \"First Name\" is empty.");
	        }
			return b;
	    }
	    function isNumber(s){
	        var i;
	        for (i = 0; i < s.length; i++){
	            // Check that current character is number.
	            var c = s.charAt(i);
	            if (c == ".") continue;
	            if (((c < "0") || (c > "9"))) return false;
	        }
	        // All characters are numbers.
	        return true;
	    }
//-->

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

      <center>
      <table BORDER="1" CELLPADDING="0" CELLSPACING="0" WIDTH="80%">
        <tr BGCOLOR="#CCFFFF">
          <th>
            <%=msg%>
          </th>
        </tr>
      </table>
      </center>
      <table width="100%" border="0" cellspacing="2" cellpadding="2">
        <form method="post" name="baseurl" action="addEditRefDoc.jsp">
          <tr>
            <td>
              &nbsp;
            </td>
          </tr>
          <tr bgcolor="#EEEEFF">
            <td align="right">
              <b>Referral Doc. Code</b>
            </td>
            <td>
              <input type="text" name="referral_no" value="<%=prop.getProperty("referral_no", "")%>" size='5' maxlength='6'>
              (6 digits, e.g. 123456)
              <input type="submit" name="submit" value="Search" onclick="javascript:return onSearch();">
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Last Name</b>
            </td>
            <td>
              <input type="text" name="last_name" value="<%=prop.getProperty("last_name", "")%>" size='30' maxlength='30'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>First Name</b>
            </td>
            <td>
              <input type="text" name="first_name" value="<%=prop.getProperty("first_name", "")%>" size='30' maxlength='30'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Specialty</b>
            </td>
            <td>
              <input type="text" name="specialty" value="<%=prop.getProperty("specialty", "")%>" size='30' maxlength='30'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Address1</b>
            </td>
            <td>
              <input type="text" name="address1" value="<%=prop.getProperty("address1", "")%>" size='50' maxlength='50'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Address2</b>
            </td>
            <td>
              <input type="text" name="address2" value="<%=prop.getProperty("address2", "")%>" size='50' maxlength='50'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>City</b>
            </td>
            <td>
              <input type="text" name="city" value="<%=prop.getProperty("city", "")%>" size='30' maxlength='30'>
            </td>
          </tr>
          <tr bgcolor="#EEEEFF">
            <td align="right">
              <b>Province</b>
            </td>
            <td>
              <% String region = prop.getProperty("province", "");
              	 region = "".equals(region) ? "ON" : region;
              %>
            <select name="province">
              <option value="AB"<%=region.equals("AB")?" selected":""%>>AB-Alberta</option>
              <option value="BC"<%=region.equals("BC")?" selected":""%>>BC-British Columbia</option>
              <option value="MB"<%=region.equals("MB")?" selected":""%>>MB-Manitoba</option>
              <option value="NB"<%=region.equals("NB")?" selected":""%>>NB-New Brunswick</option>
              <option value="NL"<%=region.equals("NL")?" selected":""%>>NL-Newfoundland & Labrador</option>
              <option value="NT"<%=region.equals("NT")?" selected":""%>>NT-Northwest Territory</option>
              <option value="NS"<%=region.equals("NS")?" selected":""%>>NS-Nova Scotia</option>
              <option value="NU"<%=region.equals("NU")?" selected":""%>>NU-Nunavut</option>
              <option value="ON"<%=region.equals("ON")?" selected":""%>>ON-Ontario</option>
              <option value="PE"<%=region.equals("PE")?" selected":""%>>PE-Prince Edward Island</option>
              <option value="QC"<%=region.equals("QC")?" selected":""%>>QC-Quebec</option>
              <option value="SK"<%=region.equals("SK")?" selected":""%>>SK-Saskatchewan</option>
              <option value="YT"<%=region.equals("YT")?" selected":""%>>YT-Yukon</option>
              <option value="US"<%=region.equals("US")?" selected":""%>>US resident</option>
            </select>
              Country
              <input type="text" name="country" value="<%=prop.getProperty("country", "CA")%>" size='2' maxlength='2'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>Postal</b>
            </td>
            <td>
              <input type="text" name="postal" value="<%=prop.getProperty("postal", "")%>" size='30' maxlength='30'>
            </td>
          </tr>
          <tr>
            <td align="right">
              <b>phone</b>
            </td>
            <td>
              <input type="text" name="phone" value="<%=prop.getProperty("phone", "")%>" size='10' maxlength='12'>
              Fax
              <input type="text" name="fax" value="<%=prop.getProperty("fax", "")%>" size='10' maxlength='12'>
            </td>
          </tr>
          <tr>
            <td>
              &nbsp;
            </td>
            <td>
              &nbsp;
            </td>
          </tr>
          <tr>
            <td align="center" bgcolor="#CCCCFF" colspan="2">
              <input type="hidden" name="action" value='<%=action%>'>
              <input type="submit" name="submit" value="<bean:message key="admin.resourcebaseurl.btnSave"/>" onclick="javascript:return onSave();">
              <input type="button" name="Cancel" value="<bean:message key="admin.resourcebaseurl.btnExit"/>" onClick="window.close()">
            </td>
          </tr>
        </form>
      </table>
    </body>
  </html:html>

Index: billingShortcutPg1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg1.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** billingShortcutPg1.jsp	26 Mar 2005 19:09:04 -0000	1.2
--- billingShortcutPg1.jsp	2 Apr 2005 19:46:51 -0000	1.3
***************
*** 25,29 ****
    String            clinicview        = oscarVariables.getProperty("clinic_view", "");
    String            clinicNo          = oscarVariables.getProperty("clinic_no", "");
!   String            visitType         = oscarVariables.getProperty("visit_type", "");
    String            appt_no           = request.getParameter("appointment_no");
    String            demoname          = request.getParameter("demographic_name");
--- 25,29 ----
    String            clinicview        = oscarVariables.getProperty("clinic_view", "");
    String            clinicNo          = oscarVariables.getProperty("clinic_no", "");
!   String            visitType         = "02"; //oscarVariables.getProperty("visit_type", "");
    String            appt_no           = request.getParameter("appointment_no");
    String            demoname          = request.getParameter("demographic_name");
***************
*** 45,49 ****
    Properties        propHist          = null;
    Vector            vecHist           = new Vector();
! System.out.println(";;;;;;;;;;;;;;;;;;;;;;;;;;" + msg);
    // get provider's detail
    String proOHIPNO="", proRMA="";
--- 45,49 ----
    Properties        propHist          = null;
    Vector            vecHist           = new Vector();
! //System.out.println(";;;;;;;;;;;;;;;;;;;;;;;;;;" + msg);
    // get provider's detail
    String proOHIPNO="", proRMA="";
***************
*** 94,100 ****
  	if (rs.getString("hin") == null ) {
  		errorFlag = "1";
! 		errorMsg = errorMsg + "<br><font color='red'>Error: The patient does not have a valid HIN. </font><br>";
  	} else if (rs.getString("hin").equals("")) {
! 		warningMsg += "<br><font color='orange'>Warning: The patient does not have a valid HIN. </font><br>";
  	}
  	if (r_doctor_ohip != null && r_doctor_ohip.length()>0 && r_doctor_ohip.length() != 6) {
--- 94,100 ----
  	if (rs.getString("hin") == null ) {
  		errorFlag = "1";
! 		errorMsg = errorMsg + "<br><b><font color='red'>Error: The patient does not have a valid HIN. </font></b><br>";
  	} else if (rs.getString("hin").equals("")) {
! 		warningMsg += "<br><b><font color='orange'>Warning: The patient does not have a valid HIN. </font></b><br>";
  	}
  	if (r_doctor_ohip != null && r_doctor_ohip.length()>0 && r_doctor_ohip.length() != 6) {
***************
*** 103,332 ****
  	if (demoDOB.length() != 8) {
  		errorFlag = "1";
! 		errorMsg = errorMsg + "<br><font color='red'>Error: The patient does not have a valid DOB. </font><br>";
  	}
    }
  
-   // save the billing if needed
-   if(request.getParameter("submit")!=null && "Save".equals(request.getParameter("submit"))) {
-     // parse billing date
-     int NUMTYPEINFIELD = 5;
-     String billingDate = request.getParameter("billDate");
-     String [] tempDate = billingDate.split("\\s");
- 	// get billing detail info
- 	// get form service code
- 	Vector vecServiceCode = new Vector();
- 	Vector vecServiceCodeDesc = new Vector();
- 	Vector vecServiceCodeUnit = new Vector();
- 	Vector vecServiceCodePrice = new Vector();
- 	Vector vecServiceCodePerc = new Vector();
- 	String rulePerc = "allAboveCode"; // onlyAboveCode;
- 	rulePerc = request.getParameter("rulePerc")!=null?request.getParameter("rulePerc"):"allAboveCode";
- 	int rulePercLabelNum = -1; //only use when onlyAboveCode
- 
- 	int recordCount = 0;
- 	String[] billrec = new String[]{"","","","",""};
- 	String[] billrecunit = new String[]{"","","","",""};
- 	String[] billrecdesc = new String[]{"","","","",""};
- 	String[] pricerec = new String[]{"","","","",""};
- 	String[] percrec = new String[]{"","","","",""};
- 	for(int i=0; i<NUMTYPEINFIELD; i++) {
- 		if("".equals(request.getParameter("serviceDate"+i))) break;
- 		else {
- 			billrec[i] = request.getParameter("serviceDate"+i);
- 			billrecunit[i] = request.getParameter("serviceUnit"+i);
- 			if("".equals(billrecunit[i])) billrecunit[i]="1";
- 			recordCount++;
- 		}
- 	}
- 	for(int i=0; i<recordCount; i++) {
- 		sql = "select service_code, description, value, percentage from billingservice where service_code='"
- 			+ billrec[i] + "'";
- 		rs = dbObj.searchDBRecord(sql);
- 		while (rs.next()) {
- 			billrecdesc[i] = rs.getString("description");
- 			//otherdbcode2 = rs.getString("service_code");
- 			pricerec[i] = rs.getString("value")==null?"":rs.getString("value");
- 			percrec[i] = rs.getString("percentage");
- 			//otherperc2 = rs.getString("percentage");
- 
- 			if( (!"".equals(pricerec[i]) && Double.parseDouble(pricerec[i])>0.) || ( "".equals(percrec[i])) ) {
- 				vecServiceCode.add( billrec[i] );
- 				vecServiceCodeDesc.add( billrecdesc[i] );
- 				vecServiceCodePrice.add( pricerec[i] );
- 				vecServiceCodeUnit.add( billrecunit[i] );
- 			} else {
- 				if(!"allAboveCode".equals(rulePerc) ) rulePercLabelNum = i-1;
- 				vecServiceCodePerc.add( billrec[i] ); // code
- 				vecServiceCodePerc.add( percrec[i] ); // price
- 				vecServiceCodePerc.add( billrecunit[i] ); // unit
- 				vecServiceCodePerc.add( billrecdesc[i] ); // desc
- 			}
- 
- 		}
- 	}
- 	//get the form service code
- 	for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) {
- 		String temp=e.nextElement().toString();
- 		if( temp.indexOf("code_xml_")==-1 ) continue;
- 
- 		temp = temp.substring("code_".length());
- 		String desc = request.getParameter("desc_" + temp);
- 		String fee = request.getParameter("price_" + temp);
- 		String perc = request.getParameter("perc_" + temp);
- 		String tempUnit = request.getParameter("unit_" + temp);
- 		tempUnit = (tempUnit==null||"".equals(tempUnit) )? "1":tempUnit;
- 		String code = temp.substring("xml_".length()).toUpperCase();
- 		if( (!"".equals(fee) && Double.parseDouble(fee)>0.) || ( "".equals(perc)) ) {
- 			vecServiceCodePrice.add( fee );
- 			vecServiceCodeUnit.add( tempUnit );
- 			vecServiceCode.add( code );
- 			vecServiceCodeDesc.add( desc );
- 		} else {
- 			vecServiceCodePerc.add( code );
- 			vecServiceCodePerc.add( perc );
- 			vecServiceCodePerc.add( tempUnit ); // unit
- 			vecServiceCodePerc.add( desc ); // desc
- 		}
- 		//vecServiceCode.add( code );
- 	}
- 	//check perc code limitation
- 	boolean bLimit = false;
- 	String minFee = "", maxFee = "";
- 	if(vecServiceCodePerc.size()>0) {
- 		//TODO: only one perc code allowed, otherwise error msg
- 		sql = "select min, max from billingperclimit where service_code='"
- 			+ vecServiceCodePerc.get(0) + "'";
- 		rs = dbObj.searchDBRecord(sql);
- 		while (rs.next()) {
- 			bLimit = true;
- 			minFee = rs.getString("min");
- 			maxFee = rs.getString("max");
- 		}
- 	}
- 
-     // calculate total
-     BigDecimal bdTotal = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
-     BigDecimal bdPercBase = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
- 	BigDecimal bdPerc = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
-     // calculate base
- 	for(int i=0; i<vecServiceCodePrice.size(); i++) {
-     	BigDecimal price = new BigDecimal(Double.parseDouble((String)vecServiceCodePrice.get(i))).setScale(2, BigDecimal.ROUND_HALF_UP);
-     	BigDecimal unit = new BigDecimal(Double.parseDouble((String)vecServiceCodeUnit.get(i))).setScale(2, BigDecimal.ROUND_HALF_UP);
-     	bdTotal = bdTotal.add(price.multiply(unit).setScale(2, BigDecimal.ROUND_HALF_UP));
-     	if(i==rulePercLabelNum) bdPercBase = bdTotal;
- System.out.println(i + " :" + price + " x " + unit + " = " + bdTotal);
- 	}
- 	if(vecServiceCodePerc.size()>1) {
- 		// calculate perc base
- 		if("allAboveCode".equals(rulePerc) ) {
- 			bdPercBase = bdTotal;
- 		}
- 		// calculate perc
- 		BigDecimal perc = new BigDecimal(Double.parseDouble((String)vecServiceCodePerc.get(1))).setScale(2, BigDecimal.ROUND_HALF_UP);
- 		bdPerc = bdPercBase.multiply(perc).setScale(2, BigDecimal.ROUND_HALF_UP);
- System.out.println("Percentage :" + bdPercBase + " x " + perc + " = " + bdPerc);
- 		// adjust perc by min/max
- 		if(bLimit) {
- 			bdPerc = bdPerc.min(new BigDecimal(Double.parseDouble(maxFee) ).setScale(2, BigDecimal.ROUND_HALF_UP) );
- 			bdPerc = bdPerc.max(new BigDecimal(Double.parseDouble(minFee) ).setScale(2, BigDecimal.ROUND_HALF_UP) );
- System.out.println("Adjust to (" + minFee + ", " + maxFee + "): " + bdPerc);
- 		}
-     	bdTotal = bdTotal.add(bdPerc);
- 	}
- 
-     String total = "" + bdTotal;
-     System.out.println(billingDate + "***************total****************:" + bdTotal);
- 	// referral
-     String content = "";
-     String referalCode = (request.getParameter("referralCode")!=null&&request.getParameter("referralCode").length()==6)?request.getParameter("referralCode"):null;
-     if(referalCode!=null) {
-     	content += "<xml_referral>checked</xml_referral>" ;
-     	content += "<rdohip>" + referalCode + "</rdohip>" ;
-     }
-     content += "<hctype>" + demoHCTYPE + "</hctype>" ;
-     content += "<demosex>" + demoSex + "</demosex>" ;
- 
-     for(int k=0; k<tempDate.length; k++) {
-     	if(tempDate[k].trim().length()!=10) continue;
- 		String[] param =new String[23];
- 		param[0]=request.getParameter("clinic_no");
- 		param[1]=request.getParameter("demographic_no");
- 		param[2]=request.getParameter("xml_provider"); //request.getParameter("provider_no");
- 		param[3]=request.getParameter("appointment_no");
- 
- 		param[4]=request.getParameter("ohip_version");
- 		param[5]=request.getParameter("demographic_name");
- 		param[6]=request.getParameter("hin");
- 		param[7] = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy-MM-dd");
- 		param[8] = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "HH:mm:ss");
- 		//param[7]=request.getParameter("billing_date");
- 		//param[8]=MyDateFormat.getTimeXX_XX_XX(request.getParameter("billing_time"));
- 		param[9]= tempDate[k] ; // parse(billingDate) ;//request.getParameter("appointment_date");
- 		param[10]=request.getParameter("start_time");
- 		param[11]=request.getParameter("xml_location"); //request.getParameter("clinic_ref_code");
- 		param[12]=content; //request.getParameter("content");
- 		param[13]=total; // calculate total; //request.getParameter("total");
- 		param[14]=request.getParameter("xml_billtype").substring(0,1);
- 		param[15]=request.getParameter("demographic_dob");
- 
- 		param[16]=request.getParameter("xml_vdate"); // don't consider the appt date. request.getParameter("visitdate");
- 		param[17]=request.getParameter("xml_visittype").substring(0,2); //request.getParameter("visittype");
- 		param[18]=proOHIPNO; //request.getParameter("pohip_no");
- 		param[19]=proRMA; //request.getParameter("prma_no");
- 		param[20]=request.getParameter("apptProvider_no"); //"none"; //
- 		param[21]=""; //request.getParameter("asstProvider_no"); //"";//
- 		param[22] = user_no;//request.getParameter("user_no");
- 		int nBillNo = 0;
- 		int nBillDetailNo = 0;
- 		//BillingONDataHelp billObj = new BillingONDataHelp();
- 		//String sql = "insert into billing values('\\N',?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)";
- 		sql = "insert into billing(clinic_no, demographic_no, provider_no, appointment_no, organization_spec_code, demographic_name, hin, update_date, update_time, billing_date, billing_time, clinic_ref_code, content, total, status, dob, visitdate, visittype, provider_ohip_no, provider_rma_no, apptProvider_no, asstProvider_no, creator) values( "
- 			+ param[0] + "," + param[1] + "," + UtilMisc.nullMySQLEscape(param[2]) + "," + param[3] + "," + UtilMisc.nullMySQLEscape(param[4]) + ","
- 			+ UtilMisc.nullMySQLEscape(param[5]) + "," + UtilMisc.nullMySQLEscape(param[6]) + "," + UtilMisc.nullMySQLEscape(param[7]) + "," + UtilMisc.nullMySQLEscape(param[8]) + "," + UtilMisc.nullMySQLEscape(param[9]) + ","
- 			+ UtilMisc.nullMySQLEscape(param[10]) + "," + UtilMisc.nullMySQLEscape(param[11]) + "," + UtilMisc.nullMySQLEscape(param[12]) + "," + UtilMisc.nullMySQLEscape(param[13]) + "," + UtilMisc.nullMySQLEscape(param[14]) + ","
- 			+ UtilMisc.nullMySQLEscape(param[15]) + "," + UtilMisc.nullMySQLEscape(param[16]) + "," + UtilMisc.nullMySQLEscape(param[17]) + "," + UtilMisc.nullMySQLEscape(param[18]) + "," + UtilMisc.nullMySQLEscape(param[19]) + ","
- 			+ UtilMisc.nullMySQLEscape(param[20]) + "," + UtilMisc.nullMySQLEscape(param[21]) + ",'" + param[22] + "')";
- 	    System.out.println("*******************************" + sql);
- 		nBillNo = dbObj.saveBillingRecord(sql);
- 
- 
- 		//int recordCount = Integer.parseInt(request.getParameter("record"));
- 		// combine two vecs into one
- 		if(vecServiceCodePerc.size()>1) {
- 			vecServiceCodePrice.add( "" + bdPerc); //vecServiceCodePerc.get(1) );
- 			vecServiceCodeUnit.add( vecServiceCodePerc.get(2) );
- 			vecServiceCode.add( vecServiceCodePerc.get(0) );
- 			vecServiceCodeDesc.add( vecServiceCodePerc.get(3) );
- 		}
- 
- 		for (int i=0; i<vecServiceCode.size(); i++){ //recordCount
- 			String[] param2 = new String[8];
- 			param2[0] = "" + nBillNo; // billNo;
- 			param2[1] = (String)vecServiceCode.get(i);//billrec[i]; //request.getParameter("billrec"+i);
- 			param2[2] = (String)vecServiceCodeDesc.get(i);//billrecdesc[i]; //request.getParameter("billrecdesc"+i);
- 			param2[3] = ((String)vecServiceCodePrice.get(i)).replaceAll("\\.", "");//pricerec[i]; //request.getParameter("pricerec"+i);
- 			param2[4] = request.getParameter("dxCode"); //request.getParameter("diagcode");
- 			param2[5] = tempDate[k]; //request.getParameter("appointment_date");
- 			param2[6] = request.getParameter("xml_billtype").substring(0,1); //request.getParameter("billtype");
- 			param2[7] = (String)vecServiceCodeUnit.get(i);//billrecunit[i]; //request.getParameter("billrecunit"+i);
- 
- 			//insert into billingdetail values('\\N',?,?,?,?,?, ?,?,?)
- 	    	sql = "insert into billingdetail(billing_no, service_code, service_desc, billing_amount, diagnostic_code, appointment_date, status, billingunit) values( "
- 	    	+ param2[0] + "," + UtilMisc.nullMySQLEscape(param2[1]) + "," + UtilMisc.nullMySQLEscape(param2[2]) + "," + UtilMisc.nullMySQLEscape(param2[3]) + "," + UtilMisc.nullMySQLEscape(param2[4]) + ","
- 	    	+ UtilMisc.nullMySQLEscape(param2[5]) + "," + UtilMisc.nullMySQLEscape(param2[6]) + "," + UtilMisc.nullMySQLEscape(param2[7]) + ")";
- 			nBillDetailNo = 0;
- 	    	nBillDetailNo = dbObj.saveBillingRecord(sql);
- 	    	if (nBillDetailNo == 0) {
- 	    		// roll back
- 	    		sql = "update billing set status='D' where billing_no = " + nBillNo;
- 				dbObj.updateDBRecord(sql);
- 	    		break;
- 	    	}
- 	    	System.out.println(nBillNo + sql);
- 		}
- 	} // end of for loop
- 	msg += "<br>Billing records were added.";
-   }
- 
    // get patient's billing history
    sql               =
--- 103,110 ----
  	if (demoDOB.length() != 8) {
  		errorFlag = "1";
! 		errorMsg = errorMsg + "<br><b><font color='red'>Error: The patient does not have a valid DOB. </font></b><br>";
  	}
    }
  
    // get patient's billing history
    sql               =
***************
*** 339,345 ****
  
      propHist.setProperty("billing_no", "" + rs.getInt("billing_no"));
!     propHist.setProperty("visitdate", rs.getString("visitdate"));
!     propHist.setProperty("billing_date", rs.getString("billing_date"));
!     propHist.setProperty("update_date", rs.getString("update_date"));
      propHist.setProperty("visitType", rs.getString("visitType"));
      propHist.setProperty("clinic_ref_code", rs.getString("clinic_ref_code"));
--- 117,123 ----
  
      propHist.setProperty("billing_no", "" + rs.getInt("billing_no"));
!     propHist.setProperty("visitdate", rs.getString("visitdate")); // admission date
!     propHist.setProperty("billing_date", rs.getString("billing_date")); // service date
!     propHist.setProperty("update_date", rs.getString("update_date")); // create date
      propHist.setProperty("visitType", rs.getString("visitType"));
      propHist.setProperty("clinic_ref_code", rs.getString("clinic_ref_code"));
***************
*** 427,431 ****
    }
  
!   String visitdate = request.getParameter("xml_vdate")==null?"":request.getParameter("xml_vdate");
  
  
--- 205,216 ----
    }
  
!   String visitdate = null;
!   paraName = request.getParameter("xml_vdate");
!   String xml_vdate = getDefaultValue(paraName, vecHist, "visitdate");
!   if(!"".equals(xml_vdate)) {
!     visitdate = xml_vdate;
!   } else {
!     visitdate = visitdate==null? "":visitdate;
!   }
  
  
***************
*** 442,446 ****
    sql = "select c.service_group_name, c.service_order,b.service_code, b.description, b.value, b.percentage from billingservice b, ctl_billingservice c where c.service_code=b.service_code and c.status='A' and c.servicetype ='"
     + ctlBillForm + "' and c.service_group ='" + "Group1" + "' order by c.service_order";
- //System.out.println(ctlBillForm+" * ******************************" + sql);
    rs = dbObj.searchDBRecord(sql);
    while (rs.next()) {
--- 227,230 ----
***************
*** 459,469 ****
  	vecCodeCol1.add(propT);
    }
!   sql = "select service_code,status from ctl_billingservice_premium where ";
!   for(int i=0; i<vecCodeCol1.size(); i++) {
!   	sql += (i==0?"":" or ") + "service_code='" + ((Properties)vecCodeCol1.get(i)).getProperty("serviceCode") + "'";
!   }
!   rs = dbObj.searchDBRecord(sql);
!   while (rs.next()) {
!     propPremium.setProperty(rs.getString("service_code"), "A");
    }
  
--- 243,255 ----
  	vecCodeCol1.add(propT);
    }
!   if(vecCodeCol1.size()>0) {
! 	  sql = "select service_code,status from ctl_billingservice_premium where ";
! 	  for(int i=0; i<vecCodeCol1.size(); i++) {
! 	  	sql += (i==0?"":" or ") + "service_code='" + ((Properties)vecCodeCol1.get(i)).getProperty("serviceCode") + "'";
! 	  }
! 	  rs = dbObj.searchDBRecord(sql);
! 	  while (rs.next()) {
! 	    propPremium.setProperty(rs.getString("service_code"), "A");
! 	  }
    }
  
***************
*** 501,504 ****
--- 287,291 ----
  	vecCodeCol3.add(propT);
    }
+ //System.out.println(" * ******************************" + sql);
    sql = "select service_code,status from ctl_billingservice_premium where ";
    for(int i=0; i<vecCodeCol3.size(); i++) {
***************
*** 512,516 ****
    // create msg
    msg += errorMsg + warningMsg;
! System.out.println(" * ******************************" + sql);
  
  %>
--- 299,303 ----
    // create msg
    msg += errorMsg + warningMsg;
! //System.out.println(" * ******************************" + sql);
  
  %>
***************
*** 646,649 ****
--- 433,455 ----
  	return false;
  }
+ var remote=null;
+ function rs(n,u,w,h,x) {
+   args="width="+w+",height="+h+",resizable=yes,scrollbars=yes,status=0,top=60,left=30";
+   remote=window.open(u,n,args);
+   if (remote != null) {
+     if (remote.opener == null)
+       remote.opener = self;
+   }
+   if (x == 1) { return remote; }
+ }
+ var awnd=null;
+ function referralScriptAttach(elementName) {
+      var d = elementName;
+      t0 = escape("document.forms[0].elements[\'"+d+"\'].value");
+      //t1 = escape("");
+      //alert(('searchRefDoc.jsp?param='+t0));
+      awnd=rs('att',('searchRefDoc.jsp?param='+t0),600,600,1);
+      awnd.focus();
+ }
  
  //-->
***************
*** 651,655 ****
    </script>
    <body onload="setfocus();" topmargin="0" >
! <div id="Layer1" style="position:absolute; left:1px; top:159px; width:410px; height:200px; z-index:1; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
  	<tr bgcolor="#393764">
--- 457,461 ----
    </script>
    <body onload="setfocus();" topmargin="0" >
! <div id="Layer1" style="position:absolute; left:360px; top:165px; width:410px; height:200px; z-index:1; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
  	<tr bgcolor="#393764">
***************
*** 677,681 ****
  	</table>
  </div>
! <div id="Layer2" style="position:absolute; left:362px; top:26px; width:332px; height:600px; z-index:2; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
  	<tr>
--- 483,487 ----
  	</table>
  </div>
! <div id="Layer2" style="position:absolute; left:1px; top:26px; width:332px; height:600px; z-index:2; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
  	<tr>
***************
*** 696,701 ****
  	<tr bgcolor=<%=ctlCount%2==0 ? "#FFFFFF" : "#EEEEFF"%>>
  		<td width="18%"><b><font size="-2" color="#7A388D"><a href="#" onClick="document.forms[0].dxCode.value='<%=ctldiagcode%>';showHideLayers('Layer2','','hide');return false;"><%=ctldiagcode%></a></font></b></td>
! 		<td colspan="2"><font size="-2" color="#7A388D">
! 		<%=ctldiagcodename.length() < 56 ? ctldiagcodename : ctldiagcodename.substring(0,55)%></font></td>
  	</tr>
  <%
--- 502,507 ----
  	<tr bgcolor=<%=ctlCount%2==0 ? "#FFFFFF" : "#EEEEFF"%>>
  		<td width="18%"><b><font size="-2" color="#7A388D"><a href="#" onClick="document.forms[0].dxCode.value='<%=ctldiagcode%>';showHideLayers('Layer2','','hide');return false;"><%=ctldiagcode%></a></font></b></td>
! 		<td colspan="2"><font size="-2" color="#7A388D"><a href="#" onClick="document.forms[0].dxCode.value='<%=ctldiagcode%>';showHideLayers('Layer2','','hide');return false;">
! 		<%=ctldiagcodename.length() < 56 ? ctldiagcodename : ctldiagcodename.substring(0,55)%></a></font></td>
  	</tr>
  <%
***************
*** 715,719 ****
          	</td>
  			<td align="right">
!             <input type="submit" name="submit" value="Next"  />
              </td>
  			</tr>
--- 521,526 ----
          	</td>
  			<td align="right">
!             <input type="submit" name="submit" value="Next" style="width: 120px;" />
!             <input type="button" name="button" value="Exit" style="width: 120px;" onClick="self.close();"/>
              </td>
  			</tr>
***************
*** 763,768 ****
  
                  <hr>
!                 Referral Doctor<br>
!                 <input type="text" name="referralCode" size="5" maxlength="6" value=""> Code search
                </td>
                </tr>
--- 570,576 ----
  
                  <hr>
!                 Refer. Doctor<br>
!                 <input type="text" name="referralCode" size="5" maxlength="6" value="<%=r_doctor_ohip%>" title="<%=r_doctor%>">
!                 <a href="javascript:referralScriptAttach('referralCode')">Code search</a>
                </td>
                </tr>
***************
*** 827,831 ****
  					propT = (Properties) vecLocation.get(i);
  				%>
! 					<option value="<%=propT.getProperty("clinic_location_no")%>" <%=clinicview.equals(propT.getProperty("clinic_location_no"))?"selected":""%>><%=propT.getProperty("clinic_location_name")%></option>
  				<%
  				}
--- 635,640 ----
  					propT = (Properties) vecLocation.get(i);
  				%>
! 					<option value="<%=propT.getProperty("clinic_location_no") + "|" + propT.getProperty("clinic_location_name")%>" <%=clinicview.equals(propT.getProperty("clinic_location_no"))?"selected":""%>>
! 					<%=propT.getProperty("clinic_location_name")%></option>
  				<%
  				}

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

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

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

Modified Files:
	ExtractBean.java 
Log Message:
bug fixed for no clinic no.

Index: ExtractBean.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/OHIP/ExtractBean.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ExtractBean.java	29 Jul 2004 20:07:00 -0000	1.2
--- ExtractBean.java	31 Mar 2005 03:33:42 -0000	1.3
***************
*** 27,30 ****
--- 27,31 ----
  // -----------------------------------------------------------------------------------------------------------------------
  package oscar.oscarBilling.ca.on.OHIP;
+ 
  import java.io.FileOutputStream;
  import java.io.PrintStream;
***************
*** 39,596 ****
  import oscar.oscarBilling.ca.on.data.BillingONDataHelp;
  import oscar.util.UtilDateUtilities;
[...1092 lines suppressed...]
!     // return x zero str, e.g. 000000
!     public String zero(int x) {
!         String returnZeroValue = new String();
!         for (int y = 0; y < x; y++) {
!             returnZeroValue += "0";
!         }
!         return returnZeroValue;
!     }
! 
!     // return x length string with zero str, e.g. 0018
      public String forwardZero(String y, int x) {
!         // x must >= y.length()
          String returnZeroValue = "";
!         for (int i = y.length(); i < x; i++) {
              returnZeroValue += "0";
          }
! 
!         return (returnZeroValue + y);
      }
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarMessenger styles.css,1.3,1.4

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

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

Modified Files:
	styles.css 
Log Message:
add min-width property to ChooseRecipientsBox



Index: styles.css
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/styles.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** styles.css	20 Jul 2004 20:04:03 -0000	1.3
--- styles.css	30 Mar 2005 16:59:14 -0000	1.4
***************
*** 107,111 ****
  	font-size: 80%;
  	height: 250px;
! 	/*width: 800px;*/
  	overflow: auto;
      margin-left: 4px;
--- 107,111 ----
  	font-size: 80%;
  	height: 250px;
! 	min-width: 200px; 
  	overflow: auto;
      margin-left: 4px;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarMessenger encounterStyles.css,1.3,1.4

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

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

Modified Files:
	encounterStyles.css 
Log Message:
add min-width property to ChooseRecipientsBox



Index: encounterStyles.css
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarMessenger/encounterStyles.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** encounterStyles.css	20 Jul 2004 20:04:03 -0000	1.3
--- encounterStyles.css	30 Mar 2005 16:50:58 -0000	1.4
***************
*** 40,44 ****
  	font-size: 80%;
  	height: 450px;
! 	/*width: 800px;*/
  	overflow: auto;
      margin-left: 4px;
--- 40,44 ----
  	font-size: 80%;
  	height: 450px;
! 	min-width: 200px;
  	overflow: auto;
      margin-left: 4px;

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

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

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

Modified Files:
	reportedblist.jsp 
Log Message:
fixed column alignment



Index: reportedblist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportedblist.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** reportedblist.jsp	25 Feb 2005 21:02:11 -0000	1.7
--- reportedblist.jsp	30 Mar 2005 15:28:41 -0000	1.8
***************
*** 74,77 ****
--- 74,78 ----
           <tr bgcolor="silver"> 
              <TH >&nbsp;</TH>
+             <TH align="center" ><b>#</b></TH>
              <TH align="center" width="10%" nowrap><b>EDB</b></TH>
              <TH align="center" width="30%"><b>Patient's Name </b></TH>

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

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

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

Modified Files:
	reportnewedblist.jsp 
Log Message:
fixed column alignment



Index: reportnewedblist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportnewedblist.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** reportnewedblist.jsp	25 Feb 2005 21:20:51 -0000	1.9
--- reportnewedblist.jsp	30 Mar 2005 15:27:54 -0000	1.10
***************
*** 81,84 ****
--- 81,85 ----
  <CENTER><table width="100%" border="0" bgcolor="silver" cellspacing="2" cellpadding="2"> 
  <tr bgcolor='<%=deepcolor%>'> 
+ <TH align="center" ><b>#</b></TH>
  <TH align="center" width="10%" nowrap><b><bean:message key="report.reportnewdblist.msgEDB"/></b></TH>
  <TH align="center" width="30%"><b><bean:message key="report.reportnewdblist.msgName"/> </b></TH>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/demographic demographicaddarecord.jsp,1.11,1.12 demographiccontrol.jsp,1.14,1.15

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

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

Modified Files:
	demographicaddarecord.jsp demographiccontrol.jsp 
Log Message:
add checking dob/hin duplicated record, if there is a HIN number

Index: demographiccontrol.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiccontrol.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** demographiccontrol.jsp	9 Dec 2004 03:08:03 -0000	1.14
--- demographiccontrol.jsp	28 Mar 2005 18:30:32 -0000	1.15
***************
*** 1,25 ****
! <%--  
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
!  * along with this program; if not, write to the Free Software 
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
!  * 
   * <OSCAR TEAM>
!  * 
!  * This software was written for the 
!  * Department of Family Medicine 
!  * McMaster Unviersity 
!  * Hamilton 
!  * Ontario, Canada 
   */
  --%>
--- 1,25 ----
! <%--
  /*
!  *
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License.
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version. *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
!  *
   * <OSCAR TEAM>
!  *
!  * This software was written for the
!  * Department of Family Medicine
!  * McMaster Unviersity
!  * Hamilton
!  * Ontario, Canada
   */
  --%>
***************
*** 30,38 ****
  <%@ page errorPage="errorpage.jsp" import="oscar.OscarProperties" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
! <%@ include file="../admin/dbconnection.jsp" %>  
  
  <%
    OscarProperties props = OscarProperties.getInstance();
!   
    //operation available to the client -- dboperation
    //construct SQL expression
--- 30,38 ----
  <%@ page errorPage="errorpage.jsp" import="oscar.OscarProperties" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
! <%@ include file="../admin/dbconnection.jsp" %>
  
  <%
    OscarProperties props = OscarProperties.getInstance();
! 
    //operation available to the client -- dboperation
    //construct SQL expression
***************
*** 66,70 ****
      }
    }
!   
    String ptstatusexp="";
    if(request.getParameter("ptstatus")!=null) {
--- 66,70 ----
      }
    }
! 
    String ptstatusexp="";
    if(request.getParameter("ptstatus")!=null) {
***************
*** 72,97 ****
      if(request.getParameter("ptstatus").equals("inactive")) ptstatusexp=" and patient_status in ("+props.getProperty("inactive_statuses", "'IN','DE','IC', 'ID', 'MO', 'FI'")+") ";
    }
!   
    String [][] dbQueries=new String[][] {
!     {"search_titlename", "select *  from demographic where "+fieldname+" "+regularexp+" ? "+ptstatusexp+orderby+" "+limit},  
!     {"add_apptrecord", "select demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no from demographic where "+fieldname+ " "+regularexp+" ? " +ptstatusexp+orderby + " "+limit},  
!     {"update_apptrecord", "select demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no  from demographic where "+fieldname+ " "+regularexp+" ? " +ptstatusexp+orderby + " "+limit},  
      {"search_detail", "select * from demographic where demographic_no=?"},
      {"search_detail_ptbr", "select * from demographic d left outer join demographic_ptbr dptbr on dptbr.demographic_no = d.demographic_no where d.demographic_no=?"},
      {"update_record", "update demographic set last_name=?,first_name =?,address=?, city=?,province=?,postal=?,phone =?,phone2=?,email=?,pin=?, year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?, roster_status=?, patient_status=?, date_joined=?,  chart_no=?,provider_no=?,sex=? , end_date=?,eff_date=?, pcn_indicator=?,hc_type=? ,hc_renew_date=?, family_doctor=? where  demographic_no=?"},
      {"update_record_ptbr", "update demographic_ptbr set cpf=?,rg=?,chart_address=?,marriage_certificate=?,birth_certificate=?,marital_state=?,partner_name=?,father_name=?,mother_name=?,district=?,address_no=?,complementary_address=? where  demographic_no=?"},
!     {"add_record", "insert into demographic (last_name, first_name, address, city, province, postal, phone, phone2, email, pin, year_of_birth, month_of_birth, date_of_birth, hin, ver, roster_status, patient_status, date_joined, chart_no, provider_no, sex, end_date, eff_date, pcn_indicator, hc_type, hc_renew_date, family_doctor) values(?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)" }, 
!     {"add_record_ptbr","insert into demographic_ptbr (demographic_no,cpf,rg,chart_address,marriage_certificate,birth_certificate,marital_state,partner_name,father_name,mother_name,district,address_no,complementary_address) values (?,?,?,?,?,?,?,?,?,?,?,?,?)" }, 
      {"search_provider", "select * from provider order by last_name"},
      {"search_demographicid", "select * from demographic where demographic_no=?"},
!     {"search*", "select * from demographic "+ ptstatusexp+orderby + " "+limit }, 
      {"search_lastfirstnamedob", "select demographic_no from demographic where last_name=? and first_name=? and year_of_birth=? and month_of_birth=? and date_of_birth=?"},
!     {"search_demographiccust_alert", "select cust3 from demographiccust where demographic_no = ? " }, 
      {"search_demographiccust", "select * from demographiccust where demographic_no = ?" },
      {"search_demographic_ptbr","select * from demographic_ptbr where demographic_no = ?"},
      {"search_demoaddno", "select demographic_no from demographic where last_name=? and first_name =? and year_of_birth=? and month_of_birth=? and date_of_birth=? and hin=? and ver=?"},
!     {"search_custrecordno", "select demographic_no from demographiccust  where demographic_no=?" }, 
!     {"add_custrecord", "insert into demographiccust values(?,?,?,?,?, ?)" }, 
!     {"update_custrecord", "update demographiccust set cust1=?,cust2=?,cust3=?,cust4=?,content=? where demographic_no=?" }, 
      {"appt_history", "select appointment_no, appointment_date, start_time, end_time, reason, appointment.status, provider.last_name, provider.first_name from appointment LEFT JOIN provider ON appointment.provider_no=provider.provider_no where appointment.demographic_no=? "+ orderby + " desc "+limit },
      {"search_ptstatus", "select distinct patient_status from demographic where patient_status != '' and patient_status != 'AC' and patient_status != 'IN' and patient_status != 'DE' and patient_status != 'MO' and patient_status != 'FI'"},
--- 72,97 ----
      if(request.getParameter("ptstatus").equals("inactive")) ptstatusexp=" and patient_status in ("+props.getProperty("inactive_statuses", "'IN','DE','IC', 'ID', 'MO', 'FI'")+") ";
    }
! 
    String [][] dbQueries=new String[][] {
!     {"search_titlename", "select *  from demographic where "+fieldname+" "+regularexp+" ? "+ptstatusexp+orderby+" "+limit},
!     {"add_apptrecord", "select demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no from demographic where "+fieldname+ " "+regularexp+" ? " +ptstatusexp+orderby + " "+limit},
!     {"update_apptrecord", "select demographic_no,first_name,last_name,roster_status,sex,chart_no,year_of_birth,month_of_birth,date_of_birth,provider_no  from demographic where "+fieldname+ " "+regularexp+" ? " +ptstatusexp+orderby + " "+limit},
      {"search_detail", "select * from demographic where demographic_no=?"},
      {"search_detail_ptbr", "select * from demographic d left outer join demographic_ptbr dptbr on dptbr.demographic_no = d.demographic_no where d.demographic_no=?"},
      {"update_record", "update demographic set last_name=?,first_name =?,address=?, city=?,province=?,postal=?,phone =?,phone2=?,email=?,pin=?, year_of_birth=?,month_of_birth=?,date_of_birth=?,hin=?,ver=?, roster_status=?, patient_status=?, date_joined=?,  chart_no=?,provider_no=?,sex=? , end_date=?,eff_date=?, pcn_indicator=?,hc_type=? ,hc_renew_date=?, family_doctor=? where  demographic_no=?"},
      {"update_record_ptbr", "update demographic_ptbr set cpf=?,rg=?,chart_address=?,marriage_certificate=?,birth_certificate=?,marital_state=?,partner_name=?,father_name=?,mother_name=?,district=?,address_no=?,complementary_address=? where  demographic_no=?"},
!     {"add_record", "insert into demographic (last_name, first_name, address, city, province, postal, phone, phone2, email, pin, year_of_birth, month_of_birth, date_of_birth, hin, ver, roster_status, patient_status, date_joined, chart_no, provider_no, sex, end_date, eff_date, pcn_indicator, hc_type, hc_renew_date, family_doctor) values(?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)" },
!     {"add_record_ptbr","insert into demographic_ptbr (demographic_no,cpf,rg,chart_address,marriage_certificate,birth_certificate,marital_state,partner_name,father_name,mother_name,district,address_no,complementary_address) values (?,?,?,?,?,?,?,?,?,?,?,?,?)" },
      {"search_provider", "select * from provider order by last_name"},
      {"search_demographicid", "select * from demographic where demographic_no=?"},
!     {"search*", "select * from demographic "+ ptstatusexp+orderby + " "+limit },
      {"search_lastfirstnamedob", "select demographic_no from demographic where last_name=? and first_name=? and year_of_birth=? and month_of_birth=? and date_of_birth=?"},
!     {"search_demographiccust_alert", "select cust3 from demographiccust where demographic_no = ? " },
      {"search_demographiccust", "select * from demographiccust where demographic_no = ?" },
      {"search_demographic_ptbr","select * from demographic_ptbr where demographic_no = ?"},
      {"search_demoaddno", "select demographic_no from demographic where last_name=? and first_name =? and year_of_birth=? and month_of_birth=? and date_of_birth=? and hin=? and ver=?"},
!     {"search_custrecordno", "select demographic_no from demographiccust  where demographic_no=?" },
!     {"add_custrecord", "insert into demographiccust values(?,?,?,?,?, ?)" },
!     {"update_custrecord", "update demographiccust set cust1=?,cust2=?,cust3=?,cust4=?,content=? where demographic_no=?" },
      {"appt_history", "select appointment_no, appointment_date, start_time, end_time, reason, appointment.status, provider.last_name, provider.first_name from appointment LEFT JOIN provider ON appointment.provider_no=provider.provider_no where appointment.demographic_no=? "+ orderby + " desc "+limit },
      {"search_ptstatus", "select distinct patient_status from demographic where patient_status != '' and patient_status != 'AC' and patient_status != 'IN' and patient_status != 'DE' and patient_status != 'MO' and patient_status != 'FI'"},
***************
*** 102,107 ****
      {"search_demo_waiting_list", "select * from waitingList where demographic_no=? AND listID=?"},
      {"search_future_appt", "select a.demographic_no, a.appointment_date from appointment a where a.appointment_date >= now() AND a.demographic_no=?"},
     };
!    
     //associate each operation with an output JSP file -- displaymode
     String[][] responseTargets=new String[][] {
--- 102,108 ----
      {"search_demo_waiting_list", "select * from waitingList where demographic_no=? AND listID=?"},
      {"search_future_appt", "select a.demographic_no, a.appointment_date from appointment a where a.appointment_date >= now() AND a.demographic_no=?"},
+     {"search_hindob", "select demographic_no from demographic where hin=? and year_of_birth=? and month_of_birth=? and date_of_birth=?"},
     };
! 
     //associate each operation with an output JSP file -- displaymode
     String[][] responseTargets=new String[][] {
***************
*** 112,116 ****
       {"appt_history" , "demographicappthistory.jsp"},
       {"Update Record" , "demographicupdatearecord.jsp"},
!     
       {"Add Demographic" , "adddemographictoappt.jsp"},
       {" Search" , "demographicsearch2editapptresults.jsp"},
--- 113,117 ----
       {"appt_history" , "demographicappthistory.jsp"},
       {"Update Record" , "demographicupdatearecord.jsp"},
! 
       {"Add Demographic" , "adddemographictoappt.jsp"},
       {" Search" , "demographicsearch2editapptresults.jsp"},

Index: demographicaddarecord.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographicaddarecord.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** demographicaddarecord.jsp	8 Nov 2004 19:34:15 -0000	1.11
--- demographicaddarecord.jsp	28 Mar 2005 18:30:31 -0000	1.12
***************
*** 4,30 ****
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
! <!--  
  /*
!  * 
   * 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 
   */
  -->
--- 4,30 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
! <!--
  /*
!  *
   * 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
   */
  -->
***************
*** 41,45 ****
        //parent.refresh();
        close();
!     }   
      //-->
  </script>
--- 41,45 ----
        //parent.refresh();
        close();
!     }
      //-->
  </script>
***************
*** 48,57 ****
  <center>
      <table border="0" cellspacing="0" cellpadding="0" width="100%" >
!       <tr bgcolor="#486ebd"> 
              <th align="CENTER"><font face="Helvetica" color="#FFFFFF">
              <bean:message key="demographic.demographicaddarecord.title"/></font></th>
        </tr>
      </table>
!  
  <%
    //if action is good, then give me the result
--- 48,57 ----
  <center>
      <table border="0" cellspacing="0" cellpadding="0" width="100%" >
!       <tr bgcolor="#486ebd">
              <th align="CENTER"><font face="Helvetica" color="#FFFFFF">
              <bean:message key="demographic.demographicaddarecord.title"/></font></th>
        </tr>
      </table>
! 
  <%
    //if action is good, then give me the result
***************
*** 77,81 ****
  	  param[15]=request.getParameter("roster_status");
  	  param[16]=request.getParameter("patient_status");
! 	  // Databases have an alias for today. It is not necessary give the current date.          
            // ** Overridden - we want to give users option to change if needed
            // ** Now defaults to current date on the add demographic screen
--- 77,81 ----
  	  param[15]=request.getParameter("roster_status");
  	  param[16]=request.getParameter("patient_status");
! 	  // Databases have an alias for today. It is not necessary give the current date.
            // ** Overridden - we want to give users option to change if needed
            // ** Now defaults to current date on the add demographic screen
***************
*** 150,154 ****
  
  	  param[25] =  year + "-" + month + "-" + day;
! 	  param[26]="<rdohip>" + request.getParameter("r_doctor_ohip") + "</rdohip>" + "<rd>" + request.getParameter("r_doctor") + "</rd>"+ (request.getParameter("family_doc")!=null? ("<family_doc>" + request.getParameter("family_doc") + "</family_doc>") : "");    
  
  	String[] paramName =new String[5];
--- 150,154 ----
  
  	  param[25] =  year + "-" + month + "-" + day;
! 	  param[26]="<rdohip>" + request.getParameter("r_doctor_ohip") + "</rdohip>" + "<rd>" + request.getParameter("r_doctor") + "</rd>"+ (request.getParameter("family_doc")!=null? ("<family_doc>" + request.getParameter("family_doc") + "</family_doc>") : "");
  
  	String[] paramName =new String[5];
***************
*** 160,164 ****
  	  //System.out.println("from -------- :"+ param[0]+ ": next :"+param[1]);
      ResultSet rs = apptMainBean.queryResults(paramName, "search_lastfirstnamedob");
!     
      if(rs.next()) {  %>
        ***<font color='red'><bean:message key="demographic.demographicaddarecord.msgDuplicatedRecord"/></font>***<br>
--- 160,164 ----
  	  //System.out.println("from -------- :"+ param[0]+ ": next :"+param[1]);
      ResultSet rs = apptMainBean.queryResults(paramName, "search_lastfirstnamedob");
! 
      if(rs.next()) {  %>
        ***<font color='red'><bean:message key="demographic.demographicaddarecord.msgDuplicatedRecord"/></font>***<br>
***************
*** 167,172 ****
      }
  
      // int rowsAffected = apptMainBean.queryExecuteUpdate(intparam, param, request.getParameter("dboperation"));
!     
    int rowsAffected = apptMainBean.queryExecuteUpdate(param, request.getParameter("dboperation")); //add_record
    if (rowsAffected ==1) {
--- 167,189 ----
      }
  
+     // add checking dob/hin duplicated record, if there is a HIN number
+     if(request.getParameter("hin")!=null && request.getParameter("hin").length()>5) {
+   		//oscar.oscarBilling.ca.on.data.BillingONDataHelp dbObj = new oscar.oscarBilling.ca.on.data.BillingONDataHelp();
+ 		//String sql = "select demographic_no from demographic where hin=? and year_of_birth=? and month_of_birth=? and date_of_birth=?";
+ 		String[] paramNameHin =new String[4];
+ 		paramNameHin[0]=request.getParameter("hin").trim();
+ 		paramNameHin[1]=param[10].trim();
+ 		paramNameHin[2]=param[11].trim();
+ 		paramNameHin[3]=param[12].trim();
+ 	    ResultSet rsHin = apptMainBean.queryResults(paramNameHin, "search_hindob");
+ 	    if(rsHin.next()) {  %>
+ 	      ***<font color='red'><bean:message key="demographic.demographicaddarecord.msgDuplicatedRecord"/></font>***<br>
+ 	      <br><a href=# onClick="history.go(-1);"><b>&lt;-<bean:message key="global.btnBack"/></b></a>
+       <% return;
+ 	    }
+     }
+ 
      // int rowsAffected = apptMainBean.queryExecuteUpdate(intparam, param, request.getParameter("dboperation"));
! 
    int rowsAffected = apptMainBean.queryExecuteUpdate(param, request.getParameter("dboperation")); //add_record
    if (rowsAffected ==1) {
***************
*** 180,189 ****
  	  param1[5]=request.getParameter("hin");
  	  param1[6]=request.getParameter("ver");
!     
      rs = apptMainBean.queryResults(param1, "search_demoaddno");
      if(rs.next()) { //
          //add democust record for alert
          String[] param2 =new String[6];
! 	    param2[0]=rs.getString("demographic_no");            
  	    param2[1]=request.getParameter("cust1");
  	    param2[2]=request.getParameter("cust2");
--- 197,206 ----
  	  param1[5]=request.getParameter("hin");
  	  param1[6]=request.getParameter("ver");
! 
      rs = apptMainBean.queryResults(param1, "search_demoaddno");
      if(rs.next()) { //
          //add democust record for alert
          String[] param2 =new String[6];
! 	    param2[0]=rs.getString("demographic_no");
  	    param2[1]=request.getParameter("cust1");
  	    param2[2]=request.getParameter("cust2");
***************
*** 193,202 ****
  	    System.out.println("demographic_no" + param2[0] +param2[1]+param2[2]+param2[3]+param2[4]+param2[5] );
          rowsAffected = apptMainBean.queryExecuteUpdate(param2, "add_custrecord" ); //add_record
!         
          //add to waiting list if the waiting_list parameter in the property file is set to true
!        
          WaitingList wL = WaitingList.getInstance();
          if(wL.getFound()){
!     
              String[] paramWLPosition = new String[1];
              paramWLPosition[0] = request.getParameter("list_id");
--- 210,219 ----
  	    System.out.println("demographic_no" + param2[0] +param2[1]+param2[2]+param2[3]+param2[4]+param2[5] );
          rowsAffected = apptMainBean.queryExecuteUpdate(param2, "add_custrecord" ); //add_record
! 
          //add to waiting list if the waiting_list parameter in the property file is set to true
! 
          WaitingList wL = WaitingList.getInstance();
          if(wL.getFound()){
! 
              String[] paramWLPosition = new String[1];
              paramWLPosition[0] = request.getParameter("list_id");
***************
*** 218,222 ****
  	  	if (request.getParameter("dboperation2") != null) {
  	  	  	String[] parametros = new String[13];
!   	  	
  	  	  	parametros[0]=rs.getString("demographic_no");
  	  	  	parametros[1]=request.getParameter("cpf");
--- 235,239 ----
  	  	if (request.getParameter("dboperation2") != null) {
  	  	  	String[] parametros = new String[13];
! 
  	  	  	parametros[0]=rs.getString("demographic_no");
  	  	  	parametros[1]=request.getParameter("cpf");
***************
*** 232,250 ****
  	  	  	parametros[11]=request.getParameter("address_no")==null || request.getParameter("address_no").trim().equals("")?"0":request.getParameter("address_no");
  	  	  	parametros[12]=request.getParameter("complementary_address");
!   	
!   	
  	  		rowsAffected = apptMainBean.queryExecuteUpdate(parametros, request.getParameter("dboperation2")); //add_record
  	  	}
!       
      }
!     
  %>
    <p><h2><bean:message key="demographic.demographicaddarecord.msgSuccessful"/>
    </h2></p>
! <%  
    } else {
  %>
    <p><h1><bean:message key="demographic.demographicaddarecord.msgFailed"/></h1></p>
! <%  
    }
    apptMainBean.closePstmtConn();
--- 249,267 ----
  	  	  	parametros[11]=request.getParameter("address_no")==null || request.getParameter("address_no").trim().equals("")?"0":request.getParameter("address_no");
  	  	  	parametros[12]=request.getParameter("complementary_address");
! 
! 
  	  		rowsAffected = apptMainBean.queryExecuteUpdate(parametros, request.getParameter("dboperation2")); //add_record
  	  	}
! 
      }
! 
  %>
    <p><h2><bean:message key="demographic.demographicaddarecord.msgSuccessful"/>
    </h2></p>
! <%
    } else {
  %>
    <p><h1><bean:message key="demographic.demographicaddarecord.msgFailed"/></h1></p>
! <%
    }
    apptMainBean.closePstmtConn();

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

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

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

Modified Files:
	billingShortcutPg2.jsp 
Log Message:
temp update

Index: billingShortcutPg2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg2.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** billingShortcutPg2.jsp	24 Mar 2005 23:30:38 -0000	1.1
--- billingShortcutPg2.jsp	26 Mar 2005 19:09:25 -0000	1.2
***************
*** 109,113 ****
  
    // save the billing if needed
!   if(request.getParameter("submit")!=null && "Save".equals(request.getParameter("submit"))) {
      // parse billing date
      int NUMTYPEINFIELD = 5;
--- 109,113 ----
  
    // save the billing if needed
!   if(request.getParameter("submit")!=null && ("Next".equals(request.getParameter("submit"))||"Save".equals(request.getParameter("submit"))  ) ) {
      // parse billing date
      int NUMTYPEINFIELD = 5;
***************
*** 335,338 ****
--- 335,339 ----
  		} // end of for loop
  		msg = "<br>Billing records were added.<br>";
+ 		msg += "<script language=\"JavaScript\"> self.close();</script>/>";
  		msg += "<input type=\"button\" name=\"submit\" value=\" Close \" onclick=\"self.close();\"/>";
  	}
***************
*** 358,374 ****
         adding a calendar a matter of 1 or 2 lines of code. -->
    <script type="text/javascript" src="../../../share/calendar/calendar-setup.js"></script>
  </head>
  
!   <script language="JavaScript">
! 
!             <!--
! 
! //-->
! 
!   </script>
!   <body topmargin="0" >
  
    <table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#CCCCFF">
!     <form method="post" name="titlesearch" action="billingShortcutPg2.jsp" >
        <tr>
          <td>
--- 359,381 ----
         adding a calendar a matter of 1 or 2 lines of code. -->
    <script type="text/javascript" src="../../../share/calendar/calendar-setup.js"></script>
+ 	<script language="JavaScript">
+ 	<!--
+ 	    function onSave() {
+ 	        //document.forms[0].submit.value="save";
+ 	        var ret = true;
+ 	        if(ret==true)
+ 	        {
+ 	            ret = confirm("Are you sure you want to save this form?");
+ 	        }
+ 	        return ret;
+ 	    }
+ 	//-->
+ 	</script>
  </head>
  
! <body topmargin="0" >
  
    <table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#CCCCFF">
!     <form method="post" name="titlesearch" action="billingShortcutPg2.jsp"  onsubmit="return onSave();">
        <tr>
          <td>

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

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

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

Modified Files:
	billingShortcutPg1.jsp 
Log Message:
update for hospital billing

Index: billingShortcutPg1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingShortcutPg1.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** billingShortcutPg1.jsp	24 Mar 2005 23:30:38 -0000	1.1
--- billingShortcutPg1.jsp	26 Mar 2005 19:09:04 -0000	1.2
***************
*** 45,48 ****
--- 45,49 ----
    Properties        propHist          = null;
    Vector            vecHist           = new Vector();
+ System.out.println(";;;;;;;;;;;;;;;;;;;;;;;;;;" + msg);
    // get provider's detail
    String proOHIPNO="", proRMA="";
***************
*** 532,535 ****
--- 533,539 ----
  
              <!--
+ function setfocus() {
+     this.focus();
+ }
  function gotoBillingOB() {
    if(self.location.href.lastIndexOf("?") > 0) {
***************
*** 552,561 ****
  	obj.visibility=v; }
  }
!     function onSave() {
          //document.forms[0].submit.value="save";
          var ret = checkAllDates();
          if(ret==true)
          {
!             ret = confirm("Are you sure you want to save this form?");
          }
          return ret;
--- 556,565 ----
  	obj.visibility=v; }
  }
!     function onNext() {
          //document.forms[0].submit.value="save";
          var ret = checkAllDates();
          if(ret==true)
          {
!             //ret = confirm("Are you sure you want to save this form?");
          }
          return ret;
***************
*** 566,570 ****
          	alert("No billing date!");
              b = false;
!         } else if(!isChecked("xml_") && document.forms[0].serviceDate0.value.length!=5 || !isServiceCode(document.forms[0].serviceDate0.value)){
          	alert("Need service code!");
              b = false;
--- 570,574 ----
          	alert("No billing date!");
              b = false;
!         } else if(!isChecked("code_xml_") && document.forms[0].serviceDate0.value.length!=5 || !isServiceCode(document.forms[0].serviceDate0.value)){
          	alert("Need service code!");
              b = false;
***************
*** 584,588 ****
          	alert("Wrong dx code!");
              b = false;
!         } else if(document.forms[0].xml_provider.options[0].selected){
          	alert("Please select a provider.");
              b = false;
--- 588,593 ----
          	alert("Wrong dx code!");
              b = false;
!         //} else if(document.forms[0].xml_provider.options[0].selected){
!         } else if(document.forms[0].xml_provider.value=="000000"){
          	alert("Please select a provider.");
              b = false;
***************
*** 633,637 ****
  function isChecked(s) {
      for (var i =0; i <document.forms[0].elements.length; i++) {
!         if (document.forms[0].elements[i].name.indexOf(s)==0 && document.forms[0].elements[i].name.length==9) {
              if (document.forms[0].elements[i].checked) {
  				return true;
--- 638,642 ----
  function isChecked(s) {
      for (var i =0; i <document.forms[0].elements.length; i++) {
!         if (document.forms[0].elements[i].name.indexOf(s)==0 && document.forms[0].elements[i].name.length==14) {
              if (document.forms[0].elements[i].checked) {
  				return true;
***************
*** 645,649 ****
  
    </script>
!   <body topmargin="0" >
  <div id="Layer1" style="position:absolute; left:1px; top:159px; width:410px; height:200px; z-index:1; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
--- 650,654 ----
  
    </script>
!   <body onload="setfocus();" topmargin="0" >
  <div id="Layer1" style="position:absolute; left:1px; top:159px; width:410px; height:200px; z-index:1; background-color: #FFCC00; layer-background-color: #FFCC00; border: 1px none #000000; visibility: hidden">
  	<table width="98%" border="0" cellspacing="0" cellpadding="0" align=center>
***************
*** 702,706 ****
  
    <table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#CCCCFF">
!     <form method="post" name="titlesearch" action="billingShortcutPg2.jsp" onsubmit="return checkTypeIn()">
        <tr>
          <td>
--- 707,711 ----
  
    <table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#CCCCFF">
!     <form method="post" name="titlesearch" action="billingShortcutPg2.jsp" onsubmit="return onNext();">
        <tr>
          <td>
***************
*** 710,714 ****
          	</td>
  			<td align="right">
!             <input type="submit" name="submit" value="Save" onclick="javascript:return onSave();" />
              </td>
  			</tr>
--- 715,719 ----
          	</td>
  			<td align="right">
!             <input type="submit" name="submit" value="Next"  />
              </td>
  			</tr>
***************
*** 751,756 ****
  	                Cal.% mode<br>
  					<select name="rulePerc" >
- 					<option value="allAboveCode" >All</option>
  					<option value="onlyAboveCode" >Only Above</option>
  	                </select>
  	                </td></tr>
--- 756,761 ----
  	                Cal.% mode<br>
  					<select name="rulePerc" >
  					<option value="onlyAboveCode" >Only Above</option>
+ 					<option value="allAboveCode" >All</option>
  	                </select>
  	                </td></tr>
***************
*** 770,774 ****
  				<b>Billing Physician</b></td>
  				<td width="20%">
! 				<select name="xml_provider" datafld='xml_provider'>
  				<option value="000000" <%=providerview.equals("000000")?"selected":""%>><b>Select Provider</b></option>
  				<%
--- 775,785 ----
  				<b>Billing Physician</b></td>
  				<td width="20%">
! 				<select name="xml_provider">
! 				<%
! 				if(vecProvider.size()==1) {
! 					propT = (Properties) vecProvider.get(0);
! 				%>
! 					<option value="<%=propT.getProperty("proOHIP")%>" <%=providerview.equals(propT.getProperty("proOHIP"))?"selected":""%>><b><%=propT.getProperty("last_name")%>, <%=propT.getProperty("first_name")%></b></option>
! 				<%	} else { %>
  				<option value="000000" <%=providerview.equals("000000")?"selected":""%>><b>Select Provider</b></option>
  				<%
***************
*** 777,781 ****
  				%>
  					<option value="<%=propT.getProperty("proOHIP")%>" <%=providerview.equals(propT.getProperty("proOHIP"))?"selected":""%>><b><%=propT.getProperty("last_name")%>, <%=propT.getProperty("first_name")%></b></option>
! 				<%
  				}
  				%>
--- 788,792 ----
  				%>
  					<option value="<%=propT.getProperty("proOHIP")%>" <%=providerview.equals(propT.getProperty("proOHIP"))?"selected":""%>><b><%=propT.getProperty("last_name")%>, <%=propT.getProperty("first_name")%></b></option>
! 				<%	}
  				}
  				%>
***************
*** 828,835 ****
                	<img src="../../../images/cal.gif" id="xml_vdate_cal">
  				</td>
! 				<td>
  				<a href="#" onClick="showHideLayers('Layer1','','show');return false;">Billing form</a>:</font></b>
! 				</td>
! 				<td><%=currentFormName.length()<30 ? currentFormName : currentFormName.substring(0,30)%>
  				</td>
  
--- 839,845 ----
                	<img src="../../../images/cal.gif" id="xml_vdate_cal">
  				</td>
! 				<td colspan="2">
  				<a href="#" onClick="showHideLayers('Layer1','','show');return false;">Billing form</a>:</font></b>
! 				<%=currentFormName.length()<30 ? currentFormName : currentFormName.substring(0,30)%>
  				</td>
  
***************
*** 1116,1120 ****
    if(paraName!=null && !"".equals(paraName)) {
      ret = paraName;
!   } else if(vec.get(0)!=null) {
      ret = ((Properties)vec.get(0)).getProperty(propName, "") ;
    }
--- 1126,1130 ----
    if(paraName!=null && !"".equals(paraName)) {
      ret = paraName;
!   } else if(vec!=null && vec.size()>0 && vec.get(0)!=null) {
      ret = ((Properties)vec.get(0)).getProperty(propName, "") ;
    }

[Oscarmcmaster-cvscommit] oscar_mcmaster/RourkeVacsMigrator RourkeVacsMigrator.jar,1.2,1.3 RourkeVacsMigrator.py,1.2,1.3

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

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

Modified Files:
	RourkeVacsMigrator.jar RourkeVacsMigrator.py 
Log Message:
Fixed line feed prepend(removed erroneous escape character

Index: RourkeVacsMigrator.jar
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/RourkeVacsMigrator.jar,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvsj11nBH and /tmp/cvsy8M4pd differ

Index: RourkeVacsMigrator.py
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/RourkeVacsMigrator.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RourkeVacsMigrator.py	25 Mar 2005 22:44:51 -0000	1.2
--- RourkeVacsMigrator.py	25 Mar 2005 23:13:23 -0000	1.3
***************
*** 161,165 ****
  						if strFlag == "1":
  							freeTextFld = self.pageMappings[colName]
! 							freeTextData = rs.getString(freeTextFld) + "\\n" + self.fieldDescMappings[colName]  
  							qryUpdate = "update " + self.tbl + " set " + freeTextFld + "=? " + "where ID = " + rs.getString("ID")
  							stUpdate = con.prepareStatement(qryUpdate)
--- 161,165 ----
  						if strFlag == "1":
  							freeTextFld = self.pageMappings[colName]
! 							freeTextData = rs.getString(freeTextFld) + "\n" + self.fieldDescMappings[colName]  
  							qryUpdate = "update " + self.tbl + " set " + freeTextFld + "=? " + "where ID = " + rs.getString("ID")
  							stUpdate = con.prepareStatement(qryUpdate)

[Oscarmcmaster-cvscommit] oscar_mcmaster/RourkeVacsMigrator RourkeVacsMigrator.jar,1.1,1.2 RourkeVacsMigrator.py,1.1,1.2

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

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

Modified Files:
	RourkeVacsMigrator.jar RourkeVacsMigrator.py 
Log Message:
Minor update to script, corrected table name reference

Index: RourkeVacsMigrator.jar
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/RourkeVacsMigrator.jar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsuLt7TM and /tmp/cvsQv3inh differ

Index: RourkeVacsMigrator.py
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/RourkeVacsMigrator.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RourkeVacsMigrator.py	24 Mar 2005 02:54:40 -0000	1.1
--- RourkeVacsMigrator.py	25 Mar 2005 22:44:51 -0000	1.2
***************
*** 52,55 ****
--- 52,56 ----
  		self.db_driver = ""
  	        self.db_uri = ""
+ 	        self.tbl = "formRourke"
  		self.con = None #java.sql.Connection Object
  		#Maps immunization flags to the corresponding free text field
***************
*** 144,148 ****
          	try:
  			fldNames = self.fieldDescMappings.keys()
! 			qry = "select * from formrourke"
  			con = self.createConnection()
  			statement = con.createStatement()
--- 145,149 ----
          	try:
  			fldNames = self.fieldDescMappings.keys()
! 			qry = "select * from " + self.tbl
  			con = self.createConnection()
  			statement = con.createStatement()
***************
*** 161,165 ****
  							freeTextFld = self.pageMappings[colName]
  							freeTextData = rs.getString(freeTextFld) + "\\n" + self.fieldDescMappings[colName]  
! 							qryUpdate = "update formrourke set " + freeTextFld + "=? " + "where ID = " + rs.getString("ID")
  							stUpdate = con.prepareStatement(qryUpdate)
  							stUpdate.setString(1,freeTextData)
--- 162,166 ----
  							freeTextFld = self.pageMappings[colName]
  							freeTextData = rs.getString(freeTextFld) + "\\n" + self.fieldDescMappings[colName]  
! 							qryUpdate = "update " + self.tbl + " set " + freeTextFld + "=? " + "where ID = " + rs.getString("ID")
  							stUpdate = con.prepareStatement(qryUpdate)
  							stUpdate.setString(1,freeTextData)

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

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

Modified Files:
	oscarRxPrintCfgPg1.txt 
Log Message:
update rx print to paper A6

Index: oscarRxPrintCfgPg1.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop/oscarRxPrintCfgPg1.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** oscarRxPrintCfgPg1.txt	22 Mar 2005 23:57:15 -0000	1.1
--- oscarRxPrintCfgPg1.txt	25 Mar 2005 20:43:21 -0000	1.2
***************
*** 1,12 ****
! __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
--- 1,13 ----
! __R	 : left, 20, 53, 0, BaseFont.HELVETICA, 50 , R
! __x	 : left, 40, 66, 0, BaseFont.HELVETICA, 50 , x
! #doctorName			 : left, 90, 18, 0, BaseFont.HELVETICA, 10
! clinicName			 : left, 80, 15, 0, BaseFont.TIMES_ROMAN, 10, _, 280, 100, 11
! 
! #clinicAddress			 : left, 90, 42, 0, BaseFont.HELVETICA, 10
! #clinicCityPostal			 : left, 90, 54, 0, BaseFont.HELVETICA, 10
! __tel	 : left, 190, 70, 0, BaseFont.HELVETICA, 10 , Tel:
! clinicPhone			 : left, 210, 70, 0, BaseFont.HELVETICA, 10
! __fax	 : left, 190, 80, 0, BaseFont.HELVETICA, 10 , Fax:
! clinicFax			 : left, 210, 80, 0, BaseFont.HELVETICA, 10
  __$line1		: 17, 323, 280, 323, 0.8
  patientName	 		: left, 20, 103, 0, BaseFont.HELVETICA, 10
***************
*** 15,21 ****
  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
--- 16,26 ----
  patientCityPostal	: left, 20, 127, 0, BaseFont.HELVETICA, 10
  patientPhone		: left, 20, 139, 0, BaseFont.HELVETICA, 10
! __$line2		: 17, 265, 280, 265, 0.8
! rx		: left, 20, 152, 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
+ __$lineL		: 10, 20, 10, 405, 0.5
+ __$lineR		: 285, 20, 285, 405, 0.5
+ __$lineT		: 10, 405, 285, 405, 0.5
+ __$lineB		: 10, 20, 285, 20, 0.5

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

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

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

Modified Files:
	Preview.jsp 
Log Message:
update rx print to paper A6

Index: Preview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/Preview.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Preview.jsp	24 Mar 2005 16:12:08 -0000	1.5
--- Preview.jsp	25 Mar 2005 20:42:20 -0000	1.6
***************
*** 88,95 ****
   			title="Print in a half letter size paper" onclick="javascript:return onPrint();">
  			<input type="hidden" name="printPageSize" value="PageSize.A6"/>
  			<input type="hidden" name="doctorName" value="<%= StringEscapeUtils.escapeHtml(doctorName) %>"/>
! 			<input type="hidden" name="clinicName" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicName()) %>"/>
! 			<input type="hidden" name="clinicAddress" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicAddress()) %>"/>
! 			<input type="hidden" name="clinicCityPostal" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicCity())+"   " + StringEscapeUtils.escapeHtml(provider.getClinicPostal())%>"/>
  			<input type="hidden" name="clinicPhone" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicPhone()) %>"/>
  			<input type="hidden" name="clinicFax" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicFax()) %>"/>
--- 88,97 ----
   			title="Print in a half letter size paper" onclick="javascript:return onPrint();">
  			<input type="hidden" name="printPageSize" value="PageSize.A6"/>
+ 			<% 	String clinicTitle = provider.getClinicName() + "<br>" ;
+ 			 	clinicTitle += provider.getClinicAddress() + "<br>" ;
+ 			 	clinicTitle += provider.getClinicCity() + "   " + provider.getClinicPostal()  ;
+ 			%>
  			<input type="hidden" name="doctorName" value="<%= StringEscapeUtils.escapeHtml(doctorName) %>"/>
! 			<input type="hidden" name="clinicName" value="<%= StringEscapeUtils.escapeHtml(clinicTitle.replaceAll("(<br>)","\\\n")) %>"/>
  			<input type="hidden" name="clinicPhone" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicPhone()) %>"/>
  			<input type="hidden" name="clinicFax" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicFax()) %>"/>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formrourkep1.jsp,1.3,1.4 formrourkep2.jsp,1.3,1.4 formrourkep3.jsp,1.3,1.4 printRourke.css,1.2,1.3 rourkeStyle.css,1.2,1.3

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

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

Modified Files:
	formrourkep1.jsp formrourkep2.jsp formrourkep3.jsp 
	printRourke.css rourkeStyle.css 
Log Message:
Rourke Form Modifications:
Removed vaccination form components and replace with text areas for input of free text

Replaced text fields with text areas to allow for multi line input

Modified CSS files to improve form/print presentation(Forms print on standard 8X11 now)

Modified printRourke,css to display entire contents of text areas at print time

Index: formrourkep3.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourkep3.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** formrourkep3.jsp	12 Aug 2004 21:08:12 -0000	1.3
--- formrourkep3.jsp	25 Mar 2005 06:08:36 -0000	1.4
***************
*** 1,952 ****
! <%--  
  /*
!  * 
   * 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, 
[...2771 lines suppressed...]
              <a href="formrourkep1.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>&provNo=<%=provNo%>"><bean:message key="oscarEncounter.formRourke3.btnPage1"/></a>&nbsp;|&nbsp;
+ 
              <a href="formrourkep2.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>&provNo=<%=provNo%>"><bean:message key="oscarEncounter.formRourke3.btnPage2"/></a>&nbsp;|&nbsp;
+ 
              <a ><bean:message key="oscarEncounter.formRourke3.msgPage3"/></a>
+ 
          </td>
+ 
      </tr>
+ 
  </table>
  
+ 
+ 
  </html:form>
+ 
  </body>
+ 
  </html:html>
+ 

Index: printRourke.css
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/printRourke.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** printRourke.css	20 Jul 2004 19:11:52 -0000	1.2
--- printRourke.css	25 Mar 2005 06:08:36 -0000	1.3
***************
*** 1,100 ****
! /*
!  * 
!  * 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 
!  */
! 
! BODY
! {
!     background-color: white;
!     color: black;
!     width:750px;
!     font-size:90%;
! }
! 
! BODY A
! {
!     color: black;
! }
! 
! TABLE {
!     font-size:90%;
! }
! 
! INPUT {
!     size:80%;
! }
! .head
! {
!     display:none;
! }
! .head INPUT
! {
!     display:none;
! }
! .head A
! {
!     display:none;
! }
! .header
! {
!     display:none;
! }
! .header INPUT
! {
!     display:none;
! }
! .header A
! {
!     display:none;
! }
! .hidePrint
! {
!     display: none;
! }
! .hidePrint INPUT
! {
!     display: none;
! }
! .hidePrint A
! {
!     display: none;
! }
! .row
! {
!     background-color: #FFFFFF;
!     color: #000000;
! }
! .column
! {
!     background-color: #FFFFFF;
!     color: #000000;
! }
! .titleBar
! {
!     background-color: #FFFFFF;
!     color: #000000;
! }
! .outerTable {
!     padding: 0;
!     border-spacing: 0;
! 	width:650px;
! }
--- 1,142 ----
! /*
!  * 
!  * 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,table,textarea,input
! {
! 	font-family:"Times New Roman";
! 	font-size:7pt;
! }
! 
! BODY
! {
!     background-color: white;
!     color: black;
!     width:750px;
!     font-size:7pt;
!     margin-top: 0px;
!     margin-right: 0px;
!     margin-bottom: 0px;
!     margin-left: 0px
! }
! 
! BODY A
! {
!     color: black;
! }
! tr
! {
! 	vertical-align:top;
! }
! textarea
! {
! 	overflow:visible; 
! }
! .cntrTable
! {
! 	width:650px;
! }
! 
! .head
! {
!     display:none;
! }
! .head INPUT
! {
!     display:none;
! }
! .head A
! {
!     display:none;
! }
! .header
! {
!     display:none;
! }
! .header INPUT
! {
!     display:none;
! }
! .header A
! {
!     display:none;
! }
! .hidePrint
! {
!     display: none;
! }
! .hidePrint INPUT
! {
!     display: none;
! }
! .hidePrint A
! {
!     display: none;
! }
! .row
! {
!     background-color: #FFFFFF;
!     color: #000000;
! 	 padding-top:0px;
!     padding-bottom:0px;
! }
! .column
! {
!     background-color: #FFFFFF;
!     color: #cccccc;
! 	font-size:7pt;
! 	overflow:visible;
! 	 padding-top:0px;
!     padding-bottom:0px;
! 	vertical-align:top;
!     text-align:center;
! 	width:100px;
! }
! .titleBar
! {
!     background-color: #FFFFFF;
!     color: #000000;
! 	padding-top:0px;
!     padding-bottom:0px;
! 
! }
! .outerTable {
!     padding: 0;
!     border-spacing: 0;
! 	width:650px;
! }
! 
! .chk{
! 	width:7pt;
! 	height:7pt;
! }
! 
! input
! {
! 	margin: 0px;
! 	padding: 0px;
! }
! 
! .wide 
! {
!    width:100%; 
! }

Index: formrourkep2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourkep2.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** formrourkep2.jsp	12 Aug 2004 21:08:12 -0000	1.3
--- formrourkep2.jsp	25 Mar 2005 06:08:36 -0000	1.4
***************
*** 1,25 ****
! <%--  
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
[...1288 lines suppressed...]
          </td>
!         <td colspan="3" valign="top">      <textarea name="p2_immunization4m" class="wide"><%= props.getProperty("p2_immunization4m", "") %></textarea></td>
!         <td colspan="3" valign="top">      <textarea name="p2_immunization6m" class="wide"><%= props.getProperty("p2_immunization6m", "") %></textarea></td>
!         <td colspan="3" valign="top">      <textarea name="p2_immunization9m" class="wide"><%= props.getProperty("p2_immunization9m", "") %></textarea></td>
!         <td colspan="3" valign="top">      <textarea name="p2_immunization12m" class="wide"><%= props.getProperty("p2_immunization12m", "") %></textarea></td>
      </tr>
      <tr>
***************
*** 1039,1043 ****
  </table>
  
! <table class="Header" class="hidePrint">
      <tr>
          <td nowrap="true">
--- 983,987 ----
  </table>
  
! <table cellspacing="0" cellpadding="0" class="Header" class="hidePrint">
      <tr>
          <td nowrap="true">

Index: formrourkep1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formrourkep1.jsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** formrourkep1.jsp	12 Aug 2004 21:08:12 -0000	1.3
--- formrourkep1.jsp	25 Mar 2005 06:08:36 -0000	1.4
***************
*** 1,25 ****
! <%--  
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
[...1254 lines suppressed...]
                  </tr>
              </table>
          </td>
+         <td colspan="3" valign="top">      <textarea name="p1_immunization1m" cols="25" class="wide"><%= props.getProperty("p1_immunization1m", "") %></textarea></td>
+         <td colspan="3" valign="top">      <textarea name="p1_immunization2m" cols="25" class="wide"><%= props.getProperty("p1_immunization2m", "") %></textarea></td>
      </tr>
      <tr>
***************
*** 1043,1047 ****
  </table>
  
! <table class="Header" class="hidePrint">
      <tr>
          <td nowrap="true">
--- 988,992 ----
  </table>
  
! <table cellpadding="0" cellspacing="0"   class="Header" class="hidePrint">
      <tr>
          <td nowrap="true">

Index: rourkeStyle.css
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/rourkeStyle.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rourkeStyle.css	20 Jul 2004 19:11:52 -0000	1.2
--- rourkeStyle.css	25 Mar 2005 06:08:36 -0000	1.3
***************
*** 22,40 ****
   * Ontario, Canada 
   */
  
  BODY {
! 	font-size:80%;
      background-color:#DAEBFC;
!     font-family: ARIAL, SANS-SERIF;
  //    #c1ddf9;
  }
  
! TABLE {
! 	font-size:100%;
!     border-collapse:true;
! }
! 
! TEXTAREA {
!     overflow: auto;
  }
  
--- 22,36 ----
   * Ontario, Canada 
   */
+ .contain{table-layout:fixed;}
  
  BODY {
! 	font-size:10pt;
      background-color:#DAEBFC;
! 	font-family:"Times New Roman", Times, serif;
  //    #c1ddf9;
  }
  
! html,TABLE {
! 	font-size:10pt;
  }
  
***************
*** 86,89 ****
--- 82,87 ----
  .row A {
      font-weight:bold;
+ 	font-family:"Times New Roman", Times, serif;
+ 	font-size:10pt;
  }
  
***************
*** 98,105 ****
  
  .wide {
!     width:100%;
  }
  
  .data {
!     font-size:9pt;
! }
\ No newline at end of file
--- 96,109 ----
  
  .wide {
!    width:100%; 
  }
  
  .data {
!     font-size:10pt;
! 	font-family:"Times New Roman", Times, serif;
! }
! tr{vertical-align:top;}
! input {
! 		margin: 0px;
! 	padding: 0px;
! }

[Oscarmcmaster-cvscommit] oscar_mcmaster/RourkeVacsMigrator RourkeVacsMigrator.jar,NONE,1.1 README.txt,1.1,1.2

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

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

Modified Files:
	README.txt 
Added Files:
	RourkeVacsMigrator.jar 
Log Message:
Revised The README file, Jay please let me know if you think the readme is missing anything important.

Added jar file for use on systems that don't have Jython intepreter installed

Index: README.txt
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator/README.txt,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** README.txt	24 Mar 2005 02:54:40 -0000	1.1
--- README.txt	25 Mar 2005 05:57:22 -0000	1.2
***************
*** 1,12 ****
! Rourke Vaccination Migration Script:
  
! Description:
  
! This script migrates immunization flag data from the formrourke table in OSCAR 2.0
  Each Immunization field is associated with a corresponding free text field as well 
  as a textual description.If an immunization field contains a value of "1", a line feed 
  as well as its correspondening textual description is appended to the corresponding free text field, 
! in the formrourke table. Upon execution of the script, a log file called rourketransfer.log is created, to aid you in assessing
! the the results of the migration. 
  
  An example of the log file is as follows:
--- 1,73 ----
! Rourke Vaccination Migration Utility
! Date March 24, 2005 
! Author:Joel Legris
! Email:joe...@eg... 
  
! --------------------------------------------------------------------------------------------------------------
! Description
! --------------------------------------------------------------------------------------------------------------
  
! This utility migrates immunization flag data from the formrourke table in OSCAR 2.0
  Each Immunization field is associated with a corresponding free text field as well 
  as a textual description.If an immunization field contains a value of "1", a line feed 
  as well as its correspondening textual description is appended to the corresponding free text field, 
! in the formrourke table. It is important to note that although the immunization data will be migrated to
! the associated free text fields, the existing data will still remain in the original database fields.
! 
! 
! ***WARNING: Make sure you that you perform a couple of tests on a test database, this is alpha software!***
! 
! 
! --------------------------------------------------------------------------------------------------------------
! Program Files
! --------------------------------------------------------------------------------------------------------------
! 
! RourkeVacsMigrator.py(written in Jython)
! RourkeMig.jar
! db.properties
! 
! 
! --------------------------------------------------------------------------------------------------------------
! Dependencies
! --------------------------------------------------------------------------------------------------------------
! 
! In order to execute the script, ensure that the following library and interpreter dependencies are satisfied:
! 
! Jython 2.1 interpreter
! 
! and/or
! 
! Java 1.4.2 JRE/SDK
! 
! --------------------------------------------------------------------------------------------------------------
! Installation
! --------------------------------------------------------------------------------------------------------------
! 
! Place the utility files in the directory of choice.
! 
! 
! --------------------------------------------------------------------------------------------------------------
! Execution
! --------------------------------------------------------------------------------------------------------------
! 
! In order for the program to succesfully execute, ensure that the db.properties file exists in the same directory(configured with the appropriate db parameters).
! A sample configuration is commented in the included file. 
! 
! There is a choice of two methods to execute the program.
! 
! 	1. Execute Jython script on command line as follows(Jython interpreter must be installed):
! 
! 		jython RourkeVacsMigrator.py
! 
! 	2. Execute jar file as follows(If Jython interpreter is not installed):
! 
! 		java -jar RourkeVacsMigrator.jar
! 
! 
! --------------------------------------------------------------------------------------------------------------
! Follow Up
! --------------------------------------------------------------------------------------------------------------
! 
! Upon execution of the utility, a log file called rourketransfer.log is created, to aid you in assessing the the results of the migration. 
  
  An example of the log file is as follows:
***************
*** 22,42 ****
  
  
- Dependencies:
  
- In order to execute the script, ensure that the following library and interpreter dependencies are satisfied:
  
- Jython 2.1 interpreter
- Java 1.4 JRE/SDK
- 
- Installation:
  
- Place the script in the directory of choice.
- 
- Execution:
- 
- In order for the script to succesfully execute, ensure that the db.properties file exists in the same directory(with the appropriate db parameters).
- A sample configuration is commented in the include file. Make sure you that you perform a couple of tests on a dummy database, this is alpha software!
- 
- 
- Author:Joel Legris
- Email:joe...@eg...
--- 83,87 ----

--- NEW FILE: RourkeVacsMigrator.jar ---
(This appears to be a binary file; contents omitted.)

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

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

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

Modified Files:
	addEditServiceCode.jsp 
Added Files:
	billingShortcutPg2.jsp billingShortcutPg1.jsp 
Log Message:
for hospital billing

Index: addEditServiceCode.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/addEditServiceCode.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** addEditServiceCode.jsp	20 Mar 2005 00:32:38 -0000	1.4
--- addEditServiceCode.jsp	24 Mar 2005 23:30:38 -0000	1.5
***************
*** 57,60 ****
--- 57,81 ----
  			sql += "where service_code='" + serviceCode + "'";
  			System.out.println(sql);
+ 			if(request.getParameter("percentage").length()>1 && request.getParameter("min").length()>1 && request.getParameter("max").length()>1) {
+ 				String sqlMinMax = "select * from billingperclimit where service_code='" + serviceCode + "'";
+ 				boolean bAdd = true;
+ 				ResultSet rs1 = dbObj.searchDBRecord(sqlMinMax);
+ 				if (rs1.next()) {
+ 					bAdd = false;
+ 				}
+ 				if(bAdd) {
+ 					sqlMinMax = "insert into billingperclimit values('";
+ 					sqlMinMax += serviceCode + "', '";
+ 					sqlMinMax += request.getParameter("min") + "', '";
+ 					sqlMinMax += request.getParameter("max") + "' )";
+ 					dbObj.updateDBRecord(sqlMinMax);
+ 				} else {
+ 					sqlMinMax = "update billingperclimit set min='";
+ 					sqlMinMax += request.getParameter("min") + "', max='";
+ 					sqlMinMax += request.getParameter("max") + "' where service_code='";
+ 					sqlMinMax += serviceCode + "'";
+ 					dbObj.updateDBRecord(sqlMinMax);
+ 				}
+ 			}
  			if(dbObj.updateDBRecord(sql)) {
  	  			msg = serviceCode + " is updated.<br>" + "Type in a service code and search first to see if it is available.";
***************
*** 85,89 ****
  			sql += request.getParameter("percentage") + "', '";
  			sql += request.getParameter("billingservice_date") + "' )";
! 			if(dbObj.updateDBRecord(sql)) {
  	  			msg = serviceCode + " is added.<br>" + "Type in a service code and search first to see if it is available.";
  	  			action = "search";
--- 106,117 ----
  			sql += request.getParameter("percentage") + "', '";
  			sql += request.getParameter("billingservice_date") + "' )";
! 			if(request.getParameter("percentage").length()>1 && request.getParameter("min").length()>1 && request.getParameter("max").length()>1) {
! 				String sqlMinMax = "insert into billingperclimit values('";
! 				sqlMinMax += serviceCode + "', '";
! 				sqlMinMax += request.getParameter("min") + "', '";
! 				sqlMinMax += request.getParameter("max") + "' )";
! 				dbObj.updateDBRecord(sqlMinMax);
! 			}
! 			if(dbObj.updateDBRecord(sql) ) {
  	  			msg = serviceCode + " is added.<br>" + "Type in a service code and search first to see if it is available.";
  	  			action = "search";
***************
*** 97,100 ****
--- 125,130 ----
  			    prop.setProperty("percentage", request.getParameter("percentage"));
  			    prop.setProperty("billingservice_date", request.getParameter("billingservice_date"));
+ 			    prop.setProperty("min", request.getParameter("min"));
+ 			    prop.setProperty("max", request.getParameter("max"));
  			}
  		} else {
***************
*** 114,117 ****
--- 144,148 ----
  		String	sql   = "select * from billingservice where service_code='" + serviceCode + "'";
  		ResultSet rs = dbObj.searchDBRecord(sql);
+ System.out.println(sql);
  
  		if (rs.next()) {
***************
*** 123,126 ****
--- 154,166 ----
  		    msg = "You can edit the service code.";
  		    action = "edit" + serviceCode;
+ 
+ 		    String sqlMinMax = "select * from billingperclimit where service_code='" + serviceCode + "'";
+ System.out.println(sqlMinMax);
+ 			ResultSet rs2 = dbObj.searchDBRecord(sqlMinMax);
+ 			if (rs2.next()) {
+ 		    	prop.setProperty("min", rs2.getString("min"));
+ 		    	prop.setProperty("max", rs2.getString("max"));
+ 			}
+ 
  		} else {
  		    prop.setProperty("service_code", serviceCode);
***************
*** 216,219 ****
--- 256,265 ----
  		            alert ("The percentage should be less than 1.");
  		        }
+ 		        if(document.forms[0].min.value.length>0 && document.forms[0].max.value.length>0) {
+ 					if(!isNumber(document.forms[0].min.value) || !isNumber(document.forms[0].max.value)){
+ 		            	b = false;
+ 		            	alert ("You must type in a number in the min/max fields.");
+ 		        	}
+ 		        }
  	        } else if(document.forms[0].value.value.length==0 && document.forms[0].percentage.value.length==0) {
  	            b = false;
***************
*** 302,305 ****
--- 348,354 ----
                <input type="text" name="percentage" value="<%=prop.getProperty("percentage", "")%>" size='8' maxlength='8'>
                (format: 0.xx, e.g. 0.20)
+               min.
+               <input type="text" name="min" value="<%=prop.getProperty("min", "")%>" size='7' maxlength='8'>
+               max.<input type="text" name="max" value="<%=prop.getProperty("max", "")%>" size='7' maxlength='8'>
              </td>
            </tr>

--- NEW FILE: billingShortcutPg2.jsp ---
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../../../logout.jsp");
  }

  String user_no         = (String)session.getAttribute("user");
  String providerview    = request.getParameter("providerview") == null
                           ? ""
                           : request.getParameter("providerview");
  String asstProvider_no = "";
  String color           = "";
  String premiumFlag     = "";
  String service_form    = "";
%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@ page errorPage="errorpage.jsp"import="java.util.*,java.math.*,java.net.*,
                                            java.sql.*, oscar.util.*, oscar.*" %>
  <%@ page import="oscar.oscarBilling.ca.on.data.BillingONDataHelp" %>
  <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
  <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" />
  <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" />
<%
  String            clinicview        = oscarVariables.getProperty("clinic_view", "");
  String            clinicNo          = oscarVariables.getProperty("clinic_no", "");
  String            visitType         = oscarVariables.getProperty("visit_type", "");
  String            appt_no           = request.getParameter("appointment_no");
  String            demoname          = request.getParameter("demographic_name");
  String            demo_no           = request.getParameter("demographic_no");
  String            apptProvider_no   = request.getParameter("apptProvider_no");
  String ctlBillForm = request.getParameter("billForm");
  String            assgProvider_no   = request.getParameter("assgProvider_no");
  //String            dob               = request.getParameter("dob");
  String            demoSex           = request.getParameter("DemoSex");
  GregorianCalendar now               = new GregorianCalendar();
  int               curYear           = now.get(Calendar.YEAR);
  int               curMonth          = (now.get(Calendar.MONTH) + 1);
  int               curDay            = now.get(Calendar.DAY_OF_MONTH);
  int               dob_year          = 0, dob_month = 0, dob_date = 0, age = 0;
  String content = "";
  String total = "";

  BillingONDataHelp dbObj             = new BillingONDataHelp();
  String            msg               = "The calculation:<br>";
  String            action            = "edit";
  Properties        propHist          = null;
  Vector            vecHist           = new Vector();
  // get provider's detail
  String proOHIPNO="", proRMA="";
  String sql = "select * from provider where provider_no='" + request.getParameter("xml_provider") + "'";
  ResultSet rs = dbObj.searchDBRecord(sql);
  while (rs.next()) {
	proOHIPNO = rs.getString("ohip_no");
	proRMA = rs.getString("rma_no");
  }
  if(request.getParameter("xml_provider")!=null) providerview = request.getParameter("xml_provider");
  // get patient's detail
  String errorFlag = "";
  String warningMsg = "", errorMsg = "";
  String r_doctor="", r_doctor_ohip="" ;
  String demoFirst="", demoLast="", demoHIN="", demoDOB="", demoDOBYY="", demoDOBMM="", demoDOBDD="", demoHCTYPE="";
  sql = "select * from demographic where demographic_no=" + demo_no;
  rs = dbObj.searchDBRecord(sql);
  while (rs.next()) {
    assgProvider_no = rs.getString("provider_no");
	demoFirst = rs.getString("first_name");
	demoLast = rs.getString("last_name");
	demoHIN = rs.getString("hin") + rs.getString("ver");
	demoSex = rs.getString("sex");
	if (demoSex.compareTo("M")==0) demoSex ="1";
	if (demoSex.compareTo("F")==0) demoSex ="2";

	demoHCTYPE = rs.getString("hc_type")==null?"":rs.getString("hc_type");
	if (demoHCTYPE.compareTo("") == 0 || demoHCTYPE == null || demoHCTYPE.length() <2) {
		demoHCTYPE="ON";
	}else{
		demoHCTYPE=demoHCTYPE.substring(0,2).toUpperCase();
	}
	demoDOBYY = rs.getString("year_of_birth");
	demoDOBMM = rs.getString("month_of_birth");
	demoDOBDD = rs.getString("date_of_birth");

	if (rs.getString("family_doctor") == null){
		r_doctor = "N/A"; r_doctor_ohip="000000";
	}else{
		r_doctor=SxmlMisc.getXmlContent(rs.getString("family_doctor"),"rd")==null ? "" : SxmlMisc.getXmlContent(rs.getString("family_doctor"), "rd");
		r_doctor_ohip=SxmlMisc.getXmlContent(rs.getString("family_doctor"),"rdohip")==null ? "" : SxmlMisc.getXmlContent(rs.getString("family_doctor"), "rdohip");
	}

	demoDOBMM = demoDOBMM.length() == 1 ? ("0" + demoDOBMM) : demoDOBMM;
	demoDOBDD = demoDOBDD.length() == 1 ? ("0" + demoDOBDD) : demoDOBDD;
	demoDOB = demoDOBYY + demoDOBMM + demoDOBDD;

	if (rs.getString("hin") == null ) {
		errorFlag = "1";
		errorMsg = errorMsg + "<br><font color='red'>Error: The patient does not have a valid HIN. </font><br>";
	} else if (rs.getString("hin").equals("")) {
		warningMsg += "<br><font color='orange'>Warning: The patient does not have a valid HIN. </font><br>";
	}
	if (r_doctor_ohip != null && r_doctor_ohip.length()>0 && r_doctor_ohip.length() != 6) {
		warningMsg += "<br><font color='orange'>Warning: the referral doctor's no is wrong. </font><br>";
	}
	if (demoDOB.length() != 8) {
		errorFlag = "1";
		errorMsg = errorMsg + "<br><font color='red'>Error: The patient does not have a valid DOB. </font><br>";
	}
  }

  // save the billing if needed
  if(request.getParameter("submit")!=null && "Save".equals(request.getParameter("submit"))) {
    // parse billing date
    int NUMTYPEINFIELD = 5;
	// get billing detail info
	// get form service code
	Vector vecServiceCode = new Vector();
	Vector vecServiceCodeDesc = new Vector();
	Vector vecServiceCodeUnit = new Vector();
	Vector vecServiceCodePrice = new Vector();
	Vector vecServiceCodePerc = new Vector();
	String rulePerc = "allAboveCode"; // onlyAboveCode;
	rulePerc = request.getParameter("rulePerc")!=null?request.getParameter("rulePerc"):"allAboveCode";
	int rulePercLabelNum = -1; //only use when onlyAboveCode

	int recordCount = 0;
	String[] billrec = new String[]{"","","","",""};
	String[] billrecunit = new String[]{"","","","",""};
	String[] billrecdesc = new String[]{"","","","",""};
	String[] pricerec = new String[]{"","","","",""};
	String[] percrec = new String[]{"","","","",""};
	for(int i=0; i<NUMTYPEINFIELD; i++) {
		if("".equals(request.getParameter("serviceDate"+i))) break;
		else {
			billrec[i] = request.getParameter("serviceDate"+i);
			billrecunit[i] = request.getParameter("serviceUnit"+i);
			if("".equals(billrecunit[i])) billrecunit[i]="1";
			recordCount++;
		}
	}
	for(int i=0; i<recordCount; i++) {
		sql = "select service_code, description, value, percentage from billingservice where service_code='"
			+ billrec[i] + "'";
		rs = dbObj.searchDBRecord(sql);
		while (rs.next()) {
			billrecdesc[i] = rs.getString("description");
			//otherdbcode2 = rs.getString("service_code");
			pricerec[i] = rs.getString("value")==null?"":rs.getString("value");
			percrec[i] = rs.getString("percentage");
			//otherperc2 = rs.getString("percentage");

			if( (!"".equals(pricerec[i]) && Double.parseDouble(pricerec[i])>0.) || ( "".equals(percrec[i])) ) {
				vecServiceCode.add( billrec[i] );
				vecServiceCodeDesc.add( billrecdesc[i] );
				vecServiceCodePrice.add( pricerec[i] );
				vecServiceCodeUnit.add( billrecunit[i] );
			} else {
				if(!"allAboveCode".equals(rulePerc) ) rulePercLabelNum = i-1;
				vecServiceCodePerc.add( billrec[i] ); // code
				vecServiceCodePerc.add( percrec[i] ); // price
				vecServiceCodePerc.add( billrecunit[i] ); // unit
				vecServiceCodePerc.add( billrecdesc[i] ); // desc
			}

		}
	}
	//get the form service code
	for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) {
		String temp=e.nextElement().toString();
		if( temp.indexOf("code_xml_")==-1 ) continue;

		temp = temp.substring("code_".length());
		String desc = request.getParameter("desc_" + temp);
		String fee = request.getParameter("price_" + temp);
		String perc = request.getParameter("perc_" + temp);
		String tempUnit = request.getParameter("unit_" + temp);
		tempUnit = (tempUnit==null||"".equals(tempUnit) )? "1":tempUnit;
		String code = temp.substring("xml_".length()).toUpperCase();
		if( (!"".equals(fee) && Double.parseDouble(fee)>0.) || ( "".equals(perc)) ) {
			vecServiceCodePrice.add( fee );
			vecServiceCodeUnit.add( tempUnit );
			vecServiceCode.add( code );
			vecServiceCodeDesc.add( desc );
		} else {
			vecServiceCodePerc.add( code );
			vecServiceCodePerc.add( perc );
			vecServiceCodePerc.add( tempUnit ); // unit
			vecServiceCodePerc.add( desc ); // desc
		}
		//vecServiceCode.add( code );
	}
	//check perc code limitation
	boolean bLimit = false;
	String minFee = "", maxFee = "";
	if(vecServiceCodePerc.size()>0) {
		//TODO: only one perc code allowed, otherwise error msg
		sql = "select min, max from billingperclimit where service_code='"
			+ vecServiceCodePerc.get(0) + "'";
		rs = dbObj.searchDBRecord(sql);
		while (rs.next()) {
			bLimit = true;
			minFee = rs.getString("min");
			maxFee = rs.getString("max");
		}
	}

    // calculate total
    BigDecimal bdTotal = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
    BigDecimal bdPercBase = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
	BigDecimal bdPerc = new BigDecimal(0).setScale(2, BigDecimal.ROUND_HALF_UP);
    // calculate base
	for(int i=0; i<vecServiceCodePrice.size(); i++) {
    	BigDecimal price = new BigDecimal(Double.parseDouble((String)vecServiceCodePrice.get(i))).setScale(2, BigDecimal.ROUND_HALF_UP);
    	BigDecimal unit = new BigDecimal(Double.parseDouble((String)vecServiceCodeUnit.get(i))).setScale(2, BigDecimal.ROUND_HALF_UP);
    	bdTotal = bdTotal.add(price.multiply(unit).setScale(2, BigDecimal.ROUND_HALF_UP));
    	if(i==rulePercLabelNum) bdPercBase = bdTotal;
System.out.println(i + " :" + price + " x " + unit + " = " + bdTotal);
		msg += vecServiceCode.get(i) + ": + " + price + " x " + unit + " = " + bdTotal + "<br>";
	}
	if(vecServiceCodePerc.size()>1) {
		// calculate perc base
		if("allAboveCode".equals(rulePerc) ) {
			bdPercBase = bdTotal;
		}
		// calculate perc
		BigDecimal perc = new BigDecimal(Double.parseDouble((String)vecServiceCodePerc.get(1))).setScale(2, BigDecimal.ROUND_HALF_UP);
		bdPerc = bdPercBase.multiply(perc).setScale(2, BigDecimal.ROUND_HALF_UP);
System.out.println("Percentage :" + bdPercBase + " x " + perc + " = " + bdPerc);
		msg += "Percentage :" + bdPercBase + " x " + perc + " = " + bdPerc + "<br>";
		// adjust perc by min/max
		if(bLimit) {
			bdPerc = bdPerc.min(new BigDecimal(Double.parseDouble(maxFee) ).setScale(2, BigDecimal.ROUND_HALF_UP) );
			bdPerc = bdPerc.max(new BigDecimal(Double.parseDouble(minFee) ).setScale(2, BigDecimal.ROUND_HALF_UP) );
System.out.println("Adjust to (" + minFee + ", " + maxFee + "): " + bdPerc);
		msg += "Adjust to (" + minFee + ", " + maxFee + "): " + bdPerc + "<br>";
		}
    	bdTotal = bdTotal.add(bdPerc);
	}

    total = "" + bdTotal;
    System.out.println("***************total****************:" + bdTotal);
		msg += "Total: " + bdTotal + "<br>";
		msg += "<input type=\"button\" name=\"submit\" value=\" Re-Edit \" onclick=\"history.go(-1)\" />";
	// referral
    content = "";
    String referalCode = (request.getParameter("referralCode")!=null&&request.getParameter("referralCode").length()==6)?request.getParameter("referralCode"):null;
    if(referalCode!=null) {
    	content += "<xml_referral>checked</xml_referral>" ;
    	content += "<rdohip>" + referalCode + "</rdohip>" ;
    }
    content += "<hctype>" + demoHCTYPE + "</hctype>" ;
    content += "<demosex>" + demoSex + "</demosex>" ;

    if(request.getParameter("addition")!=null && "Confirm".equals(request.getParameter("addition"))) {
	    String billingDate = request.getParameter("billDate");
	    String [] tempDate = billingDate.split("\\s");

	    for(int k=0; k<tempDate.length; k++) {
	    	if(tempDate[k].trim().length()!=10) continue;
			String[] param =new String[23];
			param[0]=request.getParameter("clinic_no");
			param[1]=request.getParameter("demographic_no");
			param[2]=request.getParameter("xml_provider"); //request.getParameter("provider_no");
			param[3]=request.getParameter("appointment_no");

			param[4]=request.getParameter("ohip_version");
			param[5]=request.getParameter("demographic_name");
			param[6]=request.getParameter("hin");
			param[7] = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy-MM-dd");
			param[8] = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "HH:mm:ss");
			//param[7]=request.getParameter("billing_date");
			//param[8]=MyDateFormat.getTimeXX_XX_XX(request.getParameter("billing_time"));
			param[9]= tempDate[k] ; // parse(billingDate) ;//request.getParameter("appointment_date");
			param[10]=request.getParameter("start_time");
			param[11]=request.getParameter("xml_location"); //request.getParameter("clinic_ref_code");
			param[12]=content; //request.getParameter("content");
			param[13]=total; // calculate total; //request.getParameter("total");
			param[14]=request.getParameter("xml_billtype").substring(0,1);
			param[15]=request.getParameter("demographic_dob");

			param[16]=request.getParameter("xml_vdate"); // don't consider the appt date. request.getParameter("visitdate");
			param[17]=request.getParameter("xml_visittype").substring(0,2); //request.getParameter("visittype");
			param[18]=proOHIPNO; //request.getParameter("pohip_no");
			param[19]=proRMA; //request.getParameter("prma_no");
			param[20]=request.getParameter("apptProvider_no"); //"none"; //
			param[21]=""; //request.getParameter("asstProvider_no"); //"";//
			param[22] = user_no;//request.getParameter("user_no");
			int nBillNo = 0;
			int nBillDetailNo = 0;
			//BillingONDataHelp billObj = new BillingONDataHelp();
			//String sql = "insert into billing values('\\N',?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?,?,?, ?,?,?)";
			sql = "insert into billing(clinic_no, demographic_no, provider_no, appointment_no, organization_spec_code, demographic_name, hin, update_date, update_time, billing_date, billing_time, clinic_ref_code, content, total, status, dob, visitdate, visittype, provider_ohip_no, provider_rma_no, apptProvider_no, asstProvider_no, creator) values( "
				+ param[0] + "," + param[1] + "," + UtilMisc.nullMySQLEscape(param[2]) + "," + param[3] + "," + UtilMisc.nullMySQLEscape(param[4]) + ","
				+ UtilMisc.nullMySQLEscape(param[5]) + "," + UtilMisc.nullMySQLEscape(param[6]) + "," + UtilMisc.nullMySQLEscape(param[7]) + "," + UtilMisc.nullMySQLEscape(param[8]) + "," + UtilMisc.nullMySQLEscape(param[9]) + ","
				+ UtilMisc.nullMySQLEscape(param[10]) + "," + UtilMisc.nullMySQLEscape(param[11]) + "," + UtilMisc.nullMySQLEscape(param[12]) + "," + UtilMisc.nullMySQLEscape(param[13]) + "," + UtilMisc.nullMySQLEscape(param[14]) + ","
				+ UtilMisc.nullMySQLEscape(param[15]) + "," + UtilMisc.nullMySQLEscape(param[16]) + "," + UtilMisc.nullMySQLEscape(param[17]) + "," + UtilMisc.nullMySQLEscape(param[18]) + "," + UtilMisc.nullMySQLEscape(param[19]) + ","
				+ UtilMisc.nullMySQLEscape(param[20]) + "," + UtilMisc.nullMySQLEscape(param[21]) + ",'" + param[22] + "')";
		    System.out.println("*******************************" + sql);
			nBillNo = dbObj.saveBillingRecord(sql);


			//int recordCount = Integer.parseInt(request.getParameter("record"));
			// combine two vecs into one
			if(vecServiceCodePerc.size()>1) {
				vecServiceCodePrice.add( "" + bdPerc); //vecServiceCodePerc.get(1) );
				vecServiceCodeUnit.add( vecServiceCodePerc.get(2) );
				vecServiceCode.add( vecServiceCodePerc.get(0) );
				vecServiceCodeDesc.add( vecServiceCodePerc.get(3) );
			}

			for (int i=0; i<vecServiceCode.size(); i++){ //recordCount
				String[] param2 = new String[8];
				param2[0] = "" + nBillNo; // billNo;
				param2[1] = (String)vecServiceCode.get(i);//billrec[i]; //request.getParameter("billrec"+i);
				param2[2] = (String)vecServiceCodeDesc.get(i);//billrecdesc[i]; //request.getParameter("billrecdesc"+i);
				param2[3] = ((String)vecServiceCodePrice.get(i)).replaceAll("\\.", "");//pricerec[i]; //request.getParameter("pricerec"+i);
				param2[4] = request.getParameter("dxCode"); //request.getParameter("diagcode");
				param2[5] = tempDate[k]; //request.getParameter("appointment_date");
				param2[6] = request.getParameter("xml_billtype").substring(0,1); //request.getParameter("billtype");
				param2[7] = (String)vecServiceCodeUnit.get(i);//billrecunit[i]; //request.getParameter("billrecunit"+i);

				//insert into billingdetail values('\\N',?,?,?,?,?, ?,?,?)
		    	sql = "insert into billingdetail(billing_no, service_code, service_desc, billing_amount, diagnostic_code, appointment_date, status, billingunit) values( "
		    	+ param2[0] + "," + UtilMisc.nullMySQLEscape(param2[1]) + "," + UtilMisc.nullMySQLEscape(param2[2]) + "," + UtilMisc.nullMySQLEscape(param2[3]) + "," + UtilMisc.nullMySQLEscape(param2[4]) + ","
		    	+ UtilMisc.nullMySQLEscape(param2[5]) + "," + UtilMisc.nullMySQLEscape(param2[6]) + "," + UtilMisc.nullMySQLEscape(param2[7]) + ")";
				nBillDetailNo = 0;
		    	nBillDetailNo = dbObj.saveBillingRecord(sql);
		    	if (nBillDetailNo == 0) {
		    		// roll back
		    		sql = "update billing set status='D' where billing_no = " + nBillNo;
					dbObj.updateDBRecord(sql);
		    		break;
		    	}
		    	System.out.println(nBillNo + sql);
			}
		} // end of for loop
		msg = "<br>Billing records were added.<br>";
		msg += "<input type=\"button\" name=\"submit\" value=\" Close \" onclick=\"self.close();\"/>";
	}
  }


  // create msg
  msg += errorMsg + warningMsg;
System.out.println(" * ******************************" + sql);

%>

<html xmlns="http://www.w3.org/1999/xhtml">
<head>
  <title>OscarBilling - shortcut</title>
  <!-- calendar stylesheet -->
  <link rel="stylesheet" type="text/css" media="all" href="../../../share/calendar/calendar.css" title="win2k-cold-1" />
  <!-- main calendar program -->
  <script type="text/javascript" src="../../../share/calendar/calendar.js"></script>
  <!-- language for the calendar -->
  <script type="text/javascript" src="../../../share/calendar/lang/calendar-en.js"></script>
  <!-- the following script defines the Calendar.setup helper function, which makes
       adding a calendar a matter of 1 or 2 lines of code. -->
  <script type="text/javascript" src="../../../share/calendar/calendar-setup.js"></script>
</head>

  <script language="JavaScript">

            <!--

//-->

  </script>
  <body topmargin="0" >

  <table border="0" cellpadding="0" cellspacing="2" width="100%" bgcolor="#CCCCFF">
    <form method="post" name="titlesearch" action="billingShortcutPg2.jsp" >
      <tr>
        <td>
          <table border="0" cellspacing="0" cellpadding="0" width="100%">
            <tr><td>
          	<b>OscarBilling </b>
        	</td>
			<td align="right">
            <input type="submit" name="submit" value="Save" />
            <input type="hidden" name="addition" value="Confirm" />
            </td>
			</tr>
		  </table>
        </td>
      </tr>
      <tr>
        <td>
          <table border="0" cellspacing="0" cellpadding="0" width="100%">
            <tr bgcolor="#33CCCC">
              <td nowrap bgcolor="#FFCC99" width="10%" align="center">
                <%= demoname %>
              </td>
              <td bgcolor="#99CCCC" align="center">
                <font color="black"><%= msg %></font>
              </td>
            </tr>
          </table>

<%
	for (Enumeration e = request.getParameterNames() ; e.hasMoreElements() ;) {
		String temp=e.nextElement().toString();
%>
	<input type="hidden" name="<%= temp %>" value="<%=StringEscapeUtils.escapeHtml(request.getParameter(temp))%>">
<%
}
%>
    </form>

  </table>


  </body>
</html>
--- NEW FILE: billingShortcutPg1.jsp ---
<%
  if (session.getAttribute("user") == null) {
    response.sendRedirect("../../../logout.jsp");
  }

  String user_no         = (String)session.getAttribute("user");
  String providerview    = request.getParameter("providerview") == null
                           ? ""
                           : request.getParameter("providerview");
  String asstProvider_no = "";
  String color           = "";
  String premiumFlag     = "";
  String service_form    = "";
%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@ page errorPage="errorpage.jsp"import="java.util.*,java.math.*,java.net.*,
                                            java.sql.*, oscar.util.*, oscar.*" %>
[...1087 lines suppressed...]
      button     : "trigger"
    });
  //]]>
Calendar.setup( { inputField : "xml_vdate", ifFormat : "%Y-%m-%d", showsTime :false, button : "xml_vdate_cal", singleClick : true, step : 1 } );

  </script>
<%!
String getDefaultValue(String paraName, Vector vec, String propName) {
  String ret = "";
  if(paraName!=null && !"".equals(paraName)) {
    ret = paraName;
  } else if(vec.get(0)!=null) {
    ret = ((Properties)vec.get(0)).getProperty(propName, "") ;
  }
  System.out.println("paraName:" + paraName + " propName:" + propName + " :" + ret);
  return ret;
}
%>
  </body>
</html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/demographic demographiceditdemographic.jsp,1.39,1.40

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

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

Modified Files:
	demographiceditdemographic.jsp 
Log Message:
add hospital billing

Index: demographiceditdemographic.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/demographic/demographiceditdemographic.jsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** demographiceditdemographic.jsp	24 Dec 2004 03:01:19 -0000	1.39
--- demographiceditdemographic.jsp	24 Mar 2005 23:29:43 -0000	1.40
***************
*** 287,291 ****
                      WaitingList wL = WaitingList.getInstance();
                      if(wL.getFound()){
!                 %>                
                  <tr><td>
                      <a href="../oscarWaitingList/SetupDisplayPatientWaitingList.do?demographic_no=<%=rs.getString("demographic_no")%>">Waiting List</a>
--- 287,291 ----
                      WaitingList wL = WaitingList.getInstance();
                      if(wL.getFound()){
!                 %>
                  <tr><td>
                      <a href="../oscarWaitingList/SetupDisplayPatientWaitingList.do?demographic_no=<%=rs.getString("demographic_no")%>">Waiting List</a>
***************
*** 316,319 ****
--- 316,322 ----
                  <% } %>
                  <tr><td>
+                     <a href=# onclick="popupPage(700, 1000, '../billing/CA/ON/billingShortcutPg1.jsp?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=&appointment_no=0&demographic_name=<%=URLEncoder.encode(rs.getString("last_name"))%>%2C<%=URLEncoder.encode(rs.getString("first_name"))%>&demographic_no=<%=rs.getString("demographic_no")%>&providerview=1&user_no=<%=curProvider_no%>&apptProvider_no=none&appointment_date=<%=dateString%>&start_time=0:00&bNewForm=1&status=t');return false;" title="bill a patient">Hospital Billing</a>
+                 </td></tr>
+                 <tr><td>
                      <a href=# onclick="window.open('../billing/CA/ON/inr/addINRbilling.jsp?function=demographic&functionid=<%=rs.getString("demographic_no")%>&creator=<%=curProvider_no%>&demographic_name=<%=URLEncoder.encode(rs.getString("last_name"))%>%2C<%=URLEncoder.encode(rs.getString("first_name"))%>&hin=<%=URLEncoder.encode(rs.getString("hin"))%><%=URLEncoder.encode(rs.getString("ver"))%>&dob=<%=MyDateFormat.getStandardDate(Integer.parseInt(rs.getString("year_of_birth")),Integer.parseInt(rs.getString("month_of_birth")),Integer.parseInt(rs.getString("date_of_birth")))%>','', 'scrollbars=yes,resizable=yes,width=600,height=400');return false;" title='Add INR Billing'>Add INR</a></th>
                  </td></tr>
***************
*** 842,846 ****
                                 <input type="button" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnSwipeCard"/>" onclick="window.open('zdemographicswipe.jsp','', 'scrollbars=yes,resizable=yes,width=600,height=300, top=360, left=0')";>
                                 <input type="button" size="110" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnCreatePDFLabel"/>" onclick="window.location='printDemoLabelAction.do?demographic_no=<%=rs.getString("demographic_no")%>'";>
!                                <input type="button" name="Button" size="110" value="<bean:message key="demographic.demographiceditdemographic.btnPrintLabel"/>" onclick="window.location='demographiclabelprintsetting.jsp?demographic_no=<%=rs.getString("demographic_no")%>'";>                              
                              </td>
                          </table>
--- 845,849 ----
                                 <input type="button" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnSwipeCard"/>" onclick="window.open('zdemographicswipe.jsp','', 'scrollbars=yes,resizable=yes,width=600,height=300, top=360, left=0')";>
                                 <input type="button" size="110" name="Button" value="<bean:message key="demographic.demographiceditdemographic.btnCreatePDFLabel"/>" onclick="window.location='printDemoLabelAction.do?demographic_no=<%=rs.getString("demographic_no")%>'";>
!                                <input type="button" name="Button" size="110" value="<bean:message key="demographic.demographiceditdemographic.btnPrintLabel"/>" onclick="window.location='demographiclabelprintsetting.jsp?demographic_no=<%=rs.getString("demographic_no")%>'";>
                              </td>
                          </table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/RourkeVacsMigrator README.txt,NONE,1.1 RourkeVacsMigrator.py,NONE,1.1 db.properties,NONE,1.1

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

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

Added Files:
	README.txt RourkeVacsMigrator.py db.properties 
Log Message:
This is the formrourke immunization migrator script. It is written in Jython, therefore, requires the Jython interpreter.

--- NEW FILE: README.txt ---
Rourke Vaccination Migration Script:

Description:

This script migrates immunization flag data from the formrourke table in OSCAR 2.0
Each Immunization field is associated with a corresponding free text field as well 
as a textual description.If an immunization field contains a value of "1", a line feed 
as well as its correspondening textual description is appended to the corresponding free text field, 
in the formrourke table. Upon execution of the script, a log file called rourketransfer.log is created, to aid you in assessing
the the results of the migration. 

An example of the log file is as follows:

IMPORT STARTED@Tue Mar 22 23:53:39 PST 2005
UPDATED RECORD#: 113 APPENDED: Immunization TO FIELD: p1_immunization1m
UPDATED RECORD#: 114 APPENDED: Immunization TO FIELD: p1_immunization1m
UPDATED RECORD#: 114 APPENDED: Acetaminophen TO FIELD: p1_immunization1m
UPDATED RECORD#: 114 APPENDED: Hep. B vaccine TO FIELD: p1_immunization1m
UPDATED RECORD#: 114 APPENDED: MMR TO FIELD: p3_immunization4y
UPDATED RECORD#: 114 APPENDED: aPDT polio TO FIELD: p3_immunization4y



Dependencies:

In order to execute the script, ensure that the following library and interpreter dependencies are satisfied:

Jython 2.1 interpreter
Java 1.4 JRE/SDK

Installation:

Place the script in the directory of choice.

Execution:

In order for the script to succesfully execute, ensure that the db.properties file exists in the same directory(with the appropriate db parameters).
A sample configuration is commented in the include file. Make sure you that you perform a couple of tests on a dummy database, this is alpha software!


Author:Joel Legris
Email:joe...@eg...

--- NEW FILE: RourkeVacsMigrator.py ---
"""
 *
 * 
 * Copyright (c) 2001-2005. 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 
 * Author: Joel Legris
 * Email: joe...@eg...
 * Date: March 21,2005
 *
 *
 """

from java.sql import *
from java.text import *
from java.util import *
from java.lang import *
from java.util import *
from java.io import *
import traceback
import sys
"""
Class Name:RourkeVacsMigrator
Description:

The Baby Rourke forms have been modified such that the immunization flags have been removed from all three pages, 
and have been replaced by text areas for entry of free text.Therefore, this script has been created to migrate the existing 
immunization flag data into the free text fields.Each Immunization field is associated with a corresponding free text field as well 
as a textual description. If an immunization field contains a value of "1", a corresponding textual description is appended to its related free text field.
"""
class RourkeVacsMigrator:
	def __init__(self):
		self.db_username = ""
		self.db_password = ""
		self.db_driver = ""
	        self.db_uri = ""
		self.con = None #java.sql.Connection Object
		#Maps immunization flags to the corresponding free text field
		self.pageMappings={
		'p1_hepB1w':'p1_immunization1w',
		'p1_immuniz1m':'p1_immunization1m',
		'p1_acetaminophen1m':'p1_immunization1m',
		'p1_hepB1m':'p1_immunization1m',
		'p1_acetaminophen2m':'p1_immunization2m',
		'p1_hib2m':'p1_immunization2m',
		'p1_polio2m':'p1_immunization2m',
		'p2_hib4m':'p2_immunization4m',
		'p2_polio4m':'p2_immunization4m',
		'p2_hib6m':'p2_immunization6m',
		'p2_polio6m':'p2_immunization6m',
		'p2_hepB6m':'p2_immunization6m',
		'p2_tbSkin9m':'p2_immunization9m',
		'p2_mmr12m':'p2_immunization12m',
		'p2_varicella12m':'p2_immunization12m',
		'p3_hib18m':'p3_immunization18m',
		'p3_polio18m':'p3_immunization18m',
		'p3_mmr4y':'p3_immunization4y',
		'p3_polio4y':'p3_immunization4y'}

		#Maps database field names to corresponding descriptions
		self.fieldDescMappings={
		'p1_hepB1w':'Hep. B vaccine',
		'p1_immuniz1m':'Immunization',
		'p1_acetaminophen1m':'Acetaminophen',
		'p1_hepB1m':'Hep. B vaccine',
		'p1_acetaminophen2m':'Acetaminophen',
		'p1_hib2m':'HIB',
		'p1_polio2m':'aPDT polio',
		'p2_hib4m':'HIB',
		'p2_polio4m':'aPDT polio',
		'p2_hib6m':'HIB>',
		'p2_polio6m':'aPDT polio',
		'p2_hepB6m':'Hep. B vaccine',
		'p2_tbSkin9m':'TB skin text*',
		'p2_mmr12m':'MMR',
		'p2_varicella12m':'Varicella vaccine*',
		'p3_hib18m':'HIB',
		'p3_polio18m':'aPDT polio',
		'p3_mmr4y':'MMR',
		'p3_polio4y':'aPDT polio'}		
		self.loadConfig()

		
	def createConnection(self):
		"""Assigns a java.sql.Connection object using the configured db parameters
		   If Connection can't be created, program terminates	
		"""
		
		try:
			Class.forName(self.db_driver)
			cs = self.db_uri+"/" + self.db_name + "/?user="+self.db_username+"&password="+self.db_password
			print cs
			return DriverManager.getConnection(cs)	
		except:
			traceback.print_exc()
			sys.exit()
				
        def loadConfig(self):
        	"""Loads the properties config file and assigns the db properties to the corresponding class fields"""
        	props = Properties()
        	try:
        		finstream = FileInputStream("db.properties")		
        		props.load(finstream)
        		# set db properties
			self.db_name = props.getProperty('db_name')
			self.db_username = props.getProperty('db_username')
			self.db_password = props.getProperty('db_password')
			self.db_driver = props.getProperty('db_driver')
			self.db_uri = props.getProperty('db_uri')
                except:
                	traceback.print_exc()
                	sys.exit()
                	
        def execTransfer(self):
        	"""Executes the migration of immunization data to the corresponding free text fields"""
        	rs = None
        	statement = None
        	strMsg = "" #Log message string
        	strBorder = "---------------------------------\n"
		strStartMsg = "IMPORT STARTED@" + Date().toString() + "\n" 
		strBorder = "---------------------------------\n"
		log = open("rourketransfer.log","a")
		print strBorder
		log.write(strBorder)
		print strStartMsg
		log.write(strStartMsg)
        	try:
			fldNames = self.fieldDescMappings.keys()
			qry = "select * from formrourke"
			con = self.createConnection()
			statement = con.createStatement()
			rs = statement.executeQuery(qry)
			rsmd = rs.getMetaData()
			colCount = rsmd.getColumnCount()

			while rs.next():
				index = 1
				while index < colCount:
					colName = rsmd.getColumnName(index)
					strFlag = rs.getString(index)
					if colName in fldNames:	
						#if given immunization has been flagged,append textual representation of field to its corresponding free text field
						if strFlag == "1":
							freeTextFld = self.pageMappings[colName]
							freeTextData = rs.getString(freeTextFld) + "\\n" + self.fieldDescMappings[colName]  
							qryUpdate = "update formrourke set " + freeTextFld + "=? " + "where ID = " + rs.getString("ID")
							stUpdate = con.prepareStatement(qryUpdate)
							stUpdate.setString(1,freeTextData)
							stUpdate.executeUpdate()
							msg = "UPDATED RECORD#: " + rs.getString("ID") + " APPENDED: " + self.fieldDescMappings[colName] + " TO FIELD: " + self.pageMappings[colName]
							print msg
							log.write(msg + "\n")
					index +=1
							
		except:
			traceback.print_exc()
			log.close()
	     	log.close()
		
r = RourkeVacsMigrator()
r.execTransfer()
--- NEW FILE: db.properties ---
db_name=oscarmcmaster
db_username=user
db_password=password
db_driver = org.gjt.mm.mysql.Driver
db_uri = jdbc:mysql://localhost:3306

                                                                                

[Oscarmcmaster-cvscommit] oscar_mcmaster/RourkeVacsMigrator - New directory

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

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

Log Message:
Directory /cvsroot/oscarmcmaster/oscar_mcmaster/RourkeVacsMigrator added to the repository

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/prop a6blank.pdf,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-serv13303/WEB-INF/classes/src/oscar/form/prop

Added Files:
	a6blank.pdf 
Log Message:
add rx print to paper A6

--- NEW FILE: a6blank.pdf ---
(This appears to be a binary file; contents omitted.)

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

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

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

Modified Files:
	Preview.jsp 
Log Message:
add rx print to paper A6

Index: Preview.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarRx/Preview.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Preview.jsp	9 Feb 2005 06:56:25 -0000	1.2
--- Preview.jsp	23 Mar 2005 00:00:30 -0000	1.3
***************
*** 4,7 ****
--- 4,8 ----
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@ page import="oscar.oscarProvider.data.*"%>
+ <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
  <% response.setHeader("Cache-Control","no-cache");%>
  
***************
*** 49,52 ****
--- 50,65 ----
  
  <link rel="stylesheet" type="text/css" href="styles.css">
+ <script type="text/javascript" language="Javascript">
+     function onPrint() {
+         //document.forms[0].submit.value="print";
+         //var ret = checkAllDates();
+         //if(ret==true) {
+             document.forms[0].action = "../form/createpdf?__title=Rx&__cfgfile=oscarRxPrintCfgPg1&__template=a6blank";
+             document.forms[0].target="_blank";
+         //}
+        return ret;
+     }
+ </script>
+ 
  </head>
  <body topmargin="0" leftmargin="0" vlink="#0000FF">
***************
*** 67,75 ****
  }
  %>
  
  <table width="400px" height="500px" cellspacing=0 cellpadding=10 border=2>
      <tr>
          <td valign=top height="100px">
!             <img src="img/rx.gif" border="0">
          </td>
          <td valign=top height="100px">
--- 80,106 ----
  }
  %>
+ <html:form action="/form/formname">
  
  <table width="400px" height="500px" cellspacing=0 cellpadding=10 border=2>
      <tr>
          <td valign=top height="100px">
!         	<input type="image" src="img/rx.gif" border="0" value="submit" alt="[Submit]" name="submit"
!  			title="Print in a half letter size paper" onclick="javascript:return onPrint();">
! 			<input type="hidden" name="printPageSize" value="PageSize.A6"/>
! 			<input type="hidden" name="doctorName" value="<%= StringEscapeUtils.escapeHtml(doctorName) %>"/>
! 			<input type="hidden" name="clinicName" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicName()) %>"/>
! 			<input type="hidden" name="clinicAddress" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicAddress()) %>"/>
! 			<input type="hidden" name="clinicCityPostal" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicCity())+"   " + StringEscapeUtils.escapeHtml(provider.getClinicPostal())%>"/>
! 			<input type="hidden" name="clinicPhone" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicPhone()) %>"/>
! 			<input type="hidden" name="clinicFax" value="<%= StringEscapeUtils.escapeHtml(provider.getClinicFax()) %>"/>
! 
! 			<input type="hidden" name="patientName" value="<%= StringEscapeUtils.escapeHtml(patient.getFirstName())+ " " +StringEscapeUtils.escapeHtml(patient.getSurname()) %>"/>
! 			<input type="hidden" name="patientAddress" value="<%= StringEscapeUtils.escapeHtml(patient.getAddress()) %>"/>
! 			<input type="hidden" name="patientCityPostal" value="<%= StringEscapeUtils.escapeHtml(patient.getCity())+ " " + StringEscapeUtils.escapeHtml(patient.getPostal())%>"/>
! 			<input type="hidden" name="patientPhone" value="<%= "Tel: " + StringEscapeUtils.escapeHtml(patient.getPhone()) %>"/>
! 
! 			<input type="hidden" name="rxDate" value="<%= StringEscapeUtils.escapeHtml(oscar.oscarRx.util.RxUtil.DateToString(oscar.oscarRx.util.RxUtil.Today(), "MMMM d, yyyy")) %>"/>
! 			<input type="hidden" name="sigDoctorName" value="<%= StringEscapeUtils.escapeHtml(doctorName) %>"/>
!             <!--img src="img/rx.gif" border="0"-->
          </td>
          <td valign=top height="100px">
***************
*** 110,113 ****
--- 141,145 ----
                      <td colspan=2 height=225px>
                          <%
+                         String strRx = "";
                          for(i=0;i<bean.getStashSize();i++)
                          {
***************
*** 118,123 ****
--- 150,157 ----
                              <hr>
                              <%
+                             strRx += rx.getFullOutLine();
                          }
                          %>
+ 			<input type="hidden" name="rx" value="<%= StringEscapeUtils.escapeHtml(strRx.replaceAll(";","\\\n")) %>"/>
                      </td>
                  </tr>
***************
*** 138,141 ****
--- 172,176 ----
      </tr>
  </table>
+ </html:form>
  </body>
  </html:html>