oscarmcmaster-cvscommit

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

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

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

Modified Files:
	RptRehabStudyForm.java 
Log Message:
added start and end date for the reports



Index: RptRehabStudyForm.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil/RptRehabStudyForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RptRehabStudyForm.java	25 Jan 2005 22:19:36 -0000	1.1
--- RptRehabStudyForm.java	21 Feb 2005 17:55:57 -0000	1.2
***************
*** 27,35 ****
  import javax.servlet.ServletRequest;
  import javax.servlet.http.HttpServletRequest;
  import org.apache.struts.action.*;
  
  public final class RptRehabStudyForm extends ActionForm {
  
!     String formName;
  
      public String getFormName(){
--- 27,39 ----
  import javax.servlet.ServletRequest;
  import javax.servlet.http.HttpServletRequest;
+ import java.util.*;
  import org.apache.struts.action.*;
+ import oscar.util.UtilDateUtilities;
  
  public final class RptRehabStudyForm extends ActionForm {
  
!     String formName;    
!     String startDate;
!     String endDate;
  
      public String getFormName(){
***************
*** 41,43 ****
--- 45,65 ----
      }
      
+     public String getStartDate(){
+         return startDate;
+         
+     }
+     
+     public void setStartDate(String startDate){
+         this.startDate = startDate;
+     }
+     
+     public String getEndDate(){
+         return endDate;
+         
+     }
+     
+     public void setEndDate(String endDate){
+         this.endDate = endDate;
+     }
+     
  }

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

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

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

Modified Files:
	RptRehabStudyAction.java 
Log Message:
added start and end date for the reports



Index: RptRehabStudyAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarReport/pageUtil/RptRehabStudyAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** RptRehabStudyAction.java	25 Jan 2005 22:19:32 -0000	1.1
--- RptRehabStudyAction.java	21 Feb 2005 17:55:02 -0000	1.2
***************
*** 57,60 ****
--- 57,62 ----
              response.sendRedirect("../logout.htm");                
          String formName = frm.getFormName();
+         String startDate = frm.getStartDate();
+         String endDate = frm.getEndDate();
          String results = "<table>";
          try{
***************
*** 66,70 ****
              rs.close();
              
!             sql = "select max(formEdited) as formEdited, demographic_no from " + formName + " group by demographic_no";
              rs = db.GetSQL(sql);
              while(rs.next()){
--- 68,74 ----
              rs.close();
              
!             sql = "select max(formEdited) as formEdited, demographic_no from " + formName + " where formEdited > '" + startDate +
!                   "' and formEdited < '" + endDate + "' group by demographic_no";
!             System.out.println("sql:" + sql);
              rs = db.GetSQL(sql);
              while(rs.next()){
***************
*** 73,78 ****
                  System.out.println("sqlDemo:" + sqlDemo);
                  ResultSet rsDemo = db.GetSQL(sqlDemo);
!                 //if(rsDemo.next())
!                     //System.out.println(getStructure(rsDemo));
                      results = results + getStructure(rsDemo);
                  rsDemo.close();                    
--- 77,81 ----
                  System.out.println("sqlDemo:" + sqlDemo);
                  ResultSet rsDemo = db.GetSQL(sqlDemo);
!                 //if(rsDemo.next())                    
                      results = results + getStructure(rsDemo);
                  rsDemo.close();                    

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

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

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

Modified Files:
	oscarinit.sql 
Log Message:
updated formInternetAccess table for rehab study



Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.72
retrieving revision 1.73
diff -C2 -d -r1.72 -r1.73
*** oscarinit.sql	14 Feb 2005 16:28:33 -0000	1.72
--- oscarinit.sql	19 Feb 2005 04:00:25 -0000	1.73
***************
*** 2949,2959 ****
    formEdited timestamp NOT NULL, 
    studyID varchar(20) NOT NULL DEFAULT 'N/A',
    internetY tinyint(1),
    internetN tinyint(1),
    internetHome tinyint(1),
!   internetWork tinyint(1),
!   internetFriend tinyint(1),
    internetOther tinyint(1),
    internetOtherTx varchar(255),
    PRIMARY KEY (ID)
  ) TYPE=MyISAM;
--- 2949,2964 ----
    formEdited timestamp NOT NULL, 
    studyID varchar(20) NOT NULL DEFAULT 'N/A',
+   computerY tinyint(1),
+   computerN tinyint(1),
    internetY tinyint(1),
    internetN tinyint(1),
    internetHome tinyint(1),
!   internetWork tinyint(1),  
    internetOther tinyint(1),
    internetOtherTx varchar(255),
+   timeDaily varchar(2),
+   timeWeekly varchar(3),
+   infoY tinyint(1),
+   infoN tinyint(1),
    PRIMARY KEY (ID)
  ) TYPE=MyISAM;

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

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

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

Modified Files:
	formInternetAccess.jsp 
Log Message:
updated with new questions



Index: formInternetAccess.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formInternetAccess.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** formInternetAccess.jsp	14 Feb 2005 16:23:30 -0000	1.1
--- formInternetAccess.jsp	19 Feb 2005 03:55:48 -0000	1.2
***************
*** 156,161 ****
  <script type="text/javascript" language="Javascript">
      
!     var choiceFormat  = new Array(6,7);        
!     var allNumericField = null;
      var allMatch = null;
      var action = "/<%=project_home%>/form/formname.do";        
--- 156,161 ----
  <script type="text/javascript" language="Javascript">
      
!     var choiceFormat  = new Array(6,7,8,9,12,13);        
!     var allNumericField = new Array(10,11);
      var allMatch = null;
      var action = "/<%=project_home%>/form/formname.do";        
***************
*** 198,204 ****
              <table width="740px" height="200px" border="0"  cellspacing="0" cellpadding="0" >                  
                  <tr>
!                     <td width="5%" valign="top" align="right"></td>
                      <td valign="top">                        
!                         1. Do you have access to the internet?
                      </td>
                  </tr>
--- 198,227 ----
              <table width="740px" height="200px" border="0"  cellspacing="0" cellpadding="0" >                  
                  <tr>
!                     <td width="5%" valign="top" align="right">1.</td>
                      <td valign="top">                        
!                         Do you have a computer at home?
!                     </td>
!                 </tr>
!                 <tr>                                                
!                 <tr bgcolor="white">                                    
!                     <td width="5%" align="right">                        
!                     </td>
!                     <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="computerY" <%= props.getProperty("computerY", "") %>/>
!                         Yes
!                     </td>                                  
!                 </tr>
!                 <tr bgcolor="white">                                    
!                     <td width="5%" align="right">                        
!                     </td>
!                     <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="computerN" <%= props.getProperty("computerN", "") %>/>
!                         No
!                     </td>                                  
!                 </tr>  
!                 <tr>
!                     <td width="5%" valign="top" align="right">2.</td>
!                     <td valign="top">                        
!                         Do you have regular access to the internet (at home, or through work, the library, a friend or relative, etc)?
                      </td>
                  </tr>
***************
*** 221,227 ****
                  </tr>                
                  <tr>
!                     <td width="5%" valign="top" align="right"></td>
                      <td valign="top">                        
!                         2. If yes, where do you access the internet?
                      </td>
                  </tr>
--- 244,250 ----
                  </tr>                
                  <tr>
!                     <td width="5%" valign="top" align="right">3.</td>
                      <td valign="top">                        
!                         How much time do you spend on the internet?
                      </td>
                  </tr>
***************
*** 231,236 ****
                      </td>
                      <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="internetHome" <%= props.getProperty("internetHome", "") %>/>
!                         at home
                      </td>                                  
                  </tr>
--- 254,259 ----
                      </td>
                      <td width="95%">
!                         a. Daily: <input type="text" size="10" name="timeDaily" value='<%= props.getProperty("timeDaily", "") %>'/> Hours
!                         
                      </td>                                  
                  </tr>
***************
*** 239,252 ****
                      </td>
                      <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="internetWork" <%= props.getProperty("internetWork", "") %>/>
!                         at work
                      </td>                                  
                  </tr>
                  <tr bgcolor="white">                                    
                      <td width="5%" align="right">                        
                      </td>
                      <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="internetFriend" <%= props.getProperty("internetFriend", "") %>/>
!                         at friend/relative's home
                      </td>                                  
                  </tr>
--- 262,281 ----
                      </td>
                      <td width="95%">
!                         b. Weekly: <input type="text" size="10" name="timeWeekly" value='<%= props.getProperty("timeWeekly", "") %>'/> Hours                       
                      </td>                                  
+                 </tr>                
+                 <tr>
+                     <td width="5%" valign="top" align="right">4.</td>
+                     <td valign="top">                        
+                         Would you use a free health information website provided through Stonechurch Family Health Center?
+                     </td>
                  </tr>
+                 <tr>                                                
                  <tr bgcolor="white">                                    
                      <td width="5%" align="right">                        
                      </td>
                      <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="infoY" <%= props.getProperty("infoY", "") %>/>
!                         Yes
                      </td>                                  
                  </tr>
***************
*** 255,263 ****
                      </td>
                      <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="internetOther" <%= props.getProperty("internetOther", "") %>/>
!                         other 
!                         <input type="text" name="internetOtherTx" value="<%= props.getProperty("internetOtherTx", "") %>"/>
                      </td>                                  
!                 </tr>
              </table>            
          </td>
--- 284,291 ----
                      </td>
                      <td width="95%">
!                         <input type="checkbox"  class="checkbox" name="infoN" <%= props.getProperty("infoN", "") %>/>
!                         No
                      </td>                                  
!                 </tr>  
              </table>            
          </td>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter Index.jsp,1.70,1.71

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

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

Modified Files:
	Index.jsp 
Log Message:
you can highlight text and it will appear in the search text field in both firefox and ie

When the search feild is in focus <enter key> will pop up search form

The Prescription Line has been changed from only showing the minimum rx display to the full outline

Link to MDS labs was corrected to add the provider no.



Index: Index.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/Index.jsp,v
retrieving revision 1.70
retrieving revision 1.71
diff -C2 -d -r1.70 -r1.71
*** Index.jsp	7 Jan 2005 20:47:45 -0000	1.70
--- Index.jsp	18 Feb 2005 20:00:06 -0000	1.71
***************
*** 406,428 ****
  }
  
  if (!document.all) document.captureEvents(Event.MOUSEUP);
  document.onmouseup = getActiveText;
  function getActiveText(e) {
    //text = (document.all) ? document.selection.createRange().text : document.getSelection();
!   //document.ksearch.term.value = text;
   if(document.all) {
      text = document.selection.createRange().text;
!     if(text != "" && document.ksearch.term.value=="") {
!       document.ksearch.term.value += text;
      }
!     if(text != "" && document.ksearch.term.value!="") {
!       document.ksearch.term.value = text;
      }
!   } else {
!     text = window.getSelection();
!     document.ksearch.term.value = text;
    }
    return true;
  }
  function popupPageK(page) {
      windowprops = "height=700,width=960,location=no,"
--- 406,460 ----
  }
  
+ 
  if (!document.all) document.captureEvents(Event.MOUSEUP);
  document.onmouseup = getActiveText;
+ 
  function getActiveText(e) {
+   
    //text = (document.all) ? document.selection.createRange().text : document.getSelection();
!   //document.ksearch.keyword.value = text;
   if(document.all) {
+     //alert("one");
      text = document.selection.createRange().text;
!     if(text != "" && document.ksearch.keyword.value=="") {
!       document.ksearch.keyword.value += text;
      }
!     if(text != "" && document.ksearch.keyword.value!="") {
!       document.ksearch.keyword.value = text;
      }
!   } else {    
!     text = window.getSelection();        
!         
!     if (text.toString().length == 0){  //for firefox    
!        var txtarea = document.encForm.enTextarea;
!        var selLength = txtarea.textLength;
!        var selStart = txtarea.selectionStart;
!        var selEnd = txtarea.selectionEnd;
!        if (selEnd==1 || selEnd==2) selEnd=selLength;
!        text = (txtarea.value).substring(selStart, selEnd);
!     }
!     //
!     document.ksearch.keyword.value = text;
    }
    return true;
  }
+ 
+ function tryAnother(){
+ ////
+     var txt = "null";
+     var foundIn = "null";
+     if (window.getSelection){
+ 		txt = window.getSelection();
+ 		foundIn = 'window.getSelection()';
+ 	 }else if (document.getSelection){
+ 		txt = document.getSelection();
+ 		foundIn = 'document.getSelection()';
+ 	 }else if (document.selection){
+ 		txt = document.selection.createRange().text;
+ 		foundIn = 'document.selection.createRange()';
+ 	 }
+ 	 alert (txt+"\n"+foundIn);
+     ////
+ }
  function popupPageK(page) {
      windowprops = "height=700,width=960,location=no,"
***************
*** 547,550 ****
--- 579,592 ----
  }
  
+ 
+ function grabEnter(event){
+   if(window.event && window.event.keyCode == 13){
+       popupSearchPage(600,800,document.forms['ksearch'].channel.options[document.forms['ksearch'].channel.selectedIndex].value+urlencode(document.forms['ksearch'].keyword.value));
+       return false;
+   }else if (event && event.which == 13){
+       popupSearchPage(600,800,document.forms['ksearch'].channel.options[document.forms['ksearch'].channel.selectedIndex].value+urlencode(document.forms['ksearch'].keyword.value));
+       return false;    
+   }
+ }
  </script>
  
***************
*** 784,788 ****
                              <option value="null" selected>-lab results-</option>
                              <% for(int j=0; j<labResults.segmentID.size(); j++) { %>                                
!                                 <option value="../oscarMDS/SegmentDisplay.jsp?providerNo=<%=bean.curProviderNo%>&segmentID=<%=(String)labResults.segmentID.get(j)%>&status=<%=(String)labResults.reportStatus.get(j)%>"><%=((String)labResults.dateTime.get(j)).substring(0,10)%> <%=(String)labResults.discipline.get(j)%></option>
                              <% } %>
                          </select>
--- 826,830 ----
                              <option value="null" selected>-lab results-</option>
                              <% for(int j=0; j<labResults.segmentID.size(); j++) { %>                                
!                                 <option value="../oscarMDS/SegmentDisplay.jsp?providerNo=<%=provNo%>&segmentID=<%=(String)labResults.segmentID.get(j)%>&status=<%=(String)labResults.reportStatus.get(j)%>"><%=((String)labResults.dateTime.get(j)).substring(0,10)%> <%=(String)labResults.discipline.get(j)%></option>
                              <% } %>
                          </select>
***************
*** 802,806 ****
                      </tr>
                      <tr>
!                         <td><input type="text" name="keyword" class="ControlSelect" value=""/></td>                        
                      </tr>
                      <tr>
--- 844,848 ----
                      </tr>
                      <tr>
!                         <td><input type="text" name="keyword" class="ControlSelect" value=""  onkeypress="return grabEnter(event)"/></td>                        
                      </tr>
                      <tr>
***************
*** 961,965 ****
                                              <%for (int i = 0; i < arr.length; i++){
                                                  String rxD = arr[i].getRxDate().toString();
!                                                 String rxP = arr[i].getRxDisplay();
                                                  rxP = rxP + "   " + arr[i].getEndDate();
                                                  String styleColor = "";
--- 1003,1008 ----
                                              <%for (int i = 0; i < arr.length; i++){
                                                  String rxD = arr[i].getRxDate().toString();
!                                                 //String rxP = arr[i].getRxDisplay();
!                                                 String rxP = arr[i].getFullOutLine().replaceAll(";"," ");
                                                  rxP = rxP + "   " + arr[i].getEndDate();
                                                  String styleColor = "";
***************
*** 1078,1082 ****
  				    <input type="button" style="height:20px;" class="ControlPushButton" value="<bean:message key="global.btnPrint"/>" onClick="document.forms['encForm'].btnPressed.value='Save'; document.forms['encForm'].submit();javascript:popupPageK('encounterPrint.jsp');"/>
  				    <input type="hidden"  name="btnPressed" value="">
! 
  				    <input type="button" style="height:20px" value="<bean:message key="oscarEncounter.Index.btnSave"/>" class="ControlPushButton" onclick="document.forms['encForm'].btnPressed.value='Save'; document.forms['encForm'].submit();">
                                      <input type="button" style="height:20px" value="<bean:message key="oscarEncounter.Index.btnSignSave"/>" class="ControlPushButton" onclick="document.forms['encForm'].btnPressed.value='Sign,Save and Exit'; document.forms['encForm'].submit();">
--- 1121,1125 ----
  				    <input type="button" style="height:20px;" class="ControlPushButton" value="<bean:message key="global.btnPrint"/>" onClick="document.forms['encForm'].btnPressed.value='Save'; document.forms['encForm'].submit();javascript:popupPageK('encounterPrint.jsp');"/>
  				    <input type="hidden"  name="btnPressed" value="">
!  
  				    <input type="button" style="height:20px" value="<bean:message key="oscarEncounter.Index.btnSave"/>" class="ControlPushButton" onclick="document.forms['encForm'].btnPressed.value='Save'; document.forms['encForm'].submit();">
                                      <input type="button" style="height:20px" value="<bean:message key="oscarEncounter.Index.btnSignSave"/>" class="ControlPushButton" onclick="document.forms['encForm'].btnPressed.value='Sign,Save and Exit'; document.forms['encForm'].submit();">

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

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

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

Modified Files:
	RxPatientData.java 
Log Message:
code reformat



Index: RxPatientData.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarRx/data/RxPatientData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** RxPatientData.java	9 Feb 2005 07:04:49 -0000	1.2
--- RxPatientData.java	18 Feb 2005 15:54:56 -0000	1.3
***************
*** 1,45 ****
  /*
   *
! 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
! 
   * This software is published under the GPL GNU General Public License.
! 
   * This program is free software; you can redistribute it and/or
! 
   * modify it under the terms of the GNU General Public License
[...1260 lines suppressed...]
!                if (rs.next()) {                  
!                   this.diseaseId = rs.getInt(1);                  
!                }
!                
!                rs.close();               
!             } else {               
!                sql = "UPDATE diseases SET ICD9 = '" + this.getICD9() + "', "               
!                + "entry_date = '" + this.getEntryDate().toString() + "' "               
!                + "WHERE diseaseid = " + this.getDiseaseId();               
!                b = db.RunSQL(sql);               
!             }
!             
!             return b;            
!          }
!          
!       }
!       
!    }
!    
  }

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

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

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

Modified Files:
	billingCorrectionValid.jsp 
Log Message:
fixed the initialization problem of the percentage service_code



Index: billingCorrectionValid.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingCorrectionValid.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** billingCorrectionValid.jsp	17 Mar 2004 22:33:00 -0000	1.2
--- billingCorrectionValid.jsp	18 Feb 2005 04:42:13 -0000	1.3
***************
*** 91,95 ****
  	}
  	
! 	String pValue="", pCode="", pDesc="", pPerc="", pUnit = "";
  	String eValue="", eCode="", eDesc="", ePerc="", eUnit = "";
  	String xValue="", xCode="", xDesc="", xPerc="", xUnit = "";
--- 91,95 ----
  	}
  	
! 	String pValue="0", pCode="", pDesc="", pPerc="", pUnit = "";
  	String eValue="", eCode="", eDesc="", ePerc="", eUnit = "";
  	String xValue="", xCode="", xDesc="", xPerc="", xUnit = "";
***************
*** 134,139 ****
  			billingunit = new BigDecimal(Double.parseDouble(billunit)).setScale(2, BigDecimal.ROUND_HALF_UP);
  			otherunit2 = billingunit.multiply(otherunit2).setScale(2, BigDecimal.ROUND_HALF_UP);
  			
! 			if (scode.compareTo("P009A")==0 || scode.compareTo("P006A") == 0 || scode.compareTo("P011A") == 0 || scode.compareTo("P018A") == 0 || scode.compareTo("P038A") == 0 || scode.compareTo("P020A") == 0 || scode.compareTo("P041A") == 0 ){
  				pValue1 = pValue1.add(otherunit2);
  				pCode = scode;
--- 134,156 ----
  			billingunit = new BigDecimal(Double.parseDouble(billunit)).setScale(2, BigDecimal.ROUND_HALF_UP);
  			otherunit2 = billingunit.multiply(otherunit2).setScale(2, BigDecimal.ROUND_HALF_UP);
+                         
+                         
  			
! 			//if (scode.compareTo("P009A")==0 || scode.compareTo("P006A") == 0 || scode.compareTo("P011A") == 0 || scode.compareTo("P018A") == 0 || scode.compareTo("P038A") == 0 || scode.compareTo("P020A") == 0 || scode.compareTo("P041A") == 0 ){
!                         if (scode.compareTo("A001A")==0 || scode.compareTo("A003A")==0 || 
!                             scode.compareTo("A004A")==0 || scode.compareTo("A007A")==0 || 
!                             scode.compareTo("A008A")==0 || scode.compareTo("A888A")==0 || 
!                             scode.compareTo("Z777A")==0 || scode.compareTo("P029A")==0 || 
!                             scode.compareTo("P028A")==0 || scode.compareTo("Z776A")==0 || 
!                             scode.compareTo("P042A")==0 || scode.compareTo("S768A")==0 || 
!                             scode.compareTo("S756A")==0 || scode.compareTo("S757A")==0 || 
!                             scode.compareTo("S784A")==0 || scode.compareTo("S745A")==0 || 
!                             scode.compareTo("P010A")==0 || scode.compareTo("P009A")==0 || 
!                             scode.compareTo("P006A")==0 || scode.compareTo("P011A")==0 || 
!                             scode.compareTo("P041A")==0 || scode.compareTo("P018A")==0 || 
!                             scode.compareTo("P038A")==0 || scode.compareTo("P020A")==0 || 
!                             scode.compareTo("P031A")==0 || scode.compareTo("Z552A")==0 || 
!                             scode.compareTo("Z716A")==0 || scode.startsWith("S") || 
!                             (scode.endsWith("B") && !scode.endsWith("C988B") && !scode.endsWith("C998B") && !scode.endsWith("C999B") ) ){
  				pValue1 = pValue1.add(otherunit2);
  				pCode = scode;
***************
*** 149,152 ****
--- 166,170 ----
  			
  			if (value.compareTo(".00") ==0 ){
+                             System.out.println("scode: " + scode + " value" + value + " percentage " + percentage);
  				if (scode.compareTo("E411A") == 0 ){
  					eCode = scode;
***************
*** 193,197 ****
  				billingItem.setDiag_code(diagcode);
  				billingItem.setQuantity(billunit);
! 				billing.addBillingItem(billingItem);
  			}
  		}
--- 211,215 ----
  				billingItem.setDiag_code(diagcode);
  				billingItem.setQuantity(billunit);
! 				billing.addBillingItem(billingItem);                                
  			}
  		}

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

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

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

Modified Files:
	BillingDocumentErrorReportUploadAction.java 
Log Message:
only update version code to ## when the response code is found from the batch eligibility table. 



Index: BillingDocumentErrorReportUploadAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/pageUtil/BillingDocumentErrorReportUploadAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** BillingDocumentErrorReportUploadAction.java	28 Apr 2004 18:01:36 -0000	1.5
--- BillingDocumentErrorReportUploadAction.java	18 Feb 2005 03:28:06 -0000	1.6
***************
*** 309,314 ****
                  ResultSet rsDemo = db.GetSQL(sqlDemo);
                  
!                 if (rsDemo.next()){
!                     if(rsDemo.getString("ver").compareTo(bean.getVersion())==0){
                          String sqlVer = "UPDATE demographic SET ver ='##' WHERE hin='" + hin + "'";
                          db.RunSQL(sqlVer);
--- 309,313 ----
                  ResultSet rsDemo = db.GetSQL(sqlDemo);
                  
!                 if (rsDemo.next() && rs.next()){
                          String sqlVer = "UPDATE demographic SET ver ='##' WHERE hin='" + hin + "'";
                          db.RunSQL(sqlVer);
***************
*** 322,327 ****
                              db.RunSQL(newAlertSql);
                          }
!                         rsAlert.close();   
!                     }
                      rs.close();                    
                      rsDemo.close();
--- 321,325 ----
                              db.RunSQL(newAlertSql);
                          }
!                         rsAlert.close();                       
                      rs.close();                    
                      rsDemo.close();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/BC genTeleplanGroupReport.jsp,1.5,1.6

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

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

Modified Files:
	genTeleplanGroupReport.jsp 
Log Message:
debug (add the finding provider billing no)

Index: genTeleplanGroupReport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/BC/genTeleplanGroupReport.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** genTeleplanGroupReport.jsp	26 Jul 2004 20:15:40 -0000	1.5
--- genTeleplanGroupReport.jsp	16 Feb 2005 21:31:42 -0000	1.6
***************
*** 1,37 ****
! <%      
!   if(session.getValue("user") == null)
      response.sendRedirect("../../../logout.jsp");
  %>
! <!--  
  /*
!  * 
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License. 
!  * This program is free software; you can redistribute it and/or 
!  * modify it under the terms of the GNU General Public License 
!  * as published by the Free Software Foundation; either version 2 
!  * of the License, or (at your option) any later version. * 
!  * This program is distributed in the hope that it will be useful, 
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of 
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
!  * along with this program; if not, write to the Free Software 
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
!  * 
   * <OSCAR TEAM>
!  * 
!  * This software was written for the 
!  * Department of Family Medicine 
!  * McMaster Unviersity 
!  * Hamilton 
!  * Ontario, Canada 
   */
  -->
  
! <%@ page import="java.math.*, java.util.*, java.sql.*, oscar.*, oscar.oscarBilling.ca.bc.MSP.*, java.net.*"  %>
  <%@ include file="../../../admin/dbconnection.jsp" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  <jsp:useBean id="SxmlMisc" class="oscar.SxmlMisc" scope="session" />
! <%@ include file="dbBilling.jsp" %> 
  
  
--- 1,37 ----
! <%
!   if(session.getAttribute("user") == null)
      response.sendRedirect("../../../logout.jsp");
  %>
! <!--
  /*
!  *
   * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
!  * This software is published under the GPL GNU General Public License.
!  * This program is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU General Public License
!  * as published by the Free Software Foundation; either version 2
!  * of the License, or (at your option) any later version. *
!  * This program is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
!  * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License
!  * along with this program; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
!  *
   * <OSCAR TEAM>
!  *
!  * This software was written for the
!  * Department of Family Medicine
!  * McMaster Unviersity
!  * Hamilton
!  * Ontario, Canada
   */
  -->
  
! <%@ page import="java.util.*, java.sql.*, oscar.oscarBilling.ca.bc.MSP.*"  %>
  <%@ include file="../../../admin/dbconnection.jsp" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  <jsp:useBean id="SxmlMisc" class="oscar.SxmlMisc" scope="session" />
! <%@ include file="dbBilling.jsp" %>
  
  
***************
*** 43,57 ****
  
     String provider = request.getParameter("provider");
!    String proOHIP=""; 
!    String specialty_code; 
     String billinggroup_no;
     String groupFile = "";
!    if (ExtractBean.HasBillingItemsToSubmit()){
!       if (provider.compareTo("all") == 0 ){  
           batchCount = "0";
           int fileCount = 0;
           ResultSet rslocal = apptMainBean.queryResults("%", "search_provider_ohip_dt");
!          while(rslocal.next()){    
!             proOHIP = rslocal.getString("ohip_no"); 
              billinggroup_no= rslocal.getString("billing_no");
              specialty_code = SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_specialty_code>","</xml_p_specialty_code>");
--- 43,57 ----
  
     String provider = request.getParameter("provider");
!    String proOHIP="";
!    String specialty_code;
     String billinggroup_no;
     String groupFile = "";
!    if (oscar.oscarBilling.ca.bc.MSP.ExtractBean.HasBillingItemsToSubmit()){
!       if (provider.compareTo("all") == 0 ){
           batchCount = "0";
           int fileCount = 0;
           ResultSet rslocal = apptMainBean.queryResults("%", "search_provider_ohip_dt");
!          while(rslocal.next()){
!             proOHIP = rslocal.getString("ohip_no");
              billinggroup_no= rslocal.getString("billing_no");
              specialty_code = SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_specialty_code>","</xml_p_specialty_code>");
***************
*** 62,66 ****
                          param2[1]=billinggroup_no;
                          param2[2]=curYear+"/01/01";
!                ResultSet rslocal2;	  
                 rslocal2 = apptMainBean.queryResults(param2, "search_billactivity_group_monthCode");
                 while(rslocal2.next()){
--- 62,66 ----
                          param2[1]=billinggroup_no;
                          param2[2]=curYear+"/01/01";
!                ResultSet rslocal2;
                 rslocal2 = apptMainBean.queryResults(param2, "search_billactivity_group_monthCode");
                 while(rslocal2.next()){
***************
*** 74,82 ****
  
              if (specialty_code == null || specialty_code.compareTo("") == 0 || specialty_code.compareTo("null")==0){
!                specialty_code = "00"; 
              }
              if ( billinggroup_no == null ||  billinggroup_no.compareTo("") == 0 ||  billinggroup_no.compareTo("null")==0){
                 billinggroup_no = "0000";
!             } 
              ExtractBean extract = new ExtractBean();
              extract.seteFlag("1");
--- 74,82 ----
  
              if (specialty_code == null || specialty_code.compareTo("") == 0 || specialty_code.compareTo("null")==0){
!                specialty_code = "00";
              }
              if ( billinggroup_no == null ||  billinggroup_no.compareTo("") == 0 ||  billinggroup_no.compareTo("null")==0){
                 billinggroup_no = "0000";
!             }
              ExtractBean extract = new ExtractBean();
              extract.seteFlag("1");
***************
*** 90,94 ****
              extract.setBatchCount(String.valueOf(bCount));
              extract.dbQuery();
!                 
              vsFlag = vsFlag +1;
              int fLength = 3 - batchCount.length();
--- 90,94 ----
              extract.setBatchCount(String.valueOf(bCount));
              extract.dbQuery();
! 
              vsFlag = vsFlag +1;
              int fLength = 3 - batchCount.length();
***************
*** 111,115 ****
                       param[11]="A";
                       param[12]= extract.getTotalAmount();
!  
              int rowsAffected = apptMainBean.queryExecuteUpdate(param,"save_billactivity");
  
--- 111,115 ----
                       param[11]="A";
                       param[12]= extract.getTotalAmount();
! 
              int rowsAffected = apptMainBean.queryExecuteUpdate(param,"save_billactivity");
  
***************
*** 123,127 ****
              bCount = bCount + 1;
              extract.writeFile(groupFile);
!             //groupFile =  groupFile+"\n"  ;            
           }
        }else {
--- 123,127 ----
              bCount = bCount + 1;
              extract.writeFile(groupFile);
!             //groupFile =  groupFile+"\n"  ;
           }
        }else {
***************
*** 129,136 ****
           int fileCount = 0;
           ResultSet rslocal;
!          rslocal = apptMainBean.queryResults(request.getParameter("provider").substring(0,6), "search_provider_ohip_dt");
           while(rslocal.next()){
!             proOHIP = rslocal.getString("ohip_no"); 
!             billinggroup_no= rslocal.getString("billing_no"); 
              specialty_code = SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_specialty_code>","</xml_p_specialty_code>");
  
--- 129,138 ----
           int fileCount = 0;
           ResultSet rslocal;
!          String providerBillingNo = request.getParameter("provider");
!          providerBillingNo = providerBillingNo.substring(0, providerBillingNo.indexOf(",")).trim();
!          rslocal = apptMainBean.queryResults(providerBillingNo, "search_provider_ohip_dt");
           while(rslocal.next()){
!             proOHIP = rslocal.getString("ohip_no");
!             billinggroup_no= rslocal.getString("billing_no");
              specialty_code = SxmlMisc.getXmlContent(rslocal.getString("comments"),"<xml_p_specialty_code>","</xml_p_specialty_code>");
  
***************
*** 140,144 ****
                          param2[1]=billinggroup_no;
                          param2[2]=curYear+"/01/01";
!                ResultSet rslocal2;	  
                 rslocal2 = apptMainBean.queryResults(param2, "search_billactivity_group_monthCode");
                 while(rslocal2.next()){
--- 142,146 ----
                          param2[1]=billinggroup_no;
                          param2[2]=curYear+"/01/01";
!                ResultSet rslocal2;
                 rslocal2 = apptMainBean.queryResults(param2, "search_billactivity_group_monthCode");
                 while(rslocal2.next()){
***************
*** 152,160 ****
  
              if (specialty_code == null || specialty_code.compareTo("") == 0 || specialty_code.compareTo("null")==0){
!                specialty_code = "00"; 
              }
              if ( billinggroup_no == null ||  billinggroup_no.compareTo("") == 0 ||  billinggroup_no.compareTo("null")==0){
                 billinggroup_no = "0000";
!             } 
              ExtractBean extract = new ExtractBean();
                          extract.setOscarHome(oscar_home);
--- 154,162 ----
  
              if (specialty_code == null || specialty_code.compareTo("") == 0 || specialty_code.compareTo("null")==0){
!                specialty_code = "00";
              }
              if ( billinggroup_no == null ||  billinggroup_no.compareTo("") == 0 ||  billinggroup_no.compareTo("null")==0){
                 billinggroup_no = "0000";
!             }
              ExtractBean extract = new ExtractBean();
                          extract.setOscarHome(oscar_home);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarMeasurements Measurements.jsp,1.13,1.14

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

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

Modified Files:
	Measurements.jsp 
Log Message:
removed unneed enctype="multipart/form-data"



Index: Measurements.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarMeasurements/Measurements.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Measurements.jsp	13 Jul 2004 20:13:49 -0000	1.13
--- Measurements.jsp	16 Feb 2005 19:16:14 -0000	1.14
***************
*** 73,77 ****
  <!--  -->
      
!     <html:form action="/oscarEncounter/Measurements" enctype="multipart/form-data">
      <logic:present name="css">
          <link rel="stylesheet" type="text/css" href="<bean:write name="css" />">
--- 73,77 ----
  <!--  -->
      
!     <html:form action="/oscarEncounter/Measurements" >
      <logic:present name="css">
          <link rel="stylesheet" type="text/css" href="<bean:write name="css" />">

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formbcnewbornpg1.jsp,1.13,1.14

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

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

Modified Files:
	formbcnewbornpg1.jsp 
Log Message:
change request by scbp

Index: formbcnewbornpg1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcnewbornpg1.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** formbcnewbornpg1.jsp	17 Oct 2004 05:58:13 -0000	1.13
--- formbcnewbornpg1.jsp	16 Feb 2005 16:58:15 -0000	1.14
***************
*** 26,54 ****
  <%
    boolean bView = false;
!   if (request.getParameter("view") != null && request.getParameter("view").equals("1")) bView = true; 
  %>
! <!--  
  /*
!  * 
   * 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 
[...1021 lines suppressed...]
! 	  <input type="text" name="pg1_Signature" size="50" maxlength="80" value="<%= props.getProperty("pg1_Signature", "") %>" @oscar.formDB/>
  	  MD/RM</td>
  	</tr>
  	</table>
! 
    </td>
  </tr>
***************
*** 1399,1403 ****
  %>
  
!         <td align="right"><b>View:</b> 
              <a href="javascript: popupPage('formbcnewbornpg2.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>&provNo=<%=provNo%>&view=1');">Part2 <font size=-2>(pg.1)</font></a> |
              <a href="javascript: popupPage('formbcnewbornpg3.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>&provNo=<%=provNo%>&view=1');">Part2 <font size=-2>(pg.2)</font></a>
--- 1405,1409 ----
  %>
  
!         <td align="right"><b>View:</b>
              <a href="javascript: popupPage('formbcnewbornpg2.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>&provNo=<%=provNo%>&view=1');">Part2 <font size=-2>(pg.1)</font></a> |
              <a href="javascript: popupPage('formbcnewbornpg3.jsp?demographic_no=<%=demoNo%>&formId=<%=formId%>&provNo=<%=provNo%>&view=1');">Part2 <font size=-2>(pg.2)</font></a>

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

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

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

Modified Files:
	FrmSetupFormAction.java 
Log Message:
updated getPatientRlt function



Index: FrmSetupFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** FrmSetupFormAction.java	15 Feb 2005 16:23:36 -0000	1.20
--- FrmSetupFormAction.java	15 Feb 2005 18:37:04 -0000	1.21
***************
*** 342,346 ****
          try{
              XmlRpcClient xmlrpc = new XmlRpcClient(osdsfRPCURL);
!             String result = (String) xmlrpc.execute("vt.getPatientRlt", data2OSDSF);
              System.out.println("Reverse result: " + result);
              return result;
--- 342,346 ----
          try{
              XmlRpcClient xmlrpc = new XmlRpcClient(osdsfRPCURL);
!             String result = (String) xmlrpc.execute("vt.getAndSaveRlt", data2OSDSF);
              System.out.println("Reverse result: " + result);
              return result;

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

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

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

Modified Files:
	FrmSetupFormAction.java 
Log Message:
added flushot data to the medication list



Index: FrmSetupFormAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/form/pageUtil/FrmSetupFormAction.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** FrmSetupFormAction.java	29 Jan 2005 20:57:35 -0000	1.19
--- FrmSetupFormAction.java	15 Feb 2005 16:23:36 -0000	1.20
***************
*** 240,247 ****
          RxPatientData pData = new RxPatientData();
          List drugs = new LinkedList();
          try{
              RxPatientData.Patient p = pData.getPatient(Integer.parseInt(demographicNo));
              RxPrescriptionData.Prescription[] prescribedDrugs = p.getPrescribedDrugsUnique();
!             if(prescribedDrugs.length==0)
                  drugs=null;
              for(int i=0; i<prescribedDrugs.length; i++){
--- 240,252 ----
          RxPatientData pData = new RxPatientData();
          List drugs = new LinkedList();
+         String fluShot = getFluShotBillingDate(demographicNo);
+         //System.out.println("getFluShotBillingDate: " + fluShot);
+         if(fluShot!=null)
+             drugs.add(fluShot + "     Flu Shot");
+             
          try{
              RxPatientData.Patient p = pData.getPatient(Integer.parseInt(demographicNo));
              RxPrescriptionData.Prescription[] prescribedDrugs = p.getPrescribedDrugsUnique();
!             if(prescribedDrugs.length==0 && fluShot==null)
                  drugs=null;
              for(int i=0; i<prescribedDrugs.length; i++){
***************
*** 274,277 ****
--- 279,302 ----
      }
      
+     private String getFluShotBillingDate(String demoNo) {
+         String s = null;
+         try {
+                 DBHandler dbhandler = new DBHandler(DBHandler.OSCAR_DATA);
+                 String s1 = "select b.billing_no, b.billing_date from billing b, billingdetail bd where b.demographic_no='"
+                                 + demoNo
+                                 + "' and bd.billing_no=b.billing_no and (bd.service_code='G590A' or bd.service_code='G591A') "
+                                 + " and bd.status<>'D' and b.status<>'D' order by b.billing_date desc limit 0,1";
+                 ResultSet rs = dbhandler.GetSQL(s1);
+                 //System.out.println("flushot: " + s1);
+                 if (rs.next())
+                         s = rs.getString("billing_date");
+                 rs.close();
+                 dbhandler.CloseConn();
+             } catch (SQLException sqlexception) {
+                 System.out.println(sqlexception.getMessage());
+         }
+         return s;
+     }
+     
      private Properties getFormRecord(String formName, String formId, String demographicNo){
          Properties props = new Properties();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider appointmentprovideradminday.jsp,1.40,1.41

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

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

Modified Files:
	appointmentprovideradminday.jsp 
Log Message:
changed reason to be shown only if SHOW_APPT_REASON=yes  is set in the oscar properties file



Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** appointmentprovideradminday.jsp	14 Feb 2005 21:20:40 -0000	1.40
--- appointmentprovideradminday.jsp	14 Feb 2005 21:38:24 -0000	1.41
***************
*** 1,5 ****
  <%@ page import="java.lang.*, java.util.*, java.text.*,java.sql.*, java.net.*, oscar.*, oscar.util.*" errorPage="errorpage.jsp" %>
  <%@ taglib uri="/WEB-INF/msg-tag.tld" prefix="oscarmessage" %>
! 
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" />
--- 1,5 ----
  <%@ page import="java.lang.*, java.util.*, java.text.*,java.sql.*, java.net.*, oscar.*, oscar.util.*" errorPage="errorpage.jsp" %>
  <%@ taglib uri="/WEB-INF/msg-tag.tld" prefix="oscarmessage" %>
! <%@ taglib uri="/WEB-INF/oscarProperties-tag.tld" prefix="oscarProp" %>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  <jsp:useBean id="providerBean" class="java.util.Properties" scope="session" />
***************
*** 655,659 ****
  
        <% if (!vLocale.getCountry().equals("BR")) { %>
!       <a href=# onClick="popupOscarRx(700,960,'../oscarRx/choosePatient.do?providerNo=<%=curUser_no%>&demographicNo=<%=demographic_no%>')">|<bean:message key="global.rx"/></a>| <b><%=reason%></b>
        <%
       //out.print(monthDay + " " + demBday);
--- 655,659 ----
  
        <% if (!vLocale.getCountry().equals("BR")) { %>
!       <a href=# onClick="popupOscarRx(700,960,'../oscarRx/choosePatient.do?providerNo=<%=curUser_no%>&demographicNo=<%=demographic_no%>')">|<bean:message key="global.rx"/></a><oscarProp:oscarPropertiesCheck property="SHOW_APPT_REASON" value="yes">| <b><%=reason%></b></oscarProp:oscarPropertiesCheck>
        <%
       //out.print(monthDay + " " + demBday);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider appointmentprovideradminday.jsp,1.39,1.40

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

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

Modified Files:
	appointmentprovideradminday.jsp 
Log Message:
Changed session Global variable to "org.apache.struts.Globals.LOCALE_KEY"  allows for newer versions of struts to be used.





Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** appointmentprovideradminday.jsp	9 Feb 2005 09:28:55 -0000	1.39
--- appointmentprovideradminday.jsp	14 Feb 2005 21:20:40 -0000	1.40
***************
*** 293,297 ****
     }
  
!    java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY);
  %>
  <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
--- 293,297 ----
     }
  
!    java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY);  
  %>
  <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">

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

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

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

Modified Files:
	oscarinit.sql 
Log Message:
added formInternetAccess



Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** oscarinit.sql	9 Feb 2005 07:11:42 -0000	1.71
--- oscarinit.sql	14 Feb 2005 16:28:33 -0000	1.72
***************
*** 2939,2943 ****
  ) TYPE=MyISAM;
  
! 
  
  --
--- 2939,2961 ----
  ) TYPE=MyISAM;
  
! --
! -- Table structure for table `formInternetAccess`
! --
! CREATE TABLE formInternetAccess(
!   ID int(10) NOT NULL  auto_increment ,
!   demographic_no int(10) NOT NULL,
!   provider_no int(10),
!   formCreated date,
!   formEdited timestamp NOT NULL, 
!   studyID varchar(20) NOT NULL DEFAULT 'N/A',
!   internetY tinyint(1),
!   internetN tinyint(1),
!   internetHome tinyint(1),
!   internetWork tinyint(1),
!   internetFriend tinyint(1),
!   internetOther tinyint(1),
!   internetOtherTx varchar(255),
!   PRIMARY KEY (ID)
! ) TYPE=MyISAM;
  
  --

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

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

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

Added Files:
	FrmInternetAccessRecord.java 
Log Message:
initial commit



--- NEW FILE: FrmInternetAccessRecord.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>
 * 
 * This software was written for the 
 * Department of Family Medicine 
 * McMaster Unviersity 
 * Hamilton 
 * Ontario, Canada 
 */
package oscar.form;

import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import java.util.Properties;

import oscar.oscarDB.DBHandler;
import oscar.util.UtilDateUtilities;

public class FrmInternetAccessRecord extends FrmRecord {
	private String _dateFormat = "yyyy/MM/dd";

	public Properties getFormRecord(int demographicNo, int existingID)
		throws SQLException {
		Properties props = new Properties();
                
                DBHandler db = new DBHandler(DBHandler.OSCAR_DATA);
                ResultSet rs;
                String sql;

		if (existingID <= 0) {			
			sql = "SELECT demographic_no, sex, year_of_birth, month_of_birth, date_of_birth, phone FROM demographic WHERE demographic_no = "
                              + demographicNo;
			rs = db.GetSQL(sql);
			if (rs.next()) {
                                java.util.Date dob = UtilDateUtilities.calcDate(rs.getString("year_of_birth"), rs.getString("month_of_birth"), rs.getString("date_of_birth"));
				props.setProperty(
					"demographic_no",
					rs.getString("demographic_no"));
				props.setProperty(
					"formCreated",
					UtilDateUtilities.DateToString(
						UtilDateUtilities.Today(),
						_dateFormat));	
                                props.setProperty("dob", UtilDateUtilities.DateToString(dob,"yyyy/MM/dd"));
                                props.setProperty("sex", rs.getString("sex"));
                                props.setProperty("phone", rs.getString("phone"));
			}
			rs.close();
                        sql = "SELECT studyID FROM rehabStudy2004 WHERE demographic_no='"+demographicNo + "'";
                        rs = db.GetSQL(sql);
                        if (rs.next()){
                            props.setProperty("studyID", rs.getString("studyID"));
                        }
                        else{
                            props.setProperty("studyID", "N/A");
                        }
                        rs.close();
			db.CloseConn();
		} else {
			sql =
				"SELECT * FROM formInternetAccess WHERE demographic_no = "
					+ demographicNo
					+ " AND ID = "
					+ existingID;
			rs = db.GetSQL(sql);

                        if(rs.next())
                        {
                            System.out.println("getting metaData");
                            ResultSetMetaData md = rs.getMetaData();

                            for(int i=1; i<=md.getColumnCount(); i++)
                            {
                                String name = md.getColumnName(i);

                                String value;
                                    System.out.println(" name = "+name+" type = "+md.getColumnTypeName(i)+" scale = "+md.getScale(i));
                                if(md.getColumnTypeName(i).equalsIgnoreCase("TINY"))           
                                {

                                    if(rs.getInt(i)==1)
                                    {
                                        value = "checked='checked'";
                                        System.out.println("checking "+name);
                                    }
                                    else
                                    {
                                        value = "";
                                        System.out.println("not checking "+name);
                                    }
                                }
                                else
                                {
                                    if(md.getColumnTypeName(i).equalsIgnoreCase("date"))
                                    {
                                        value = UtilDateUtilities.DateToString(rs.getDate(i),"yyyy/MM/dd");
                                    }
                                    else
                                    {
                                        value = rs.getString(i);
                                    }
                                }

                                if(value!=null)
                                {
                                    props.setProperty(name, value);
                                }
                            }
                        }
                        rs.close();
                    }
                    db.CloseConn();		

		return props;
	}

	public int saveFormRecord(Properties props) throws SQLException {
		String demographic_no = props.getProperty("demographic_no");
		String sql =
			"SELECT * FROM formInternetAccess WHERE demographic_no="
				+ demographic_no
				+ " AND ID=0";

		FrmRecordHelp frh = new FrmRecordHelp();
		frh.setDateFormat(_dateFormat);
		return ((frh).saveFormRecord(props, sql));
	}

	public Properties getPrintRecord(int demographicNo, int existingID)
		throws SQLException {
		String sql =
			"SELECT * FROM formInternetAccess WHERE demographic_no = "
				+ demographicNo
				+ " AND ID = "
				+ existingID;
		FrmRecordHelp frh = new FrmRecordHelp();
		frh.setDateFormat(_dateFormat);
		return ((frh).getPrintRecord(sql));
	}

	public String findActionValue(String submit) throws SQLException {
		FrmRecordHelp frh = new FrmRecordHelp();
		frh.setDateFormat(_dateFormat);
		return ((frh).findActionValue(submit));
	}

	public String createActionURL(
		String where,
		String action,
		String demoId,
		String formId)
		throws SQLException {
		FrmRecordHelp frh = new FrmRecordHelp();
		frh.setDateFormat(_dateFormat);
		return ((frh).createActionURL(where, action, demoId, formId));
	}

}

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

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

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

Added Files:
	formInternetAccess.jsp 
Log Message:
initial commit



--- NEW FILE: formInternetAccess.jsp ---

<%@ page language="java"%>
<%@ page import="oscar.util.*, oscar.form.*, oscar.form.data.*" %>
<%@ 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" %>
<jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" />

<%
    String formClass = "InternetAccess";
    String formLink = "formInternetAccess.jsp";

    int demoNo = Integer.parseInt(request.getParameter("demographic_no"));
    int formId = Integer.parseInt(request.getParameter("formId"));
    int provNo = Integer.parseInt((String) session.getAttribute("user"));
    FrmRecord rec = (new FrmRecordFactory()).factory(formClass);
    java.util.Properties props = rec.getFormRecord(demoNo, formId);

    //FrmData fd = new FrmData();    String resource = fd.getResource(); resource = resource + "ob/riskinfo/";

    //get project_home
    String project_home = request.getContextPath().substring(1);	
%>
<%
  boolean bView = false;
  if (request.getParameter("view") != null && request.getParameter("view").equals("1")) bView = true; 
%>
<!--  
/*
 * 
 * Copyright (c) 2001-2002. Department of Family Medicine, McMaster University. All Rights Reserved. *
 * This software is published under the GPL GNU General Public License. 
 * This program is free software; you can redistribute it and/or 
 * modify it under the terms of the GNU General Public License 
 * as published by the Free Software Foundation; either version 2 
 * of the License, or (at your option) any later version. * 
 * This program is distributed in the hope that it will be useful, 
 * but WITHOUT ANY WARRANTY; without even the implied warranty of 
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 
 * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License 
 * along with this program; if not, write to the Free Software 
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * 
 * 
 * <OSCAR TEAM>
 * 
 * This software was written for the 
 * Department of Family Medicine 
 * McMaster Unviersity 
 * Hamilton 
 * Ontario, Canada 
 */
-->
<html:html locale="true">
<% response.setHeader("Cache-Control","no-cache");%>

<head>
    <title>Internet Access</title>
    <html:base/>
        <style type="text/css">
        a:link{
            text-decoration: none;
            color:#FFFFFF;
        }

        a:active{
            text-decoration: none;
            color:#FFFFFF;
        }

        a:visited{
            text-decoration: none;
            color:#FFFFFF;
        }

        a:hover{
            text-decoration: none;
            color:#FFFFFF;
        }

	.Head {
            background-color:#BBBBBB;
            padding-top:3px;
            padding-bottom:3px;
            width:740px;
            height: 30px;
            font-size:12pt;
        }

        .Head INPUT {
            width: 100px;
        }

        .Head A {
            font-size:12pt;
        }

        BODY {
            font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;             
            background-color: #F2F2F2;            
        }

        TABLE {
            font-family: Arial, Verdana, Tahoma, Helvetica, sans-serif;
        }
        
        TD{
            font-size:13pt;
        }

        TH{
            font-size:14pt;
            font-weight: normal;            
        }

        .checkbox{
            height: 25px;
            width: 25px;     
            background-color: #FFFFFF;
        }

        .checkboxError{
            height: 25px;
            width: 25px;     
            background-color: red;
        }

        .subject {
            background-color: #000000;
            color: #FFFFFF;  
            font-size: 15pt;
            font-weight: bold;
            text-align: centre;
        }

        .title {
            background-color: #486ebd;
            color: #FFFFFF;            
            font-weight: bold;
            text-align: left;
        }
        .subTitle {
            backgroud-color: #F2F2F2;
            font-weight: bold;
            text-align: center;             
        }
        .question{
            text-align: left;
        }
        
        

    </style>
</head>


<script type="text/javascript" language="Javascript">
    
    var choiceFormat  = new Array(6,7);        
    var allNumericField = null;
    var allMatch = null;
    var action = "/<%=project_home%>/form/formname.do";        

</script>
<script type="text/javascript" src="formScripts.js">
    
</script>


<body bgproperties="fixed" topmargin="0" leftmargin="0" rightmargin="0" onload="window.resizeTo(768,768)">
<!--
@oscar.formDB Table="formAdf" 
@oscar.formDB Field="ID" Type="int(10)" Null="NOT NULL" Key="PRI" Default="" Extra="auto_increment"
@oscar.formDB Field="demographic_no" Type="int(10)" Null="NOT NULL" Default="'0'" 
@oscar.formDB Field="provider_no" Type="int(10)" Null="" Default="NULL" 
@oscar.formDB Field="formCreated" Type="date" Null="" Default="NULL" 
@oscar.formDB Field="formEdited" Type="timestamp"  
-->
<html:form action="/form/formname">
<input type="hidden" name="demographic_no" value="<%= props.getProperty("demographic_no", "0") %>" />
<input type="hidden" name="formCreated" value="<%= props.getProperty("formCreated", "") %>" />
<input type="hidden" name="form_class" value="<%=formClass%>" />
<input type="hidden" name="form_link" value="<%=formLink%>" />
<input type="hidden" name="formId" value="<%=formId%>" />
<input type="hidden" name="submit" value="exit"/>

<table border="0" cellspacing="0" cellpadding="0" width="740px" height="95%">
<tr><td>
<table border="0" cellspacing="0" cellpadding="0" width="740px" height="10%">
    <tr>
        <th class="subject">Internet Access</th>
    </tr>    
</table>
</td></tr>
<tr><td valign="top">
<table border="0" cellspacing="0" cellpadding="0" height="85%" width="740px" id="page1">        
    <tr>        
        <td colspan="2" valign="top">
            <table width="740px" height="200px" border="0"  cellspacing="0" cellpadding="0" >                  
                <tr>
                    <td width="5%" valign="top" align="right"></td>
                    <td valign="top">                        
                        1. Do you have access to the internet?
                    </td>
                </tr>
                <tr>                                                
                <tr bgcolor="white">                                    
                    <td width="5%" align="right">                        
                    </td>
                    <td width="95%">
                        <input type="checkbox"  class="checkbox" name="internetY" <%= props.getProperty("internetY", "") %>/>
                        Yes
                    </td>                                  
                </tr>
                <tr bgcolor="white">                                    
                    <td width="5%" align="right">                        
                    </td>
                    <td width="95%">
                        <input type="checkbox"  class="checkbox" name="internetN" <%= props.getProperty("internetN", "") %>/>
                        No
                    </td>                                  
                </tr>                
                <tr>
                    <td width="5%" valign="top" align="right"></td>
                    <td valign="top">                        
                        2. If yes, where do you access the internet?
                    </td>
                </tr>
                <tr>                                                
                <tr bgcolor="white">                                    
                    <td width="5%" align="right">                        
                    </td>
                    <td width="95%">
                        <input type="checkbox"  class="checkbox" name="internetHome" <%= props.getProperty("internetHome", "") %>/>
                        at home
                    </td>                                  
                </tr>
                <tr bgcolor="white">                                    
                    <td width="5%" align="right">                        
                    </td>
                    <td width="95%">
                        <input type="checkbox"  class="checkbox" name="internetWork" <%= props.getProperty("internetWork", "") %>/>
                        at work
                    </td>                                  
                </tr>
                <tr bgcolor="white">                                    
                    <td width="5%" align="right">                        
                    </td>
                    <td width="95%">
                        <input type="checkbox"  class="checkbox" name="internetFriend" <%= props.getProperty("internetFriend", "") %>/>
                        at friend/relative's home
                    </td>                                  
                </tr>
                <tr bgcolor="white">                                    
                    <td width="5%" align="right">                        
                    </td>
                    <td width="95%">
                        <input type="checkbox"  class="checkbox" name="internetOther" <%= props.getProperty("internetOther", "") %>/>
                        other 
                        <input type="text" name="internetOtherTx" value="<%= props.getProperty("internetOtherTx", "") %>"/>
                    </td>                                  
                </tr>
            </table>            
        </td>
    </tr>   
</table>
</td></tr>

<tr><td valign="top">
<table class="Head" class="hidePrint" height="5%">
    <tr>
        <td align="left">
<%
  if (!bView) {
%>
            <input type="submit" value="Save" onclick="javascript: return onSave();" />
            <input type="submit" value="Save and Exit" onclick="javascript: return onSaveExit();"/>
<%
  }
%>
            <input type="button" value="Exit" onclick="javascript:return onExit();"/>
            <input type="button" value="Print" onclick="javascript:window.print();"/>
        </td>
        <td align="right">
            Study ID: <%= props.getProperty("studyID", "N/A") %>
            <input type="hidden" name="studyID" value="<%= props.getProperty("studyID", "N/A") %>"/>
        </td>
    </tr>
</table>
</td></tr>
</table>
</html:form>
</body>
</html:html>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/form formbcarpg1.jsp,1.23,1.24 formbcarpg2.jsp,1.23,1.24 formbcarpg3.jsp,1.20,1.21

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

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

Modified Files:
	formbcarpg1.jsp formbcarpg2.jsp formbcarpg3.jsp 
Log Message:
Added neg sign to dropdown list

Index: formbcarpg1.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcarpg1.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** formbcarpg1.jsp	3 Dec 2004 17:06:45 -0000	1.23
--- formbcarpg1.jsp	9 Feb 2005 09:50:58 -0000	1.24
***************
*** 1,1722 ****
! 
! <%@ page language="java"%>
! <%@ page import=" oscar.form.*, oscar.form.data.*" %>
! <%@ 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" %>
! <jsp:useBean id="oscarVariables" class="java.util.Properties" scope="session" />
! 
! <%
! 	String formClass = "BCAR";
[...3415 lines suppressed...]
!       </td>
!       <td>Poor weight gain 26 - 36 weeks ( <.5 kg / wk )<br>or weight loss</td>
! 	</tr>
! 	</table>
! 
! 
!     </td>
!    </tr>
!   </table>
! 
!   
!   </td>
! </tr>
! </table>
! 
! 
! 
! </html:form>
! </body>
! </html:html>

Index: formbcarpg2.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcarpg2.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** formbcarpg2.jsp	3 Dec 2004 17:06:45 -0000	1.23
--- formbcarpg2.jsp	9 Feb 2005 09:50:59 -0000	1.24
***************
*** 748,751 ****
--- 748,752 ----
     <table bgcolor='silver' width='100%'>
       <tr><td align='right'><a href=# onclick="showHideBox('UrineDiv',0); return false;">X</a></td></tr>
+      <tr><td><a href=# onclick="insertBox('-', 'UrineDiv'); return false;">-</a></td></tr>
       <tr><td><a href=# onclick="insertBox('+', 'UrineDiv'); return false;">+</a></td></tr>
       <tr><td><a href=# onclick="insertBox('++', 'UrineDiv'); return false;">++</a></td></tr>

Index: formbcarpg3.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/form/formbcarpg3.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** formbcarpg3.jsp	3 Dec 2004 17:06:45 -0000	1.20
--- formbcarpg3.jsp	9 Feb 2005 09:50:59 -0000	1.21
***************
*** 744,747 ****
--- 744,748 ----
     <table bgcolor='silver' width='100%'>
       <tr><td align='right'><a href=# onclick="showHideBox('UrineDiv',0); return false;">X</a></td></tr>
+      <tr><td><a href=# onclick="insertBox('-', 'UrineDiv'); return false;">-</a></td></tr>
       <tr><td><a href=# onclick="insertBox('+', 'UrineDiv'); return false;">+</a></td></tr>
       <tr><td><a href=# onclick="insertBox('++', 'UrineDiv'); return false;">++</a></td></tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider providercontrol.jsp,1.8,1.9

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

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

Modified Files:
	providercontrol.jsp 
Log Message:
Query updates

Index: providercontrol.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/providercontrol.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** providercontrol.jsp	23 Aug 2004 16:17:07 -0000	1.8
--- providercontrol.jsp	9 Feb 2005 09:35:41 -0000	1.9
***************
*** 1,141 ****
! <%--  
! /*
!  * 
!  * 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 
!  */
! --%>
! <%@ page  import="java.util.*,java.net.*"  errorPage="errorpage.jsp"%>
! <%
!   if(session.getAttribute("user") == null || !((String) session.getAttribute("userprofession")).equalsIgnoreCase("doctor"))
!     response.sendRedirect("../logout.jsp");
! 
!   if(request.getParameter("year")==null && request.getParameter("month")==null && request.getParameter("day")==null && request.getParameter("displaymode")==null && request.getParameter("dboperation")==null) {
!     GregorianCalendar now=new GregorianCalendar();
!     int nowYear = now.get(Calendar.YEAR);
!     int nowMonth = now.get(Calendar.MONTH)+1 ; //be care for the month +-1
!     int nowDay = now.get(Calendar.DAY_OF_MONTH);
!     response.sendRedirect("./providercontrol.jsp?year="+nowYear+"&month="+(nowMonth)+"&day="+(nowDay)+"&view=0&displaymode=day&dboperation=searchappointmentday");
!     return;
!   }
! %>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
! <%@ include file="../admin/dbconnection.jsp" %>  
! 
! <% 
!   //operation available to the client - dboperation
!   String [][] dbOperation=new String[][] {
!     {"search_tickler","select * from tickler where demographic_no=? and service_date<=? and status='A' order by service_date desc"},
!     {"search_studycount","select count(ds.study_no) from demographicstudy ds, study s where ds.demographic_no=? and ds.study_no=s.study_no and s.current='1'"},
!     {"search_study","select s.* from demographicstudy d, study s where demographic_no=? and d.study_no = s.study_no limit 1 "},
!     {"searchappointmentday", "select appointment_no,provider_no, start_time,end_time,name,demographic_no,reason,notes,status from appointment where provider_no=? and appointment_date=? order by start_time, status desc "}, 
!     {"searchmygroupcount", "select count(provider_no) from mygroup where mygroup_no=? "}, 
!     {"searchmygroupprovider", "select provider_no, last_name, first_name from mygroup where mygroup_no=? "}, 
!     {"searchmygroupall", "select * from mygroup order by mygroup_no"}, 
!     // {"searchmygroupno", "select * from mygroup group by mygroup_no order by mygroup_no"}, 
!     {"searchmygroupno", "select mygroup_no from mygroup group by mygroup_no order by mygroup_no"}, 
!     {"deletegroupmember", "delete from mygroup where mygroup_no=? and provider_no=?"}, 
!     {"savemygroup", "insert into mygroup (mygroup_no,provider_no,last_name,first_name) values(?,?,?,?)" },
!     {"updateapptstatus", "update appointment set status=? where appointment_no=? "}, 
!     {"updatepreference", "update preference set start_hour=?, end_hour=?, every_min=?, mygroup_no=?, color_template=? where provider_no=? "},
!     {"add_preference", "insert into preference (provider_no, start_hour, end_hour, every_min, mygroup_no, color_template) values (?, ?, ?, ?, ?, ?)"},
!     {"search_demograph", "select *  from demographic where demographic_no=?"},
!     {"search_encounter", "select * from encounter where demographic_no = ? order by encounter_date desc, encounter_time desc"},
!     {"search_encounter_no", "select * from encounter where demographic_no = ? and encounter_date=? and encounter_time=? and provider_no=? order by encounter_no desc limit 1"},
!     {"search_encountersingle", "select * from encounter where encounter_no = ?"},
!     {"search_previousenc", "select * from encounter where demographic_no = ? and provider_no=? order by encounter_date desc, encounter_time desc limit 1"},
!     {"delete_encounter1", "insert into recyclebin (provider_no,updatedatetime,table_name,keyword,table_content) values(?,?,'encounter',?,?)"},
!     {"delete_encounter2", "delete from encounter where encounter_no = ?"},
!     {"search_encounterform", "select * from encounterform where encounterform_name like ? order by encounterform_name"},
!     {"search_form", "select * from form where form_no=? "}, //new?delete
!     {"search_form_no", "select form_no, content from form where demographic_no=? and form_name like ? order by form_date desc, form_time desc,form_no desc limit 1"}, //new?delete
!     {"compare_form", "select form_no, form_name, content from form where demographic_no=? and form_name like ? order by form_date desc, form_time desc,form_no desc limit 1"},
!     {"save_form", "insert into form (demographic_no, provider_no, form_date, form_time, form_name, content) values(?,?,?,?,?,?)"},
!     {"search_template", "select * from encountertemplate where encountertemplate_name like ? order by encountertemplate_name"},
!     //{"search_templatevalue", "select * from encountertemplate where encountertemplate_name like ?"},
!     {"add_encounter", "insert into encounter (demographic_no, encounter_date, encounter_time, provider_no, subject, content, encounterattachment) values(?,?,?,?,?,?,?)"},
!     {"save_prescribe", "insert into prescribe (demographic_no, provider_no, prescribe_date, prescribe_time, content) values(?,?,?,?,?)"},
!     {"search_prescribe", "select * from prescribe where prescribe_no= ?"},
!     {"search_prescribe_no", "select prescribe_no from prescribe where demographic_no=?  order by prescribe_date desc, prescribe_time desc limit 1"},
!     {"search_demographicaccessory", "select * from demographicaccessory where demographic_no=?"},
!     {"search_demographicaccessorycount", "select count(demographic_no) from demographicaccessory where demographic_no=?"},
!     {"add_demographicaccessory", "insert into demographicaccessory values(?,?)"},
!     {"update_demographicaccessory", "update demographicaccessory set content=? where demographic_no=?"},
!     {"add_template", "insert into encountertemplate values(?,?,?,?)"},
!     {"delete_template", "delete from encountertemplate where encountertemplate_name = ?"},
!     {"search_templatename", "select encountertemplate_name from encountertemplate order by encountertemplate_name"},
!     {"add_encounterform", "insert into encounterform values(?,?)"},
!     {"delete_encounterform", "delete from encounterform where encounterform_name = ?"},
!     {"search_encounterformname", "select encounterform_name from encounterform order by encounterform_name"},
!     {"search_provider_slp", "select comments from provider where provider_no=?"},
! 
!     {"searchprovider", "select provider_no, last_name, first_name from provider where provider_type='doctor' and status='1' order by last_name"}, 
!     //{"searchallprovider", "select * from provider order by ?"}, ^M
!     {"searchallprovider", "select * from provider where status='1' order by last_name"}, 
!     {"search_scheduleholiday", "select * from scheduleholiday where sdate > ?" }, 
!     {"search_scheduledate_datep", "select * from scheduledate where sdate between ? and ? order by sdate" }, 
!     {"search_scheduledate_singlep", "select * from scheduledate where sdate between ? and ? and provider_no=? order by sdate" }, 
!     {"search_scheduledate_single", "select * from scheduledate where sdate=? and provider_no=?" }, 
! 
!     {"search_appttimecode", "select scheduledate.provider_no, scheduletemplate.timecode, scheduledate.sdate from scheduletemplate, scheduledate where scheduletemplate.name=scheduledate.hour and scheduledate.sdate=? and  scheduledate.provider_no=? and (scheduletemplate.provider_no=scheduledate.provider_no or scheduletemplate.provider_no='Public') order by scheduledate.sdate"}, 
!     // {"search_timecode", "select * from scheduletemplatecode order by ?"}, 
!     {"search_timecode", "select * from scheduletemplatecode order by code"}, 
!     {"search_resource_baseurl", "select * from property where name = ?"}, 
! 
!     {"search_numgrpscheduledate", "select count(scheduledate.provider_no) from mygroup, scheduledate where mygroup_no = ? and scheduledate.sdate=? and mygroup.provider_no=scheduledate.provider_no and scheduledate.available = '1' "}, 
!   };
!   
!   //associate each operation with an output JSP file - displaymode
!   String[][] toFile=new String[][] {
!     {"day" , "appointmentprovideradminday.jsp"},
!     {"month" , "appointmentprovideradminmonth.jsp"},
!     {"addstatus" , "provideraddstatus.jsp"},
!     {"updatepreference" , "providerupdatepreference.jsp"},
!     {"displaymygroup" , "providerdisplaymygroup.jsp"},
!     {"encounter" , "providerencounter.jsp"},
!     {"prescribe" , "providerprescribe.jsp"},
!     {"encountersingle" , "providerencountersingle.jsp"},
!     {"vary" , request.getParameter("displaymodevariable")==null?"":URLDecoder.decode(request.getParameter("displaymodevariable")) },
!     {"saveform" , "providersaveform.jsp"},
!     {"saveencounter" , "providersaveencounter.jsp"},
!     {"savebill" , "providersavebill.jsp"},
!     {"saveprescribe" , "providersaveprescribe.jsp"},
!     {"savedemographicaccessory" , "providersavedemographicaccessory.jsp"},
!     {"encounterhistory" , "providerencounterhistory.jsp"},
!     {"savedeletetemplate" , "providertemplate.jsp"},
!     {"savetemplate" , "providersavetemplate.jsp"},
!     {"savedeleteform" , "providerform.jsp"},
!     {"save_encounterform" , "providersaveencounterform.jsp"},
!     {"ar1" , "formar1_99_12.jsp"},
!     {"ar2" , "formar2_99_08.jsp"},
!     {"newgroup" , "providernewgroup.jsp"},
!     {"savemygroup" , "providersavemygroup.jsp"},
! //    {"billingobstetric" , "billingobstetric.jsp"},
! 
!   };
!   apptMainBean.doConfigure(dbParams,dbOperation,toFile);
!   apptMainBean.doCommand(request); //store request to a help class object Dict - function&params
!   if(true) {
!     out.clear();
!     pageContext.forward(apptMainBean.whereTo()); //forward request&response to the target page
!     return;
!   }
! %>
--- 1,141 ----
! <%--  
! /*
!  * 
!  * 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 
!  */
! --%>
! <%@ page  import="java.util.*,java.net.*"  errorPage="errorpage.jsp"%>
! <%
!   if(session.getAttribute("user") == null || !((String) session.getAttribute("userprofession")).equalsIgnoreCase("doctor"))
!     response.sendRedirect("../logout.jsp");
! 
!   if(request.getParameter("year")==null && request.getParameter("month")==null && request.getParameter("day")==null && request.getParameter("displaymode")==null && request.getParameter("dboperation")==null) {
!     GregorianCalendar now=new GregorianCalendar();
!     int nowYear = now.get(Calendar.YEAR);
!     int nowMonth = now.get(Calendar.MONTH)+1 ; //be care for the month +-1
!     int nowDay = now.get(Calendar.DAY_OF_MONTH);
!     response.sendRedirect("./providercontrol.jsp?year="+nowYear+"&month="+(nowMonth)+"&day="+(nowDay)+"&view=0&displaymode=day&dboperation=searchappointmentday");
!     return;
!   }
! %>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
! <%@ include file="../admin/dbconnection.jsp" %>  
! 
! <% 
!   //operation available to the client - dboperation
!   String [][] dbOperation=new String[][] {
!     {"search_tickler","select * from tickler where demographic_no=? and service_date<=? and status='A' order by service_date desc"},
!     {"search_studycount","select count(ds.study_no) from demographicstudy ds, study s where ds.demographic_no=? and ds.study_no=s.study_no and s.current='1'"},
!     {"search_study","select s.* from demographicstudy d, study s where demographic_no=? and d.study_no = s.study_no limit 1 "},
!     {"searchappointmentday", "select appointment_no,provider_no, start_time,end_time,name,demographic_no,reason,notes,status from appointment where provider_no=? and appointment_date=? order by start_time, status desc "}, 
!     {"searchmygroupcount", "select count(provider_no) from mygroup where mygroup_no=? "}, 
!     {"searchmygroupprovider", "select provider_no, last_name, first_name from mygroup where mygroup_no=? "}, 
!     {"searchmygroupall", "select * from mygroup order by mygroup_no"}, 
!     // {"searchmygroupno", "select * from mygroup group by mygroup_no order by mygroup_no"}, 
!     {"searchmygroupno", "select mygroup_no from mygroup group by mygroup_no order by mygroup_no"}, 
!     {"deletegroupmember", "delete from mygroup where mygroup_no=? and provider_no=?"}, 
!     {"savemygroup", "insert into mygroup (mygroup_no,provider_no,last_name,first_name) values(?,?,?,?)" },
!     {"updateapptstatus", "update appointment set status=? where appointment_no=? "}, 
!     {"updatepreference", "update preference set start_hour=?, end_hour=?, every_min=?, mygroup_no=?, color_template=? where provider_no=? "},
!     {"add_preference", "insert into preference (provider_no, start_hour, end_hour, every_min, mygroup_no, color_template) values (?, ?, ?, ?, ?, ?)"},
!     {"search_demograph", "select *  from demographic where demographic_no=?"},
!     {"search_encounter", "select * from encounter where demographic_no = ? order by encounter_date desc, encounter_time desc"},
!     {"search_encounter_no", "select * from encounter where demographic_no = ? and encounter_date=? and encounter_time=? and provider_no=? order by encounter_no desc limit 1"},
!     {"search_encountersingle", "select * from encounter where encounter_no = ?"},
!     {"search_previousenc", "select * from encounter where demographic_no = ? and provider_no=? order by encounter_date desc, encounter_time desc limit 1"},
!     {"delete_encounter1", "insert into recyclebin (provider_no,updatedatetime,table_name,keyword,table_content) values(?,?,'encounter',?,?)"},
!     {"delete_encounter2", "delete from encounter where encounter_no = ?"},
!     {"search_encounterform", "select * from encounterform where encounterform_name like ? order by encounterform_name"},
!     {"search_form", "select * from form where form_no=? "}, //new?delete
!     {"search_form_no", "select form_no, content from form where demographic_no=? and form_name like ? order by form_date desc, form_time desc,form_no desc limit 1"}, //new?delete
!     {"compare_form", "select form_no, form_name, content from form where demographic_no=? and form_name like ? order by form_date desc, form_time desc,form_no desc limit 1"},
!     {"save_form", "insert into form (demographic_no, provider_no, form_date, form_time, form_name, content) values(?,?,?,?,?,?)"},
!     {"search_template", "select * from encountertemplate where encountertemplate_name like ? order by encountertemplate_name"},
!     //{"search_templatevalue", "select * from encountertemplate where encountertemplate_name like ?"},
!     {"add_encounter", "insert into encounter (demographic_no, encounter_date, encounter_time, provider_no, subject, content, encounterattachment) values(?,?,?,?,?,?,?)"},
!     {"save_prescribe", "insert into prescribe (demographic_no, provider_no, prescribe_date, prescribe_time, content) values(?,?,?,?,?)"},
!     {"search_prescribe", "select * from prescribe where prescribe_no= ?"},
!     {"search_prescribe_no", "select prescribe_no from prescribe where demographic_no=?  order by prescribe_date desc, prescribe_time desc limit 1"},
!     {"search_demographicaccessory", "select * from demographicaccessory where demographic_no=?"},
!     {"search_demographicaccessorycount", "select count(demographic_no) from demographicaccessory where demographic_no=?"},
!     {"add_demographicaccessory", "insert into demographicaccessory values(?,?)"},
!     {"update_demographicaccessory", "update demographicaccessory set content=? where demographic_no=?"},
!     {"add_template", "insert into encountertemplate values(?,?,?,?)"},
!     {"delete_template", "delete from encountertemplate where encountertemplate_name = ?"},
!     {"search_templatename", "select encountertemplate_name from encountertemplate order by encountertemplate_name"},
!     {"add_encounterform", "insert into encounterform values(?,?)"},
!     {"delete_encounterform", "delete from encounterform where encounterform_name = ?"},
!     {"search_encounterformname", "select encounterform_name from encounterform order by encounterform_name"},
!     {"search_provider_slp", "select comments from provider where provider_no=?"},
! 
!     {"searchprovider", "select provider_no, last_name, first_name from provider where provider_type='doctor' and status='1' order by last_name"}, 
!     //{"searchallprovider", "select * from provider order by ?"}, ^M
!     {"searchallprovider", "select * from provider where status='1' order by last_name"}, 
!     {"search_scheduleholiday", "select * from scheduleholiday where sdate > ?" }, 
!     {"search_scheduledate_datep", "select * from scheduledate where sdate between ? and ? order by sdate" }, 
!     {"search_scheduledate_singlep", "select * from scheduledate where sdate between ? and ? and provider_no=? order by sdate" }, 
!     {"search_scheduledate_single", "select * from scheduledate where sdate=? and provider_no=?" }, 
! 
!     {"search_appttimecode", "select scheduledate.provider_no, scheduletemplate.timecode, scheduledate.sdate from scheduletemplate, scheduledate where scheduletemplate.name=scheduledate.hour and scheduledate.sdate=? and  scheduledate.provider_no=? and (scheduletemplate.provider_no=scheduledate.provider_no or scheduletemplate.provider_no='Public') order by scheduledate.sdate"}, 
!     // {"search_timecode", "select * from scheduletemplatecode order by ?"}, 
!     {"search_timecode", "select * from scheduletemplatecode order by code"}, 
!     {"search_resource_baseurl", "select * from property where name = ?"}, 
! 
!     {"search_numgrpscheduledate", "select count(scheduledate.provider_no) from mygroup, scheduledate where mygroup_no = ? and scheduledate.sdate=? and mygroup.provider_no=scheduledate.provider_no and scheduledate.available = '1' "}, 
!   };
!   
!   //associate each operation with an output JSP file - displaymode
!   String[][] toFile=new String[][] {
!     {"day" , "appointmentprovideradminday.jsp"},
!     {"month" , "appointmentprovideradminmonth.jsp"},
!     {"addstatus" , "provideraddstatus.jsp"},
!     {"updatepreference" , "providerupdatepreference.jsp"},
!     {"displaymygroup" , "providerdisplaymygroup.jsp"},
!     {"encounter" , "providerencounter.jsp"},
!     {"prescribe" , "providerprescribe.jsp"},
!     {"encountersingle" , "providerencountersingle.jsp"},
!     {"vary" , request.getParameter("displaymodevariable")==null?"":URLDecoder.decode(request.getParameter("displaymodevariable")) },
!     {"saveform" , "providersaveform.jsp"},
!     {"saveencounter" , "providersaveencounter.jsp"},
!     {"savebill" , "providersavebill.jsp"},
!     {"saveprescribe" , "providersaveprescribe.jsp"},
!     {"savedemographicaccessory" , "providersavedemographicaccessory.jsp"},
!     {"encounterhistory" , "providerencounterhistory.jsp"},
!     {"savedeletetemplate" , "providertemplate.jsp"},
!     {"savetemplate" , "providersavetemplate.jsp"},
!     {"savedeleteform" , "providerform.jsp"},
!     {"save_encounterform" , "providersaveencounterform.jsp"},
!     {"ar1" , "formar1_99_12.jsp"},
!     {"ar2" , "formar2_99_08.jsp"},
!     {"newgroup" , "providernewgroup.jsp"},
!     {"savemygroup" , "providersavemygroup.jsp"},
! //    {"billingobstetric" , "billingobstetric.jsp"},
! 
!   };
!   apptMainBean.doConfigure(dbParams,dbOperation,toFile);
!   apptMainBean.doCommand(request); //store request to a help class object Dict - function&params
!   if(true) {
!     out.clear();
!     pageContext.forward(apptMainBean.whereTo()); //forward request&response to the target page
!     return;
!   }
! %>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider appointmentprovideradminday.jsp,1.38,1.39

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

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

Modified Files:
	appointmentprovideradminday.jsp 
Log Message:
SHows reason for visit and bday cake reminder

Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** appointmentprovideradminday.jsp	28 Dec 2004 18:25:12 -0000	1.38
--- appointmentprovideradminday.jsp	9 Feb 2005 09:28:55 -0000	1.39
***************
*** 11,14 ****
--- 11,23 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean" %>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
+ <%!
+ /**
+ Checks if the schedule day is patients birthday
+ **/
+ public boolean isBirthday(String schedDate,String demBday){
+ 	return schedDate.equals(demBday);
+ }
+ 
+ %>
  <%
      if(session.getValue("user") == null || !((String) session.getValue("userprofession")).equalsIgnoreCase("doctor"))
***************
*** 19,32 ****
  
  	String curUser_no = (String) session.getAttribute("user");
!     String mygroupno = (String) session.getAttribute("groupno");  
      String userfirstname = (String) session.getAttribute("userfirstname");
      String userlastname = (String) session.getAttribute("userlastname");
      String prov= ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase();
!     
  	boolean bShortcutForm = oscarVariables.getProperty("appt_formview", "").equalsIgnoreCase("on") ? true : false;
! 	String formName = bShortcutForm ? oscarVariables.getProperty("appt_formview_name") : ""; 
! 	String formNameShort = formName.length() > 3 ? (formName.substring(0,2)+".") : formName; 
!         String formName2 = bShortcutForm ? oscarVariables.getProperty("appt_formview_name2", "") : ""; 
! 	String formName2Short = formName2.length() > 3 ? (formName2.substring(0,2)+".") : formName2; 
          boolean bShortcutForm2 = bShortcutForm && !formName2.equals("");
  
--- 28,41 ----
  
  	String curUser_no = (String) session.getAttribute("user");
!     String mygroupno = (String) session.getAttribute("groupno");
      String userfirstname = (String) session.getAttribute("userfirstname");
      String userlastname = (String) session.getAttribute("userlastname");
      String prov= ((String ) oscarVariables.getProperty("billregion","")).trim().toUpperCase();
! 
  	boolean bShortcutForm = oscarVariables.getProperty("appt_formview", "").equalsIgnoreCase("on") ? true : false;
! 	String formName = bShortcutForm ? oscarVariables.getProperty("appt_formview_name") : "";
! 	String formNameShort = formName.length() > 3 ? (formName.substring(0,2)+".") : formName;
!         String formName2 = bShortcutForm ? oscarVariables.getProperty("appt_formview_name2", "") : "";
! 	String formName2Short = formName2.length() > 3 ? (formName2.substring(0,2)+".") : formName2;
          boolean bShortcutForm2 = bShortcutForm && !formName2.equals("");
  
***************
*** 45,49 ****
      ResultSet rsDemo = null;
      String tickler_no="", textColor="", tickler_note="";
!     String ver = "", roster="";   
      StringBuffer study_no=null, study_link=null,studyDescription=null;
  	String studySymbol = "#", studyColor = "red";
--- 54,62 ----
      ResultSet rsDemo = null;
      String tickler_no="", textColor="", tickler_note="";
!     String ver = "", roster="";
!     String yob = "";
!     String mob = "";
!     String dob = "";
!     String demBday = "";
      StringBuffer study_no=null, study_link=null,studyDescription=null;
  	String studySymbol = "#", studyColor = "red";
***************
*** 51,55 ****
      String resourcebaseurl = "http://67.69.12.117:8080/oscarResource/";
      ResultSet rsgroup1 = apptMainBean.queryResults("resource_baseurl", "search_resource_baseurl");
!     while (rsgroup1.next()) { 
   	    resourcebaseurl = rsgroup1.getString("value");
      }
--- 64,68 ----
      String resourcebaseurl = "http://67.69.12.117:8080/oscarResource/";
      ResultSet rsgroup1 = apptMainBean.queryResults("resource_baseurl", "search_resource_baseurl");
!     while (rsgroup1.next()) {
   	    resourcebaseurl = rsgroup1.getString("value");
      }
***************
*** 65,69 ****
      int day = Integer.parseInt(request.getParameter("day"));
  
!     //verify the input date is really existed 
      cal = new GregorianCalendar(year,(month-1),day);
      year = cal.get(Calendar.YEAR);
--- 78,82 ----
      int day = Integer.parseInt(request.getParameter("day"));
  
!     //verify the input date is really existed
      cal = new GregorianCalendar(year,(month-1),day);
      year = cal.get(Calendar.YEAR);
***************
*** 72,75 ****
--- 85,89 ----
  
      String strDate = year + "-" + month + "-" + day;
+     String monthDay = month + "-" + day;
      SimpleDateFormat inform = new SimpleDateFormat ("yyyy-MM-dd", request.getLocale());
      String formatDate;
***************
*** 85,111 ****
      String strDay=day>9?(""+day):("0"+day);
  %>
! <!--  
  /*
!  * 
   * 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 
   */
  -->
--- 99,125 ----
      String strDay=day>9?(""+day):("0"+day);
  %>
! <!--
  /*
!  *
   * 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
   */
  -->
***************
*** 122,126 ****
    //this.focus();
  }
! function popupPage(vheight,vwidth,varpage) { 
    var page = "" + varpage;
    windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=50,screenY=50,top=0,left=0";
--- 136,140 ----
    //this.focus();
  }
! function popupPage(vheight,vwidth,varpage) {
    var page = "" + varpage;
    windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=50,screenY=50,top=0,left=0";
***************
*** 128,132 ****
    if (popup != null) {
      if (popup.opener == null) {
!       popup.opener = self; 
      }
      popup.focus();
--- 142,146 ----
    if (popup != null) {
      if (popup.opener == null) {
!       popup.opener = self;
      }
      popup.focus();
***************
*** 146,150 ****
  
  <!--oscarMessenger code block-->
! function popupOscarRx(vheight,vwidth,varpage) { 
    var page = varpage;
    windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
--- 160,164 ----
  
  <!--oscarMessenger code block-->
! function popupOscarRx(vheight,vwidth,varpage) {
    var page = varpage;
    windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
***************
*** 170,178 ****
    document.location.reload();
  }
! function refresh1() {  
    var u = self.location.href;
    if(u.lastIndexOf("view=1") > 0) {
      self.location.href = u.substring(0,u.lastIndexOf("view=1")) + "view=0" + u.substring(eval(u.lastIndexOf("view=1")+6));
!   } else {    
      document.location.reload();
    }
--- 184,192 ----
    document.location.reload();
  }
! function refresh1() {
    var u = self.location.href;
    if(u.lastIndexOf("view=1") > 0) {
      self.location.href = u.substring(0,u.lastIndexOf("view=1")) + "view=0" + u.substring(eval(u.lastIndexOf("view=1")+6));
!   } else {
      document.location.reload();
    }
***************
*** 191,195 ****
  }
  function tsr(s) {
!   popupPage(360,780,('../appointment/appointmentcontrol.jsp?displaymode=edit&dboperation=search&'+s)); 
  }
  function goFilpView(s) {
--- 205,209 ----
  }
  function tsr(s) {
!   popupPage(360,780,('../appointment/appointmentcontrol.jsp?displaymode=edit&dboperation=search&'+s));
  }
  function goFilpView(s) {
***************
*** 211,222 ****
     if(providerBean.isEmpty()) {
       rsgroup = apptMainBean.queryResults("searchallprovider");
!  	   while (rsgroup.next()) { 
   	    providerBean.setProperty(rsgroup.getString("provider_no"), new String( rsgroup.getString("last_name")+","+rsgroup.getString("first_name") ));
   	   }
   	 }
!    
     if(view==0) { //multiple views
  	   rsgroup = apptMainBean.queryResults(mygroupno, "searchmygroupcount");
!  	   while (rsgroup.next()) { 
         numProvider=rsgroup.getInt(1);
       }
--- 225,236 ----
     if(providerBean.isEmpty()) {
       rsgroup = apptMainBean.queryResults("searchallprovider");
!  	   while (rsgroup.next()) {
   	    providerBean.setProperty(rsgroup.getString("provider_no"), new String( rsgroup.getString("last_name")+","+rsgroup.getString("first_name") ));
   	   }
   	 }
! 
     if(view==0) { //multiple views
  	   rsgroup = apptMainBean.queryResults(mygroupno, "searchmygroupcount");
!  	   while (rsgroup.next()) {
         numProvider=rsgroup.getInt(1);
       }
***************
*** 226,230 ****
         param3[1] = strDate; //strYear +"-"+ strMonth +"-"+ strDay ;
    	   rsgroup = apptMainBean.queryResults(param3, "search_numgrpscheduledate");
!  	     while (rsgroup.next()) { 
           numAvailProvider = rsgroup.getInt(1);
         }
--- 240,244 ----
         param3[1] = strDate; //strYear +"-"+ strMonth +"-"+ strDay ;
    	   rsgroup = apptMainBean.queryResults(param3, "search_numgrpscheduledate");
!  	     while (rsgroup.next()) {
           numAvailProvider = rsgroup.getInt(1);
         }
***************
*** 247,251 ****
  	   rsgroup = apptMainBean.queryResults(mygroupno, "searchmygroupprovider");
  	   int iTemp=0;
!      while (rsgroup.next()) { 
         curProvider_no[iTemp]=rsgroup.getString("provider_no");
         curProviderName[iTemp]=rsgroup.getString("first_name")+" "+rsgroup.getString("last_name");
--- 261,265 ----
  	   rsgroup = apptMainBean.queryResults(mygroupno, "searchmygroupprovider");
  	   int iTemp=0;
!      while (rsgroup.next()) {
         curProvider_no[iTemp]=rsgroup.getString("provider_no");
         curProviderName[iTemp]=rsgroup.getString("first_name")+" "+rsgroup.getString("last_name");
***************
*** 260,264 ****
       curProviderName[0]=request.getParameter("curProviderName");
     }
!    
     //set timecode bean
     String bgcolordef = "#486ebd" ;
--- 274,278 ----
       curProviderName[0]=request.getParameter("curProviderName");
     }
! 
     //set timecode bean
     String bgcolordef = "#486ebd" ;
***************
*** 268,292 ****
       param3[1] = curProvider_no[nProvider];
  	   rsgroup = apptMainBean.queryResults(param3, "search_appttimecode");
!      while (rsgroup.next()) { 
         dateTimeCodeBean.put(rsgroup.getString("provider_no"), rsgroup.getString("timecode"));
!      } 
     }
  	 rsgroup = apptMainBean.queryResults("search_timecode");
!    while (rsgroup.next()) { 
       dateTimeCodeBean.put("description"+rsgroup.getString("code"), rsgroup.getString("description"));
       dateTimeCodeBean.put("duration"+rsgroup.getString("code"), rsgroup.getString("duration"));
       dateTimeCodeBean.put("color"+rsgroup.getString("code"), (rsgroup.getString("color")==null || rsgroup.getString("color").equals(""))?bgcolordef:rsgroup.getString("color") );
!    } 
!    
!    java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY);   
  %>
  <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
  <tr>
!   <td VALIGN="BOTTOM" HEIGHT="20"> 
  
      <table BORDER="0" CELLPADDING="0" CELLSPACING="0" height="20">
        <tr>
          <td></td><td rowspan="2" BGCOLOR="ivory" ALIGN="MIDDLE" nowrap height="20"><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
!          <a href="providercontrol.jsp?year=<%=curYear%>&month=<%=curMonth%>&day=<%=curDay%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewDaySched"/>' OnMouseOver="window.status='<bean:message key="provider.appointmentProviderAdminDay.viewDaySched"/>' ; return true"> 
           &nbsp;&nbsp;<bean:message key="global.day"/>&nbsp;&nbsp; </a></font></td>
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
--- 282,306 ----
       param3[1] = curProvider_no[nProvider];
  	   rsgroup = apptMainBean.queryResults(param3, "search_appttimecode");
!      while (rsgroup.next()) {
         dateTimeCodeBean.put(rsgroup.getString("provider_no"), rsgroup.getString("timecode"));
!      }
     }
  	 rsgroup = apptMainBean.queryResults("search_timecode");
!    while (rsgroup.next()) {
       dateTimeCodeBean.put("description"+rsgroup.getString("code"), rsgroup.getString("description"));
       dateTimeCodeBean.put("duration"+rsgroup.getString("code"), rsgroup.getString("duration"));
       dateTimeCodeBean.put("color"+rsgroup.getString("code"), (rsgroup.getString("color")==null || rsgroup.getString("color").equals(""))?bgcolordef:rsgroup.getString("color") );
!    }
! 
!    java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY);
  %>
  <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
  <tr>
!   <td VALIGN="BOTTOM" HEIGHT="20">
  
      <table BORDER="0" CELLPADDING="0" CELLSPACING="0" height="20">
        <tr>
          <td></td><td rowspan="2" BGCOLOR="ivory" ALIGN="MIDDLE" nowrap height="20"><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
!          <a href="providercontrol.jsp?year=<%=curYear%>&month=<%=curMonth%>&day=<%=curDay%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewDaySched"/>' OnMouseOver="window.status='<bean:message key="provider.appointmentProviderAdminDay.viewDaySched"/>' ; return true">
           &nbsp;&nbsp;<bean:message key="global.day"/>&nbsp;&nbsp; </a></font></td>
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
***************
*** 300,308 ****
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
  
!              <% 
!                 //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY);
!                 if (vLocale.getCountry().equals("BR")) { %>  
                 <a HREF="#" ONCLICK ="popupPage2('../oscar/billing/consultaFaturamentoMedico/init.do');return false;" TITLE='<bean:message key="global.genBillReport"/>' onmouseover="window.status='<bean:message key="global.genBillReport"/>';return true"><bean:message key="global.billing"/></a></font></td>
!              <% } else {%>  
  				<a HREF="#" ONCLICK ="popupPage2('../billing/CA/<%=prov%>/billingReportCenter.jsp?displaymode=billreport&providerview=<%=curUser_no%>');return false;" TITLE='<bean:message key="global.genBillReport"/>' onmouseover="window.status='<bean:message key="global.genBillReport"/>';return true"><bean:message key="global.billing"/></a></font></td>
               <% } %>
--- 314,322 ----
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
  
!              <%
!                 //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY);
!                 if (vLocale.getCountry().equals("BR")) { %>
                 <a HREF="#" ONCLICK ="popupPage2('../oscar/billing/consultaFaturamentoMedico/init.do');return false;" TITLE='<bean:message key="global.genBillReport"/>' onmouseover="window.status='<bean:message key="global.genBillReport"/>';return true"><bean:message key="global.billing"/></a></font></td>
!              <% } else {%>
  				<a HREF="#" ONCLICK ="popupPage2('../billing/CA/<%=prov%>/billingReportCenter.jsp?displaymode=billreport&providerview=<%=curUser_no%>');return false;" TITLE='<bean:message key="global.genBillReport"/>' onmouseover="window.status='<bean:message key="global.genBillReport"/>';return true"><bean:message key="global.billing"/></a></font></td>
               <% } %>
***************
*** 311,317 ****
           <!--MARK-->
           <% if (prov.equals("BC")){%>
!          <a HREF="#" ONCLICK ="popupPage2('../lab/CA/BC/index.jsp');return false;" TITLE='View lab reports'><%=(new oscar.oscarLab.ca.bc.PathNet.PathNetInfo()).getLabTab(curUser_no)%></a>   
           <%}else{%>
!          <a HREF="#" ONCLICK ="popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewLabReports"/>'><bean:message key="global.lab"/></a>         
           <%}%>
  <!-- oscarMessenger code block -->
--- 325,331 ----
           <!--MARK-->
           <% if (prov.equals("BC")){%>
!          <a HREF="#" ONCLICK ="popupPage2('../lab/CA/BC/index.jsp');return false;" TITLE='View lab reports'><%=(new oscar.oscarLab.ca.bc.PathNet.PathNetInfo()).getLabTab(curUser_no)%></a>
           <%}else{%>
!          <a HREF="#" ONCLICK ="popupPage2('../oscarMDS/Index.jsp?providerNo=<%=curUser_no%>', '<bean:message key="global.lab"/>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewLabReports"/>'><bean:message key="global.lab"/></a>
           <%}%>
  <!-- oscarMessenger code block -->
***************
*** 329,333 ****
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
           <a href=# onClick ="popupPage(200,680,'providerpreference.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&mygroup_no=<%=mygroupno%>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.msgSettings"/>' OnMouseOver="window.status='<bean:message key="provider.appointmentProviderAdminDay.msgSettings"/>' ; return true"><bean:message key="global.pref"/></a></font></td>
!        
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
           <a HREF="#" ONCLICK ="popupPage2('../dms/documentReport.jsp?function=provider&functionid=<%=curUser_no%>&curUser=<%=curUser_no%>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewEdoc"/>'><bean:message key="global.edoc"/></a></font></td>
--- 343,347 ----
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
           <a href=# onClick ="popupPage(200,680,'providerpreference.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&mygroup_no=<%=mygroupno%>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.msgSettings"/>' OnMouseOver="window.status='<bean:message key="provider.appointmentProviderAdminDay.msgSettings"/>' ; return true"><bean:message key="global.pref"/></a></font></td>
! 
          <td></td><td rowspan="2" BGCOLOR="#C0C0C0" ALIGN="MIDDLE" nowrap><font FACE="VERDANA,ARIAL,HELVETICA" SIZE="2">
           <a HREF="#" ONCLICK ="popupPage2('../dms/documentReport.jsp?function=provider&functionid=<%=curUser_no%>&curUser=<%=curUser_no%>');return false;" TITLE='<bean:message key="provider.appointmentProviderAdminDay.viewEdoc"/>'><bean:message key="global.edoc"/></a></font></td>
***************
*** 336,340 ****
  
  <td></td>
!       </tr><tr> 
          <td valign="bottom"><img src="../images/tabs_l_active_end_alone.gif" width="14" height="20" border="0"></td>
          <td valign="bottom"><img src="../images/tabs_r_active_end.gif" width="15" height="20" border="0"></td>
--- 350,354 ----
  
  <td></td>
!       </tr><tr>
          <td valign="bottom"><img src="../images/tabs_l_active_end_alone.gif" width="14" height="20" border="0"></td>
          <td valign="bottom"><img src="../images/tabs_r_active_end.gif" width="15" height="20" border="0"></td>
***************
*** 353,357 ****
          <td valign="bottom"><img src="../images/tabs_both_inactive.gif" width="15" height="20" border="0"></td>
          <td valign="bottom"><img src="../images/tabs_both_inactive.gif" width="15" height="20" border="0"></td>
!         
          <td valign="bottom"><img src="../images/tabs_r_inactive_end.gif" width="17" height="20" border="0"></td>
        </tr>
--- 367,371 ----
          <td valign="bottom"><img src="../images/tabs_both_inactive.gif" width="15" height="20" border="0"></td>
          <td valign="bottom"><img src="../images/tabs_both_inactive.gif" width="15" height="20" border="0"></td>
! 
          <td valign="bottom"><img src="../images/tabs_r_inactive_end.gif" width="17" height="20" border="0"></td>
        </tr>
***************
*** 360,364 ****
    </td>
    <td align="right" valign="bottom">
!   <a href=# onClick ="popupPage(600,750,'<%=resourcebaseurl+"Support"%>')"><bean:message key="global.help"/></a>  
    &nbsp;&nbsp;
    </td>
--- 374,378 ----
    </td>
    <td align="right" valign="bottom">
!   <a href=# onClick ="popupPage(600,750,'<%=resourcebaseurl+"Support"%>')"><bean:message key="global.help"/></a>
    &nbsp;&nbsp;
    </td>
***************
*** 372,376 ****
          <td BGCOLOR="ivory" width="33%">
           <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
!          &nbsp;&nbsp;<img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> 
           <b><span CLASS=title><%=formatDate%></span></b>
           <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
--- 386,390 ----
          <td BGCOLOR="ivory" width="33%">
           <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
!          &nbsp;&nbsp;<img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a>
           <b><span CLASS=title><%=formatDate%></span></b>
           <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
***************
*** 383,387 ****
  	<B><bean:message key="global.hello"/>
  	<% out.println( userfirstname+" "+userlastname); %>
! 	</b></TD> 
  	<% } %>
          <td ALIGN="RIGHT" BGCOLOR="Ivory">
--- 397,401 ----
  	<B><bean:message key="global.hello"/>
  	<% out.println( userfirstname+" "+userlastname); %>
! 	</b></TD>
  	<% } %>
          <td ALIGN="RIGHT" BGCOLOR="Ivory">
***************
*** 391,395 ****
  <%
     rsgroup = apptMainBean.queryResults( "searchmygroupno");
!  	 while (rsgroup.next()) { 
  %>
    <option value="<%=rsgroup.getString("mygroup_no")%>" <%=mygroupno.equals(rsgroup.getString("mygroup_no"))?"selected":""%> ><%=rsgroup.getString("mygroup_no")%></option>
--- 405,409 ----
  <%
     rsgroup = apptMainBean.queryResults( "searchmygroupno");
!  	 while (rsgroup.next()) {
  %>
    <option value="<%=rsgroup.getString("mygroup_no")%>" <%=mygroupno.equals(rsgroup.getString("mygroup_no"))?"selected":""%> ><%=rsgroup.getString("mygroup_no")%></option>
***************
*** 398,405 ****
  %>
  </select>
! <% if(request.getParameter("viewall")!=null && request.getParameter("viewall").equals("1") ) { %>        
!          <a href=# onClick = "review('0')" title="<bean:message key="provider.appointmentProviderAdminDay.viewProvAval"/>"><bean:message key="provider.appointmentProviderAdminDay.schedView"/></a> &nbsp;|&nbsp; 
! <% } else {  %>         
!          <a href=# onClick = "review('1')" title="<bean:message key="provider.appointmentProviderAdminDay.viewAllProv"/>"><bean:message key="provider.appointmentProviderAdminDay.viewAll"/></a> &nbsp;|&nbsp; 
  <% } %>
           <a href="../logout.jsp"><bean:message key="global.btnLogout"/> <img src="../images/next.gif"  border="0" width="10" height="9" align="absmiddle"> &nbsp;</a> </td>
--- 412,419 ----
  %>
  </select>
! <% if(request.getParameter("viewall")!=null && request.getParameter("viewall").equals("1") ) { %>
!          <a href=# onClick = "review('0')" title="<bean:message key="provider.appointmentProviderAdminDay.viewProvAval"/>"><bean:message key="provider.appointmentProviderAdminDay.schedView"/></a> &nbsp;|&nbsp;
! <% } else {  %>
!          <a href=# onClick = "review('1')" title="<bean:message key="provider.appointmentProviderAdminDay.viewAllProv"/>"><bean:message key="provider.appointmentProviderAdminDay.viewAll"/></a> &nbsp;|&nbsp;
  <% } %>
           <a href="../logout.jsp"><bean:message key="global.btnLogout"/> <img src="../images/next.gif"  border="0" width="10" height="9" align="absmiddle"> &nbsp;</a> </td>
***************
*** 412,416 ****
            int hourCursor=0, minuteCursor=0, depth=everyMin; //depth is the period, e.g. 10,15,30,60min.
            String am_pm=null;
!           boolean bColor=true, bColorHour=true; //to change color 
  
     int iCols=0, iRows=0, iS=0,iE=0,iSm=0,iEm=0; //for each S/E starting/Ending hour, how many events
--- 426,430 ----
            int hourCursor=0, minuteCursor=0, depth=everyMin; //depth is the period, e.g. 10,15,30,60min.
            String am_pm=null;
!           boolean bColor=true, bColorHour=true; //to change color
  
     int iCols=0, iRows=0, iS=0,iE=0,iSm=0,iEm=0; //for each S/E starting/Ending hour, how many events
***************
*** 423,427 ****
     ResultSet rs = null;
  
!    boolean userAvail = true; 
     int me = -1;
     for(int nProvider=0;nProvider<numProvider;nProvider++) {
--- 437,441 ----
     ResultSet rs = null;
  
!    boolean userAvail = true;
     int me = -1;
     for(int nProvider=0;nProvider<numProvider;nProvider++) {
***************
*** 436,445 ****
     for(int nProvider=0;nProvider<numProvider;nProvider++) {
  //     bColor=bColor?false:true;
!      userAvail = true; 
       param1[0] = strDate; //strYear+"-"+strMonth+"-"+strDay;
       param1[1] = curProvider_no[nProvider];
       rsgroup = apptMainBean.queryResults(param1,"search_scheduledate_single");
!      
!      //viewall function 
       if(request.getParameter("viewall")==null || request.getParameter("viewall").equals("0") ) {
         if(!rsgroup.next() || rsgroup.getString("available").equals("0")) {
--- 450,459 ----
     for(int nProvider=0;nProvider<numProvider;nProvider++) {
  //     bColor=bColor?false:true;
!      userAvail = true;
       param1[0] = strDate; //strYear+"-"+strMonth+"-"+strDay;
       param1[1] = curProvider_no[nProvider];
       rsgroup = apptMainBean.queryResults(param1,"search_scheduledate_single");
! 
!      //viewall function
       if(request.getParameter("viewall")==null || request.getParameter("viewall").equals("0") ) {
         if(!rsgroup.next() || rsgroup.getString("available").equals("0")) {
***************
*** 451,455 ****
   %>
              <td valign="top" width="<%=1*100/numProvider%>%"> <!-- for the first provider's schedule -->
!          
          <table border="0" cellpadding="0" bgcolor="#486ebd" cellspacing="0" width="100%"><!-- for the first provider's name -->
            <tr><td NOWRAP ALIGN="center" BGCOLOR="<%=bColor?"#bfefff":"silver"%>">
--- 465,469 ----
   %>
              <td valign="top" width="<%=1*100/numProvider%>%"> <!-- for the first provider's schedule -->
! 
          <table border="0" cellpadding="0" bgcolor="#486ebd" cellspacing="0" width="100%"><!-- for the first provider's name -->
            <tr><td NOWRAP ALIGN="center" BGCOLOR="<%=bColor?"#bfefff":"silver"%>">
***************
*** 463,468 ****
  </td></tr>
            <tr><td valign="top">
!         
!         <!-- table for hours of day start --> 
          <table border="1" cellpadding="0" bgcolor="<%=userAvail?"#486ebd":"silver"%>" cellspacing="0" width="100%">
  				<%
--- 477,482 ----
  </td></tr>
            <tr><td valign="top">
! 
!         <!-- table for hours of day start -->
          <table border="1" cellpadding="0" bgcolor="<%=userAvail?"#486ebd":"silver"%>" cellspacing="0" width="100%">
  				<%
***************
*** 477,483 ****
              minuteCursor = ih%60;
              bColorHour=minuteCursor==0?true:false; //every 00 minute, change color
!       
!             //templatecode     
!             if(dateTimeCodeBean.get(curProvider_no[nProvider]) != null) {       
  	            int nLen = 24*60 / ((String) dateTimeCodeBean.get(curProvider_no[nProvider]) ).length();
  	            int ratio = (hourCursor*60+minuteCursor)/nLen;
--- 491,497 ----
              minuteCursor = ih%60;
              bColorHour=minuteCursor==0?true:false; //every 00 minute, change color
! 
!             //templatecode
!             if(dateTimeCodeBean.get(curProvider_no[nProvider]) != null) {
  	            int nLen = 24*60 / ((String) dateTimeCodeBean.get(curProvider_no[nProvider]) ).length();
  	            int ratio = (hourCursor*60+minuteCursor)/nLen;
***************
*** 486,491 ****
          %>
            <tr>
!             <td align="RIGHT" bgcolor="<%=bColorHour?"#3EA4E1":"#00A488"%>" width="5%" NOWRAP><b><font face="verdana,arial,helvetica" size="2"> 
!              <a href=# onClick ="popupPage(400,780,'../appointment/addappointment.jsp?provider_no=<%=curProvider_no[nProvider]%>&bFirstDisp=<%=true%>&year=<%=strYear%>&month=<%=strMonth%>&day=<%=strDay%>&start_time=<%=(hourCursor>9?(""+hourCursor):("0"+hourCursor))+":"+ (minuteCursor<10?"0":"") +minuteCursor %>&end_time=<%=(hourCursor>9?(""+hourCursor):("0"+hourCursor))+":"+(minuteCursor+depth-1)%>&duration=<%=dateTimeCodeBean.get("duration"+hourmin.toString())%>');return false;" 
               title='<%=MyDateFormat.getTimeXX_XXampm(hourCursor +":"+ (minuteCursor<10?"0":"")+minuteCursor)%> - <%=MyDateFormat.getTimeXX_XXampm(hourCursor +":"+((minuteCursor+depth-1)<10?"0":"")+(minuteCursor+depth-1))%>' class="adhour">
               <%=(hourCursor<10?"0":"") +hourCursor+ ":"%><%=(minuteCursor<10?"0":"")+minuteCursor%>&nbsp;</a></font></b></td>
--- 500,505 ----
          %>
            <tr>
!             <td align="RIGHT" bgcolor="<%=bColorHour?"#3EA4E1":"#00A488"%>" width="5%" NOWRAP><b><font face="verdana,arial,helvetica" size="2">
!              <a href=# onClick ="popupPage(400,780,'../appointment/addappointment.jsp?provider_no=<%=curProvider_no[nProvider]%>&bFirstDisp=<%=true%>&year=<%=strYear%>&month=<%=strMonth%>&day=<%=strDay%>&start_time=<%=(hourCursor>9?(""+hourCursor):("0"+hourCursor))+":"+ (minuteCursor<10?"0":"") +minuteCursor %>&end_time=<%=(hourCursor>9?(""+hourCursor):("0"+hourCursor))+":"+(minuteCursor+depth-1)%>&duration=<%=dateTimeCodeBean.get("duration"+hourmin.toString())%>');return false;"
               title='<%=MyDateFormat.getTimeXX_XXampm(hourCursor +":"+ (minuteCursor<10?"0":"")+minuteCursor)%> - <%=MyDateFormat.getTimeXX_XXampm(hourCursor +":"+((minuteCursor+depth-1)<10?"0":"")+(minuteCursor+depth-1))%>' class="adhour">
               <%=(hourCursor<10?"0":"") +hourCursor+ ":"%><%=(minuteCursor<10?"0":"")+minuteCursor%>&nbsp;</a></font></b></td>
***************
*** 495,499 ****
            	while (bFirstTimeRs?rs.next():true) { //if it's not the first time to parse the standard time, should pass it by
            	  len = bFirstTimeRs&&!bFirstFirstR?lenLimitedS:lenLimitedL;
!           	  
            	  iS=Integer.parseInt(rs.getString("start_time").substring(0,2));
          	    iSm=Integer.parseInt(rs.getString("start_time").substring(3,5));
--- 509,513 ----
            	while (bFirstTimeRs?rs.next():true) { //if it's not the first time to parse the standard time, should pass it by
            	  len = bFirstTimeRs&&!bFirstFirstR?lenLimitedS:lenLimitedL;
! 
            	  iS=Integer.parseInt(rs.getString("start_time").substring(0,2));
          	    iSm=Integer.parseInt(rs.getString("start_time").substring(3,5));
***************
*** 512,518 ****
           	    iRows=((iE*60+iEm)-ih)/depth+1; //to see if the period across an hour period
           	    //iRows=(iE-iS)*60/depth+iEm/depth-iSm/depth+1; //to see if the period across an hour period
!          	    
           	    //get time format: 00:00am/pm
!          	    //String startTime = (iS>12?("0"+(iS-12)):rs.getString("start_time").substring(0,2))+":"+rs.getString("start_time").substring(3,5)+am_pm ; 
           	    //String endTime   = (iE>12?("0"+(iE-12)):rs.getString("end_time").substring(0,2))  +":"+rs.getString("end_time").substring(3,5)+(iE<12?"am":"pm");
            	  String name = UtilMisc.toUpperLowerCase(rs.getString("name"));
--- 526,532 ----
           	    iRows=((iE*60+iEm)-ih)/depth+1; //to see if the period across an hour period
           	    //iRows=(iE-iS)*60/depth+iEm/depth-iSm/depth+1; //to see if the period across an hour period
! 
           	    //get time format: 00:00am/pm
!          	    //String startTime = (iS>12?("0"+(iS-12)):rs.getString("start_time").substring(0,2))+":"+rs.getString("start_time").substring(3,5)+am_pm ;
           	    //String endTime   = (iE>12?("0"+(iE-12)):rs.getString("end_time").substring(0,2))  +":"+rs.getString("end_time").substring(3,5)+(iE<12?"am":"pm");
            	  String name = UtilMisc.toUpperLowerCase(rs.getString("name"));
***************
*** 528,540 ****
                        tickler_note = rsTickler.getString("message")==null?tickler_note:tickler_note + "\n" + rsTickler.getString("message");
                    }
!           	  
                    rsDemo = null;
                    ver = "";
!                   roster = "";                  
                    rsDemo = apptMainBean.queryResults(demographic_no, "search_demograph");
                    if(rsDemo.next()){
                      ver = rsDemo.getString("ver");
!                     roster = rsDemo.getString("roster_status");                    
!                     
                      if (roster == null || !roster.equalsIgnoreCase("FS")) {
                          roster = "";
--- 542,559 ----
                        tickler_note = rsTickler.getString("message")==null?tickler_note:tickler_note + "\n" + rsTickler.getString("message");
                    }
! 
                    rsDemo = null;
                    ver = "";
!                   roster = "";
                    rsDemo = apptMainBean.queryResults(demographic_no, "search_demograph");
                    if(rsDemo.next()){
                      ver = rsDemo.getString("ver");
!                     roster = rsDemo.getString("roster_status");
!                     int intMob = rsDemo.getInt("month_of_birth");
!                     int intDob = rsDemo.getInt("date_of_birth");
! 		    mob = String.valueOf(intMob);
!                     dob = String.valueOf(intDob);
!                     demBday = mob + "-" + dob;
! 
                      if (roster == null || !roster.equalsIgnoreCase("FS")) {
                          roster = "";
***************
*** 560,565 ****
                        study_link = new StringBuffer("formstudy.jsp");
  				      studyDescription = new StringBuffer("Form Studies");
! 				  } 
!             
            	  String reason = rs.getString("reason");
            	  String notes = rs.getString("notes");
--- 579,584 ----
                        study_link = new StringBuffer("formstudy.jsp");
  				      studyDescription = new StringBuffer("Form Studies");
! 				  }
! 
            	  String reason = rs.getString("reason");
            	  String notes = rs.getString("notes");
***************
*** 567,573 ****
            	  bFirstTimeRs=true;
  			    as.setApptStatus(status);
!         %>	    
              <td bgcolor='<%=as.getBgColor()%>' rowspan="<%=iRows%>" <%-- =view==0?(len==lenLimitedL?"nowrap":""):"nowrap"--%> nowrap>
!             
              <%
  			    if (as.getNextStatus() != null && !as.getNextStatus().equals("")) {
--- 586,592 ----
            	  bFirstTimeRs=true;
  			    as.setApptStatus(status);
!         %>
              <td bgcolor='<%=as.getBgColor()%>' rowspan="<%=iRows%>" <%-- =view==0?(len==lenLimitedL?"nowrap":""):"nowrap"--%> nowrap>
! 
              <%
  			    if (as.getNextStatus() != null && !as.getNextStatus().equals("")) {
***************
*** 575,579 ****
              <a href="providercontrol.jsp?appointment_no=<%=rs.getString("appointment_no")%>&provider_no=<%=curProvider_no[nProvider]%>&status=&statusch=<%=as.getNextStatus()%>&year=<%=year%>&month=<%=month%>&day=<%=day%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=addstatus&dboperation=updateapptstatus&viewall=<%=request.getParameter("viewall")==null?"0":(request.getParameter("viewall"))%>"; title="<bean:message key='<%=as.getTitle()%>' />" >
              <%
! 				} 
  			    if (as.getNextStatus() != null) {
              %>
--- 594,598 ----
              <a href="providercontrol.jsp?appointment_no=<%=rs.getString("appointment_no")%>&provider_no=<%=curProvider_no[nProvider]%>&status=&statusch=<%=as.getNextStatus()%>&year=<%=year%>&month=<%=month%>&day=<%=day%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=addstatus&dboperation=updateapptstatus&viewall=<%=request.getParameter("viewall")==null?"0":(request.getParameter("viewall"))%>"; title="<bean:message key='<%=as.getTitle()%>' />" >
              <%
! 				}
  			    if (as.getNextStatus() != null) {
              %>
***************
*** 611,644 ****
  <!--<a href=# onClick="popupPage(700,980,'../oscarSurveillance/CheckSurveillance.do?demographicNo=<%=demographic_no%>&proceed=<%=URLEncoder.encode(eURL)%>');return false;" title="<bean:message key="global.encounter"/>">
              |e</a>-->
!             
              <%= bShortcutForm?"<a href=# onClick='popupPage2( \"../form/forwardshortcutname.jsp?formname="+formName+"&demographic_no="+demographic_no+"\")' title='form'>|"+formNameShort+"</a>" : ""%>
              <%= bShortcutForm2?"<a href=# onClick='popupPage2( \"../form/forwardshortcutname.jsp?formname="+formName2+"&demographic_no="+demographic_no+"\")' title='form'>|"+formName2Short+"</a>" : ""%>
!              <% if(status.indexOf('B')==-1) {             
!                 //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.Globals.LOCALE_KEY);
!                 if (vLocale.getCountry().equals("BR")) { %>  
                 <a href=# onClick='popupPage(700,1000, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=rs.getString("appointment_no")%>");return false;' title="Faturamento">|FAT|</a>
!              <% } else {%>  
  	       <!--<a href=# onClick='popupPage(700,1000, "../billing/billingOB.jsp?billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=rs.getString("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billing"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>-->
             <!--    <a href=# onClick='popupPage(700,1000, "../billing.do?billRegion=<%=URLEncoder.encode(oscarVariables.getProperty("billregion"))%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=rs.getString("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billing"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>-->
                 <a href=# onClick='popupPage(700,1000, "../billing.do?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=rs.getString("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billing"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>
!                  
!              <% } %>  
! <% } else {%>  
      <a href=# onClick='onUnbilled("../billing/CA/<%=prov%>/billingDeleteWithoutNo.jsp?status=<%=status%>&appointment_no=<%=rs.getString("appointment_no")%>");return false;' title="<bean:message key="global.billing"/>">|-<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>
! <% } %>          
      <% if (vLocale.getCountry().equals("BR")) {%>
!     <a href=# onClick="popupPage2('../demographic/demographiccontrol.jsp?demographic_no=<%=demographic_no%>&displaymode=edit&dboperation=search_detail_ptbr');return false;" 
      title="<bean:message key="provider.appointmentProviderAdminDay.msgMasterFile"/>"><bean:message key="provider.appointmentProviderAdminDay.btnM"/></a>
      <%}else{%>
!     <a href=# onClick="popupPage2('../demographic/demographiccontrol.jsp?demographic_no=<%=demographic_no%>&displaymode=edit&dboperation=search_detail');return false;" 
      title="<bean:message key="provider.appointmentProviderAdminDay.msgMasterFile"/>"><bean:message key="provider.appointmentProviderAdminDay.btnM"/></a>
      <%}%>
  
        <% if (!vLocale.getCountry().equals("BR")) { %>
!       <a href=# onClick="popupOscarRx(700,960,'../oscarRx/choosePatient.do?providerNo=<%=curUser_no%>&demographicNo=<%=demographic_no%>')">|<bean:message key="global.rx"/></a>      
        <% } %>
  <% } %>
          		</font></td>
!         <% 
          			}
          			bFirstFirstR = false;
--- 630,669 ----
  <!--<a href=# onClick="popupPage(700,980,'../oscarSurveillance/CheckSurveillance.do?demographicNo=<%=demographic_no%>&proceed=<%=URLEncoder.encode(eURL)%>');return false;" title="<bean:message key="global.encounter"/>">
              |e</a>-->
! 
              <%= bShortcutForm?"<a href=# onClick='popupPage2( \"../form/forwardshortcutname.jsp?formname="+formName+"&demographic_no="+demographic_no+"\")' title='form'>|"+formNameShort+"</a>" : ""%>
              <%= bShortcutForm2?"<a href=# onClick='popupPage2( \"../form/forwardshortcutname.jsp?formname="+formName2+"&demographic_no="+demographic_no+"\")' title='form'>|"+formName2Short+"</a>" : ""%>
!              <% if(status.indexOf('B')==-1) {
!                 //java.util.Locale vLocale =(java.util.Locale)session.getAttribute(org.apache.struts.action.Action.LOCALE_KEY);
!                 if (vLocale.getCountry().equals("BR")) { %>
                 <a href=# onClick='popupPage(700,1000, "../oscar/billing/procedimentoRealizado/init.do?appId=<%=rs.getString("appointment_no")%>");return false;' title="Faturamento">|FAT|</a>
!              <% } else {%>
  	       <!--<a href=# onClick='popupPage(700,1000, "../billing/billingOB.jsp?billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=rs.getString("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billing"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>-->
             <!--    <a href=# onClick='popupPage(700,1000, "../billing.do?billRegion=<%=URLEncoder.encode(oscarVariables.getProperty("billregion"))%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=rs.getString("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billing"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>-->
                 <a href=# onClick='popupPage(700,1000, "../billing.do?billRegion=<%=URLEncoder.encode(prov)%>&billForm=<%=URLEncoder.encode(oscarVariables.getProperty("default_view"))%>&hotclick=<%=URLEncoder.encode("")%>&appointment_no=<%=rs.getString("appointment_no")%>&demographic_name=<%=URLEncoder.encode(name)%>&status=<%=status%>&demographic_no=<%=demographic_no%>&providerview=<%=curProvider_no[nProvider]%>&user_no=<%=curUser_no%>&apptProvider_no=<%=curProvider_no[nProvider]%>&appointment_date=<%=year+"-"+month+"-"+day%>&start_time=<%=iS+":"+iSm%>&bNewForm=1");return false;' title="<bean:message key="global.billing"/>">|<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>
! 
!              <% } %>
! <% } else {%>
      <a href=# onClick='onUnbilled("../billing/CA/<%=prov%>/billingDeleteWithoutNo.jsp?status=<%=status%>&appointment_no=<%=rs.getString("appointment_no")%>");return false;' title="<bean:message key="global.billing"/>">|-<bean:message key="provider.appointmentProviderAdminDay.btnB"/>|</a>
! <% } %>
      <% if (vLocale.getCountry().equals("BR")) {%>
!     <a href=# onClick="popupPage2('../demographic/demographiccontrol.jsp?demographic_no=<%=demographic_no%>&displaymode=edit&dboperation=search_detail_ptbr');return false;"
      title="<bean:message key="provider.appointmentProviderAdminDay.msgMasterFile"/>"><bean:message key="provider.appointmentProviderAdminDay.btnM"/></a>
      <%}else{%>
!     <a href=# onClick="popupPage2('../demographic/demographiccontrol.jsp?demographic_no=<%=demographic_no%>&displaymode=edit&dboperation=search_detail');return false;"
      title="<bean:message key="provider.appointmentProviderAdminDay.msgMasterFile"/>"><bean:message key="provider.appointmentProviderAdminDay.btnM"/></a>
      <%}%>
  
        <% if (!vLocale.getCountry().equals("BR")) { %>
!       <a href=# onClick="popupOscarRx(700,960,'../oscarRx/choosePatient.do?providerNo=<%=curUser_no%>&demographicNo=<%=demographic_no%>')">|<bean:message key="global.rx"/></a>| <b><%=reason%></b>
!       <%
!      //out.print(monthDay + " " + demBday);
!       if(isBirthday(monthDay,demBday)){%>
!       	| <img src="../images/cake.gif" height="20"/>
! 
!       <%}%>
        <% } %>
  <% } %>
          		</font></td>
!         <%
          			}
          			bFirstFirstR = false;
***************
*** 648,654 ****
            }
      			//apptMainBean.closePstmtConn();
! 				%>        
  
!           </table> <!-- end table for each provider schedule display --> 
  
           </td></tr>
--- 673,679 ----
            }
      			//apptMainBean.closePstmtConn();
! 				%>
  
!           </table> <!-- end table for each provider schedule display -->
  
           </td></tr>
***************
*** 656,660 ****
            <b><input type='radio' name='flipview' onClick="goFilpView('<%=curProvider_no[nProvider]%>')" title="<bean:message key="provider.appointmentProviderAdminDay.flipView"/>"  >
            <a href=# onClick="goZoomView('<%=curProvider_no[nProvider]%>','<%=curProviderName[nProvider]%>')" onDblClick="goFilpView('<%=curProvider_no[nProvider]%>')" title="<bean:message key="provider.appointmentProviderAdminDay.zoomView"/>" >
!           <!--a href="providercontrol.jsp?year=<%=strYear%>&month=<%=strMonth%>&day=<%=strDay%>&view=1&curProvider=<%=curProvider_no[nProvider]%>&curProviderName=<%=curProviderName[nProvider]%>&displaymode=day&dboperation=searchappointmentday" title="zoom view"-->
            <%=curProviderName[nProvider]%></a></b>
            <% if(!userAvail) { %>
--- 681,685 ----
            <b><input type='radio' name='flipview' onClick="goFilpView('<%=curProvider_no[nProvider]%>')" title="<bean:message key="provider.appointmentProviderAdminDay.flipView"/>"  >
            <a href=# onClick="goZoomView('<%=curProvider_no[nProvider]%>','<%=curProviderName[nProvider]%>')" onDblClick="goFilpView('<%=curProvider_no[nProvider]%>')" title="<bean:message key="provider.appointmentProviderAdminDay.zoomView"/>" >
!           <!--a href="providercontrol.jsp?year=<%=strYear%>&month=<%=strMonth%>&day=<%=strDay%>&view=1&curProvider=<%=curProvider_no[nProvider]%>&curProviderName=<%=curProviderName[nProvider]%>&displaymode=day&dboperationhappo=searcintmentday" title="zoom view"-->
            <%=curProviderName[nProvider]%></a></b>
            <% if(!userAvail) { %>
***************
*** 662,677 ****
            <% } %>
            </td></tr>
!          
         </table><!-- end table for each provider name -->
  
              </td>
   <%
!    } //end of display team a, etc.    
     apptMainBean.closePstmtConn();
   %>
!  
!  
            </tr>
!         </table>        <!-- end table for the whole schedule row display --> 
  
  
--- 687,702 ----
            <% } %>
            </td></tr>
! 
         </table><!-- end table for each provider name -->
  
              </td>
   <%
!    } //end of display team a, etc.
     apptMainBean.closePstmtConn();
   %>
! 
! 
            </tr>
!         </table>        <!-- end table for the whole schedule row display -->
  
  
***************
*** 680,684 ****
          </td>
        </tr>
!       
        <tr><td colspan="3">
        <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
--- 705,709 ----
          </td>
        </tr>
! 
        <tr><td colspan="3">
        <table BORDER="0" CELLPADDING="0" CELLSPACING="0" WIDTH="100%">
***************
*** 686,690 ****
          	<td BGCOLOR="ivory" width="50%">
           	 <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
!          	 &nbsp;&nbsp;<img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a> 
             <b><span CLASS=title><%=formatDate%></span></b>
             <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
--- 711,715 ----
          	<td BGCOLOR="ivory" width="50%">
           	 <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day-1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
!          	 &nbsp;&nbsp;<img src="../images/previous.gif" WIDTH="10" HEIGHT="9" BORDER="0" ALT="<bean:message key="provider.appointmentProviderAdminDay.viewPrevDay"/>" vspace="2"></a>
             <b><span CLASS=title><%=formatDate%></span></b>
             <a href="providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=<%=(day+1)%>&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=day&dboperation=searchappointmentday">
***************
*** 695,699 ****
  			</table>
  		</td></tr>
! 	
  	</table>
  	</td></tr>
--- 720,724 ----
  			</table>
  		</td></tr>
! 
  	</table>
  	</td></tr>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/lib jasperreports-0.5.3.jar,1.2,1.3 jasperreports-0.6.1.jar,1.2,1.3

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

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

Added Files:
	jasperreports-0.5.3.jar jasperreports-0.6.1.jar 
Log Message:
Replaced corrupt jar files

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

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

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/lib jasperreports-0.5.3.jar,1.1,NONE jasperreports-0.6.1.jar,1.1,NONE

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

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

Removed Files:
	jasperreports-0.5.3.jar jasperreports-0.6.1.jar 
Log Message:


--- jasperreports-0.6.1.jar DELETED ---

--- jasperreports-0.5.3.jar DELETED ---

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/images cake.gif,NONE,1.1

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

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

Added Files:
	cake.gif 
Log Message:
CAKE!!

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

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ViewConsultationRequests.jsp,1.6,1.7

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

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

Modified Files:
	ViewConsultationRequests.jsp 
Log Message:
Patient Will Book display added

Index: ViewConsultationRequests.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ViewConsultationRequests.jsp	9 Aug 2004 20:24:59 -0000	1.6
--- ViewConsultationRequests.jsp	9 Feb 2005 07:36:02 -0000	1.7
***************
*** 1,295 ****
! <!--  
! /*
!  * 
!  * 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 
!  */
! -->
! 
! <%@ page language="java" %>
! <%@ 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 import="oscar.oscarEncounter.pageUtil.*"%>
! 
! <%
!     if(session.getAttribute("user") == null) response.sendRedirect("../../logout.jsp");
!     //EctSessionBean bean = (EctSessionBean) request.getSession().getAttribute("EctSessionBean");
! %>
! 
! <html:html locale="true">
! 
! <%
! 
!   String team = (String) request.getAttribute("teamVar");
!   if (team == null){
!     team = new String();
!   }
! 
!   oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil consultUtil;
!   consultUtil = new  oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil();
!   consultUtil.estTeams();
!   /*if (!team.equals("-1")){
!     if( bean.isCurrentTeam() ){
!       team = bean.getCurrentTeam();
!       //System.out.println("team was set");
!     }else{
!       team = (String) bean.getTeam();
!       //System.out.println("team wasn't set");
!     }
!   }*/
! 
! String protocol = "http";
! if (request.isSecure()){
!    protocol = "https";
! }
! 
! String serverURL = protocol+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
! %>
! 
! 
! <head>
! <title>
! <bean:message key="ectViewConsultationRequests.title"/>
! </title>
! <html:base/>
! <!--META HTTP-EQUIV="Refresh" CONTENT="20;"-->
! 
! <style type="text/css">
! td.stat1 {
! 
! background-color: #eeeeFF;
! color : black;
! 
! 
! }
! 
! th,td.stat2 {
! 
! background-color: #ccccFF;
! color : black;
! 
! 
! }
! 
! td.stat3 {
! 
! background-color: #B8B8FF;
! color : black;
! 
! 
! }
! 
! td.stat4 {
! 
! background-color: #eeeeff;
! color : black;
! 
! }
! 
! th.VCRheads {
! background-color: #ddddff;
! color : black;
! }
! 
! </style>
! 
! 
! 
! </head>
! <script language="javascript">
! function BackToOscar()
! {
!        window.close();
! }
! ///
! function popupOscarRx(vheight,vwidth,varpage) { //open a new popup window
!   var page = varpage;
!   windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
!   var popup=window.open(varpage, "<bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsReq"/>", windowprops);
!   if (popup != null) {
!     if (popup.opener == null) {
!       popup.opener = self;
!     }
!   }
! //setTimeout("window.location.reload();",5000);
! }
! 
! ///
! function popupOscarConsultationConfig(vheight,vwidth,varpage) { //open a new popup window
!   var page = varpage;
!   windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
!   var popup=window.open(varpage, "<bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsConfig"/>", windowprops);
!   if (popup != null) {
!     if (popup.opener == null) {
!       popup.opener = self;
!     }
!   }
! }
! 
! 
! //
! </script>
! 
! 
! 
! <link rel="stylesheet" type="text/css" href="../encounterStyles.css">
! <body class="BodyStyle" vlink="#0000FF" >
! <!--  -->
!     <table  class="MainTable" id="scrollNumber1" name="encounterTable">
!         <tr class="MainTableTopRow">
!             <td class="MainTableTopRowLeftColumn">
!                 Consultation
!             </td>
!             <td class="MainTableTopRowRightColumn">
!                 <table class="TopStatusBar">
!                     <tr>
!                         <td class="Header" NOWRAP >
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msfConsReqForTeam"/> = 
!                             <%
!                                if (team.equals("-1")){
!                             %>
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgViewAll"/>
!                             <% } else { %>
!                             <%= team %>
!                             <% } %>               
!                         </td>
!                         <td  >
!                         </td>                        
!                     </tr>
!                 </table>
!             </td>
!         </tr>
!         <tr style="vertical-align:top">
!             <td class="MainTableLeftColumn">
!                 <table>
!                     <tr>
!                         <td NOWRAP>
!                         <a href="javascript:popupOscarConsultationConfig(700,960,'<%=serverURL%>/oscarEncounter/oscarConsultationRequest/config/ShowAllServices.jsp')" class="consultButtonsActive">
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEditSpecialists"/></a>
!                         </td>
!                     </tr>
!                 </table>
!             </td>
!             <td class="MainTableRightColumn">
!                 <table width="100%">                                
!                 <tr>
!                     <td>                        
!                         <html:form action="/oscarEncounter/ViewConsultation" >
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formSelectTeam"/>:
!                             <select name="sendTo">
! 				<option value="-1"><bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formViewAll"/></option>
!                                 <%
!                                    for (int i =0; i < consultUtil.teamVec.size();i++){
!                                      String te = (String) consultUtil.teamVec.elementAt(i);
!                                      if (te.equals(team)){
!                                 %>
!                                     <option value="<%=te%>" selected><%=te%></option>
!                                 <%}else{%>
!                                     <option value="<%=te%>"><%=te%></option>
!                                 <%}}%>
!                             </select>                            
!                             <input type="submit" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.btnConsReq"/>"/>
!                             <html:hidden property="currentTeam"/>
!                         </html:form>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td>
!                         <table border="0" width="80%" cellspacing="1">
!                             <tr>
!                                 <th align="left" class="VCRheads" width="10%">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgStatus"/>
!                                 </th>
!                                 <th align="left" class="VCRheads" width="75">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgPatient"/>
!                                 </th>
!                                 <th align="left" class="VCRheads">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgProvider"/>
!                                 </th>
!                                 <th align="left" class="VCRheads">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgService"/>
!                                 </th>
!                                 <th align="left" class="VCRheads">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgRefDate"/>
!                                 </th>
!                             </tr>
!                         <%  
!                             oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil theRequests;
!                             theRequests = new  oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil();
!                             theRequests.estConsultationVecByTeam(team);
! 
!                             for (int i = 0; i < theRequests.ids.size(); i++){
!                             String id      = (String) theRequests.ids.elementAt(i);
!                             String status  = (String) theRequests.status.elementAt(i);
!                             String patient = (String) theRequests.patient.elementAt(i);
!                             String provide = (String) theRequests.provider.elementAt(i);
!                             String service = (String) theRequests.service.elementAt(i);
!                             String date    = (String) theRequests.date.elementAt(i);
!                         %>
!                             <tr>
!                                 <td class="stat<%=status%>">
!                                     <% if (status.equals("1")){ %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgND"/>      
!                                     <% }else if(status.equals("2")) { %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSR"/>      
!                                     <% }else if(status.equals("3")) { %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgPR"/>      
!                                     <% }else if(status.equals("4")) { %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgDONE"/>    
!                                     <% } %>
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <%=patient%>
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <%=provide%>
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')">
!                                     <%=service%>
!                                     </a>
! 
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <%=date%>
!                                 </td>
!                             </tr>
!                         <%}%>
!                         </table>
!                     </td>
!                 </tr>
!                 </table>
!             </td>
!         </tr>
!         <tr>
!             <td class="MainTableBottomRowLeftColumn">
! 
!             </td>
!             <td class="MainTableBottomRowRightColumn">
! 
!             </td>
!         </tr>
!     </table>
! </body>
! 
! </html:html>
! 
--- 1,295 ----
! <!--  
! /*
!  * 
!  * 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 
!  */
! -->
! 
! <%@ page language="java" %>
! <%@ 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 import="oscar.oscarEncounter.pageUtil.*"%>
! 
! <%
!     if(session.getAttribute("user") == null) response.sendRedirect("../../logout.jsp");
!     //EctSessionBean bean = (EctSessionBean) request.getSession().getAttribute("EctSessionBean");
! %>
! 
! <html:html locale="true">
! 
! <%
! 
!   String team = (String) request.getAttribute("teamVar");
!   if (team == null){
!     team = new String();
!   }
! 
!   oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil consultUtil;
!   consultUtil = new  oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil();
!   consultUtil.estTeams();
!   /*if (!team.equals("-1")){
!     if( bean.isCurrentTeam() ){
!       team = bean.getCurrentTeam();
!       //System.out.println("team was set");
!     }else{
!       team = (String) bean.getTeam();
!       //System.out.println("team wasn't set");
!     }
!   }*/
! 
! String protocol = "http";
! if (request.isSecure()){
!    protocol = "https";
! }
! 
! String serverURL = protocol+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath();
! %>
! 
! 
! <head>
! <title>
! <bean:message key="ectViewConsultationRequests.title"/>
! </title>
! <html:base/>
! <!--META HTTP-EQUIV="Refresh" CONTENT="20;"-->
! 
! <style type="text/css">
! td.stat1 {
! 
! background-color: #eeeeFF;
! color : black;
! 
! 
! }
! 
! th,td.stat2 {
! 
! background-color: #ccccFF;
! color : black;
! 
! 
! }
! 
! td.stat3 {
! 
! background-color: #B8B8FF;
! color : black;
! 
! 
! }
! 
! td.stat4 {
! 
! background-color: #eeeeff;
! color : black;
! 
! }
! 
! th.VCRheads {
! background-color: #ddddff;
! color : black;
! }
! 
! </style>
! 
! 
! 
! </head>
! <script language="javascript">
! function BackToOscar()
! {
!        window.close();
! }
! ///
! function popupOscarRx(vheight,vwidth,varpage) { //open a new popup window
!   var page = varpage;
!   windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
!   var popup=window.open(varpage, "<bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsReq"/>", windowprops);
!   if (popup != null) {
!     if (popup.opener == null) {
!       popup.opener = self;
!     }
!   }
! //setTimeout("window.location.reload();",5000);
! }
! 
! ///
! function popupOscarConsultationConfig(vheight,vwidth,varpage) { //open a new popup window
!   var page = varpage;
!   windowprops = "height="+vheight+",width="+vwidth+",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0";
!   var popup=window.open(varpage, "<bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsConfig"/>", windowprops);
!   if (popup != null) {
!     if (popup.opener == null) {
!       popup.opener = self;
!     }
!   }
! }
! 
! 
! //
! </script>
! 
! 
! 
! <link rel="stylesheet" type="text/css" href="../encounterStyles.css">
! <body class="BodyStyle" vlink="#0000FF" >
! <!--  -->
!     <table  class="MainTable" id="scrollNumber1" name="encounterTable">
!         <tr class="MainTableTopRow">
!             <td class="MainTableTopRowLeftColumn">
!                 Consultation
!             </td>
!             <td class="MainTableTopRowRightColumn">
!                 <table class="TopStatusBar">
!                     <tr>
!                         <td class="Header" NOWRAP >
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msfConsReqForTeam"/> = 
!                             <%
!                                if (team.equals("-1")){
!                             %>
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgViewAll"/>
!                             <% } else { %>
!                             <%= team %>
!                             <% } %>               
!                         </td>
!                         <td  >
!                         </td>                        
!                     </tr>
!                 </table>
!             </td>
!         </tr>
!         <tr style="vertical-align:top">
!             <td class="MainTableLeftColumn">
!                 <table>
!                     <tr>
!                         <td NOWRAP>
!                         <a href="javascript:popupOscarConsultationConfig(700,960,'<%=serverURL%>/oscarEncounter/oscarConsultationRequest/config/ShowAllServices.jsp')" class="consultButtonsActive">
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgEditSpecialists"/></a>
!                         </td>
!                     </tr>
!                 </table>
!             </td>
!             <td class="MainTableRightColumn">
!                 <table width="100%">                                
!                 <tr>
!                     <td>                        
!                         <html:form action="/oscarEncounter/ViewConsultation" >
!                             <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formSelectTeam"/>:
!                             <select name="sendTo">
! 				<option value="-1"><bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.formViewAll"/></option>
!                                 <%
!                                    for (int i =0; i < consultUtil.teamVec.size();i++){
!                                      String te = (String) consultUtil.teamVec.elementAt(i);
!                                      if (te.equals(team)){
!                                 %>
!                                     <option value="<%=te%>" selected><%=te%></option>
!                                 <%}else{%>
!                                     <option value="<%=te%>"><%=te%></option>
!                                 <%}}%>
!                             </select>                            
!                             <input type="submit" value="<bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.btnConsReq"/>"/>
!                             <html:hidden property="currentTeam"/>
!                         </html:form>
!                     </td>
!                 </tr>
!                 <tr>
!                     <td>
!                         <table border="0" width="80%" cellspacing="1">
!                             <tr>
!                                 <th align="left" class="VCRheads" width="10%">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgStatus"/>
!                                 </th>
!                                 <th align="left" class="VCRheads" width="75">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgPatient"/>
!                                 </th>
!                                 <th align="left" class="VCRheads">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgProvider"/>
!                                 </th>
!                                 <th align="left" class="VCRheads">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgService"/>
!                                 </th>
!                                 <th align="left" class="VCRheads">
!                                 <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgRefDate"/>
!                                 </th>
!                             </tr>
!                         <%  
!                             oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil theRequests;
!                             theRequests = new  oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewConsultationRequestsUtil();
!                             theRequests.estConsultationVecByTeam(team);
! 
!                             for (int i = 0; i < theRequests.ids.size(); i++){
!                             String id      = (String) theRequests.ids.elementAt(i);
!                             String status  = (String) theRequests.status.elementAt(i);
!                             String patient = (String) theRequests.patient.elementAt(i);
!                             String provide = (String) theRequests.provider.elementAt(i);
!                             String service = (String) theRequests.service.elementAt(i);
!                             String date    = (String) theRequests.date.elementAt(i);
!                         %>
!                             <tr>
!                                 <td class="stat<%=status%>">
!                                     <% if (status.equals("1")){ %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgND"/>      
!                                     <% }else if(status.equals("2")) { %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSR"/>      
!                                     <% }else if(status.equals("3")) { %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgPR"/>      
!                                     <% }else if(status.equals("4")) { %>
!                                     <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgDONE"/>    
!                                     <% } %>
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <%=patient%>
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <%=provide%>
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <a href="javascript:popupOscarRx(700,960,'<%=serverURL%>/oscarEncounter/ViewRequest.do?requestId=<%=id%>')">
!                                     <%=service%>
!                                     </a>
! 
!                                 </td>
!                                 <td class="stat<%=status%>">
!                                     <%=date%>
!                                 </td>
!                             </tr>
!                         <%}%>
!                         </table>
!                     </td>
!                 </tr>
!                 </table>
!             </td>
!         </tr>
!         <tr>
!             <td class="MainTableBottomRowLeftColumn">
! 
!             </td>
!             <td class="MainTableBottomRowRightColumn">
! 
!             </td>
!         </tr>
!     </table>
! </body>
! 
! </html:html>
!