oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctConsultationFormRequestUtil.java, 1.23, 1.24 EctConsultationFormRequestAction.java, 1.39, 1.40 EctViewConsultationRequestsUtil.java, 1.18, 1.19 EctConsultationFormRequestForm.java, 1.17, 1.18

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil

Modified Files:
	EctConsultationFormRequestUtil.java 
	EctConsultationFormRequestAction.java 
	EctViewConsultationRequestsUtil.java 
	EctConsultationFormRequestForm.java 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: EctViewConsultationRequestsUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** EctViewConsultationRequestsUtil.java	15 Nov 2010 01:27:31 -0000	1.18
--- EctViewConsultationRequestsUtil.java	30 Nov 2010 08:17:55 -0000	1.19
***************
*** 63,66 ****
--- 63,68 ----
     }  
              
+    private boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();
+    
     public boolean estConsultationVecByTeam(String team,boolean showCompleted,Date startDate, Date endDate,String orderby,String desc,String searchDate) {       
        ids = new Vector<String>();
***************
*** 74,77 ****
--- 76,80 ----
        date = new Vector<String>();
        demographicNo = new Vector<String>();
+       siteName = new Vector<String>();
        this.patientWillBook = new Vector<String>();
        apptDate = new Vector<String>();
***************
*** 110,113 ****
--- 113,117 ----
                vSpecialist.add(specialist.getLastName() + ", " + specialist.getFirstName());
                urgency.add(consult.getUrgency());
+ 			  siteName.add(consult.getSiteName());
                teams.add(consult.getSendTo());
                cal.setTime(consult.getAppointmentDate());

Index: EctConsultationFormRequestUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestUtil.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** EctConsultationFormRequestUtil.java	6 Oct 2010 21:52:10 -0000	1.23
--- EctConsultationFormRequestUtil.java	30 Nov 2010 08:17:55 -0000	1.24
***************
*** 36,39 ****
--- 36,41 ----
  public class EctConsultationFormRequestUtil {
  
+ 	private boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();
+ 	
      public boolean estPatient(String demo) {
  
***************
*** 118,121 ****
--- 120,170 ----
          return verdict;
      }
+     
+     public boolean estTeamsBySite(String providerNo) {
+ 
+         boolean verdict = true;
+         teamVec = new Vector();
+         try {
+             String sql = "select distinct team from provider p inner join providersite s on s.provider_no = p.provider_no " +
+             		" where s.site_id in (select site_id from providersite where provider_no = '" + providerNo + "') order by team ";
+             ResultSet rs = DBHandler.GetSQL(sql);
+ 
+             while (rs.next()) {
+                 String teamName = oscar.Misc.getString(rs, "team");
+                 if (!teamName.equals("")) {
+                     teamVec.add(teamName);
+                 }
+             }
+             rs.close();
+             
+         } catch (SQLException e) {
+             MiscUtils.getLogger().error("Error", e);
+             verdict = false;
+         }
+         return verdict;
+     }
+         
+     public boolean estTeamsByTeam(String providerNo) {
+ 
+         boolean verdict = true;
+         teamVec = new Vector();
+         try {
+             String sql = "select distinct team from provider where provider_no = '" + providerNo + "' order by team ";
+             ResultSet rs = DBHandler.GetSQL(sql);
+ 
+             while (rs.next()) {
+                 String teamName = oscar.Misc.getString(rs, "team");
+                 if (!teamName.equals("")) {
+                     teamVec.add(teamName);
+                 }
+             }
+             rs.close();
+             
+         } catch (SQLException e) {
+             MiscUtils.getLogger().error("Error", e);
+             verdict = false;
+         }
+         return verdict;
+     }    
  
      public boolean estRequestFromId(String id) {
***************
*** 149,152 ****
--- 198,204 ----
                  estPatient(oscar.Misc.getString(rs, "demographicNo"));
                  String date = oscar.Misc.getString(rs, "appointmentDate");
+                 if (bMultisites) {
+                 	siteName = oscar.Misc.getString(rs, "site_name");
+                 }
                  int fir = date.indexOf('-');
                  int las = date.lastIndexOf('-');
***************
*** 358,360 ****
--- 410,413 ----
      public String pwb;
      public String mrp = "";
+     public String siteName;
  }

Index: EctConsultationFormRequestForm.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestForm.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** EctConsultationFormRequestForm.java	12 Nov 2010 21:00:29 -0000	1.17
--- EctConsultationFormRequestForm.java	30 Nov 2010 08:17:55 -0000	1.18
***************
*** 114,117 ****
--- 114,121 ----
  
  	String urgency;
+ 	
+ 	//multi-site
+ 	String siteName;
+ 
  
  	private String patientFirstName;
***************
*** 557,559 ****
--- 561,575 ----
          this.followUpDate = followUpDate;
      }
+ 	public String getSiteName() {
+     	if (siteName == null) {
+ 	    	siteName = new String();
+ 		}
+       	return siteName;
+   	}
+   
+   	public void setSiteName(String str) {
+ 	  	this.siteName = str;
+   	}
+   
+ 
  }

Index: EctConsultationFormRequestAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctConsultationFormRequestAction.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** EctConsultationFormRequestAction.java	29 Nov 2010 20:06:53 -0000	1.39
--- EctConsultationFormRequestAction.java	30 Nov 2010 08:17:55 -0000	1.40
***************
*** 83,87 ****
  
  	private static final Logger logger=MiscUtils.getLogger();
! 	
  	@Override
  	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
--- 83,87 ----
  
  	private static final Logger logger=MiscUtils.getLogger();
! 	private boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();
  	@Override
  	public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
***************
*** 133,136 ****
--- 133,137 ----
                                  consult.setConcurrentProblems(frm.getConcurrentProblems());
                                  consult.setUrgency(frm.getUrgency());
+ 								consult.setSiteName(frm.getSiteName());
                                  consult.setPatientWillBook(new Boolean(frm.getPatientWillBook()));
                                  if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) {
***************
*** 188,191 ****
--- 189,193 ----
                                  consult.setConcurrentProblems(frm.getConcurrentProblems());
                                  consult.setUrgency(frm.getUrgency());
+ 								consult.setSiteName(frm.getSiteName());
                                  consult.setPatientWillBook(new Boolean(frm.getPatientWillBook()));
                                  if( frm.getFollowUpDate() != null && !frm.getFollowUpDate().equals("") ) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil BillingReviewPrep.java, 1.10, 1.11

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil

Modified Files:
	BillingReviewPrep.java 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: BillingReviewPrep.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/pageUtil/BillingReviewPrep.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** BillingReviewPrep.java	3 Nov 2010 03:48:16 -0000	1.10
--- BillingReviewPrep.java	30 Nov 2010 08:17:56 -0000	1.11
***************
*** 261,264 ****
--- 261,270 ----
  	}
  
+ 	public List getSiteProviderBillingStr(String provider_no) {
+ 		JdbcBillingPageUtil dbObj = new JdbcBillingPageUtil();
+ 		List ret = dbObj.getCurSiteProviderStr(provider_no);
+ 		return ret;
+ 	}
+ 
  	// default value to 1 if it is empty
  	private String defaultParamValue(String val) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ConsultationFormRequest.jsp, 1.71, 1.72 ViewConsultationRequests.jsp, 1.20, 1.21 ConsultationFormPrint.jsp, 1.39, 1.40

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/oscarEncounter/oscarConsultationRequest

Modified Files:
	ConsultationFormRequest.jsp ViewConsultationRequests.jsp 
	ConsultationFormPrint.jsp 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: ConsultationFormRequest.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormRequest.jsp,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** ConsultationFormRequest.jsp	29 Nov 2010 19:42:16 -0000	1.71
--- ConsultationFormRequest.jsp	30 Nov 2010 08:17:55 -0000	1.72
***************
*** 40,47 ****
  
  <%@page
! 	import="java.util.ArrayList,java.util.Collections,java.util.List,oscar.dms.*,oscar.oscarEncounter.pageUtil.*,oscar.oscarEncounter.data.*,oscar.OscarProperties,oscar.util.StringUtils,oscar.oscarLab.ca.on.*"%>
  <%@page
  	import="org.oscarehr.casemgmt.service.CaseManagementManager,org.oscarehr.casemgmt.model.CaseManagementNote,org.oscarehr.casemgmt.model.Issue,org.oscarehr.common.model.UserProperty,org.oscarehr.common.dao.UserPropertyDAO,org.springframework.web.context.support.*,org.springframework.web.context.*"%>
  
  <%@page import="org.oscarehr.util.WebUtils"%>
  <%@page import="oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestForm"%>
--- 40,50 ----
  
  <%@page
! 	import="java.util.ArrayList, java.util.Collections, java.util.List, java.util.*, oscar.dms.*, oscar.oscarEncounter.pageUtil.*,oscar.oscarEncounter.data.*, oscar.OscarProperties, oscar.util.StringUtils, oscar.oscarLab.ca.on.*"%>
  <%@page
  	import="org.oscarehr.casemgmt.service.CaseManagementManager,org.oscarehr.casemgmt.model.CaseManagementNote,org.oscarehr.casemgmt.model.Issue,org.oscarehr.common.model.UserProperty,org.oscarehr.common.dao.UserPropertyDAO,org.springframework.web.context.support.*,org.springframework.web.context.*"%>
  
+ <%@page import="org.oscarehr.common.dao.SiteDao"%>
+ <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
+ <%@page import="org.oscarehr.common.model.Site"%>
  <%@page import="org.oscarehr.util.WebUtils"%>
  <%@page import="oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestForm"%>
***************
*** 50,53 ****
--- 53,85 ----
  <%@page import="oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctViewRequestAction"%>
  <%@page import="org.oscarehr.util.MiscUtils"%><html:html locale="true">
+ <%! boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
+ <%
+ 	//multi-site support
+ 	String appNo = (String) request.getParameter("appNo");
+ 	appNo = (appNo==null ? "" : appNo);
+ 	
+ 	String defaultSiteName = "";
+ 	Integer defaultSiteId = 0;
+ 	Vector<String> vecAddressName = new Vector<String>() ;
+ 	Vector<String> bgColor = new Vector<String>() ;
+ 	Vector<Integer> siteIds = new Vector<Integer>();
+ 	if (bMultisites) {
+ 		SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
+ 		
+ 		List<Site> sites = siteDao.getActiveSitesByProviderNo((String) session.getAttribute("user"));
+ 		if (sites != null) {
+ 			for (Site s:sites) {
+ 				   siteIds.add(s.getSiteId());
+ 		           vecAddressName.add(s.getName());	
+ 		           bgColor.add(s.getBgColor());
+ 		 	}
+ 		}
+ 		
+ 		if (appNo != "") {
+ 			defaultSiteName = siteDao.getSiteNameByAppointmentNo(appNo);
+ 		}
+ 	}
+ %>
+ 
  
  <%
***************
*** 761,768 ****
--- 793,805 ----
  		{
  			EctViewRequestAction.fillFormValues(thisForm, new Integer(requestId));
+                 thisForm.setSiteName(consultUtil.siteName);
+                 defaultSiteName = consultUtil.siteName ;
+ 
  		}
  		else if (segmentId != null)
  		{
  			EctViewRequestAction.fillFormValues(thisForm, segmentId);
+                 thisForm.setSiteName(consultUtil.siteName);
+                 defaultSiteName = consultUtil.siteName ;
  		}
  		else if (request.getAttribute("validateError") == null)
***************
*** 791,795 ****
  			//thisForm.setConcurrentProblems(demographic.EctInfo.getOngoingConcerns());
  			thisForm.setAppointmentYear(year);
! 
  		}
  		
--- 828,834 ----
  			//thisForm.setConcurrentProblems(demographic.EctInfo.getOngoingConcerns());
  			thisForm.setAppointmentYear(year);
!         		if (bMultisites) {
! 	        		thisForm.setSiteName(defaultSiteName);
!         		}
  		}
  		
***************
*** 1154,1157 ****
--- 1193,1215 ----
  							</td>
  						</tr>
+ 						<%if (bMultisites) { %>
+ 						<tr>
+ 							<td  class="tite4">
+ 								<bean:message key="oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.siteName" />:							
+ 							</td>
+ 							<td>
+ 								<html:select property="siteName" onchange='this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor'>
+ 						            <%  for (int i =0; i < vecAddressName.size();i++){
+ 						                 String te = (String) vecAddressName.get(i);
+ 						                 String bg = (String) bgColor.get(i);	
+ 						                 if (te.equals(defaultSiteName))
+ 						                	 defaultSiteId = siteIds.get(i);
+ 						            %>
+ 						                    <html:option value="<%=te%>" style='<%="background-color: "+bg%>'> <%=te%> </html:option>
+ 						            <%  }%>	
+ 							</html:select>
+ 							</td>
+ 						</tr>
+ 						<%} %>
  					</table>
  					</td>
***************
*** 1328,1331 ****
--- 1386,1390 ----
  	String aburl2 = "/EyeForm.do?method=specialConRequest&demographicNo=" + demo + "&appNo=" + request.getParameter("appNo");
  					if (requestId != null) aburl2 += "&requestId=" + requestId;
+ if (defaultSiteId!=0) aburl2+="&site="+defaultSiteId;
  %>
  <html:hidden property="specialencounterFlag" value="true"/>

Index: ViewConsultationRequests.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ViewConsultationRequests.jsp	29 Nov 2010 18:59:45 -0000	1.20
--- ViewConsultationRequests.jsp	30 Nov 2010 08:17:55 -0000	1.21
***************
*** 27,36 ****
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
  <%@page import="oscar.oscarEncounter.pageUtil.*,java.text.*,java.util.*"%>
  <%@page import="org.oscarehr.common.dao.UserPropertyDAO, org.oscarehr.common.model.UserProperty, org.springframework.web.context.support.WebApplicationContextUtils" %>
  
  <%
!     if(session.getAttribute("user") == null) response.sendRedirect("../../logout.jsp");
!     //EctSessionBean bean = (EctSessionBean) request.getSession().getAttribute("EctSessionBean");
  %>
  
--- 27,94 ----
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic" %>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  <%@page import="oscar.oscarEncounter.pageUtil.*,java.text.*,java.util.*"%>
+ <%@ page import="oscar.login.DBHelp"%>
+ <%@ page import="java.sql.ResultSet"%>
+ <%@page import="org.oscarehr.common.dao.SiteDao"%>
  <%@page import="org.oscarehr.common.dao.UserPropertyDAO, org.oscarehr.common.model.UserProperty, org.springframework.web.context.support.WebApplicationContextUtils" %>
+ <%@page import="org.oscarehr.common.model.Site"%>
  
  <%
!     if(session.getAttribute("user") == null ) response.sendRedirect("../../logout.jsp");
!     String curProvider_no = (String) session.getAttribute("user");
! 
!     if(session.getAttribute("userrole") == null )  response.sendRedirect("../../logout.jsp");
!     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
!     
!     boolean isSiteAccessPrivacy=false;
!     boolean isTeamAccessPrivacy=false; 
!     boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();
!     List<String> mgrSite = new ArrayList<String>();
! %>
! <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
! 	<%isSiteAccessPrivacy=true; %>
! </security:oscarSec>
! <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
! 	<%isTeamAccessPrivacy=true; %>
! </security:oscarSec>
! 
! <% 
! HashMap<String,String> providerMap = new HashMap<String,String>();
! //multisites function
! if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
! 	String sqlStr = "select provider_no from provider ";
! 	if (isSiteAccessPrivacy) 
! 		sqlStr = "select distinct p.provider_no from provider p inner join providersite s on s.provider_no = p.provider_no " 
! 		 + " where s.site_id in (select site_id from providersite where provider_no = " + curProvider_no + ")";
! 	if (isTeamAccessPrivacy) 
! 		sqlStr = "select distinct p.provider_no from provider p where team in (select team from provider "
! 				+ " where team is not null and team <> '' and provider_no = " + curProvider_no + ")";
! 	DBHelp dbObj = new DBHelp();
! 	ResultSet rs = dbObj.searchDBRecord(sqlStr);
! 	while (rs.next()) {
! 		providerMap.put(rs.getString("provider_no"),"true");
! 	}
! 	rs.close();
! }
! %>
! 
! <%
! 	//multi-site office , save all bgcolor to Hashmap
! 	HashMap<String,String> siteBgColor = new HashMap<String,String>();
! 	HashMap<String,String> siteShortName = new HashMap<String,String>();
! 	if (bMultisites) {
!     	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
!     	
!     	List<Site> sites = siteDao.getAllSites();
!     	for (Site st : sites) {
!     		siteBgColor.put(st.getName(),st.getBgColor());
!     		siteShortName.put(st.getName(),st.getShortName());
!     	}
!     	List<Site> providerSites = siteDao.getActiveSitesByProviderNo(curProvider_no);
!     	for (Site st : providerSites) {
!     		mgrSite.add(st.getName());
!     	}
! 	}
  %>
  
***************
*** 58,62 ****
    oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil consultUtil;
    consultUtil = new  oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil();
!   consultUtil.estTeams();
    
  String protocol = "http";
--- 116,129 ----
    oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil consultUtil;
    consultUtil = new  oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil();
!   
!   if (isTeamAccessPrivacy) {
! 	  consultUtil.estTeamsByTeam(curProvider_no);
!   }
!   else if (isSiteAccessPrivacy) {
! 	  consultUtil.estTeamsBySite(curProvider_no);
!   }
!   else {
!   	consultUtil.estTeams();
!   }
    
  String protocol = "http";
***************
*** 285,288 ****
--- 352,362 ----
                                     </a>
                                  </th>
+  			    <% if (bMultisites) { %>                                
+                                 <th align="left" class="VCRheads">
+                                    <a href=# onclick="setOrder('10'); return false;">
+                                    <bean:message key="oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSiteName"/>
+                                    </a>
+                                 </th>            
+                             <%} %>                                   
                              </tr>
                          <%                                                        
***************
*** 302,305 ****
--- 376,384 ----
  
                              for (int i = 0; i < theRequests.ids.size(); i++){
+                              //multisites. skip record if not belong to same site/team
+                              if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+                              	if(providerMap.get((String) theRequests.providerNo.elementAt(i))== null)  continue;
+                              }	
+                             	
                              String id      = (String) theRequests.ids.elementAt(i);
                              String status  = (String) theRequests.status.elementAt(i);
***************
*** 315,323 ****
                              String specialist = theRequests.vSpecialist.elementAt(i);
                              String followUpDate = theRequests.followUpDate.elementAt(i);
!                             
                              if(status.equals("1") && dateGreaterThan(date, Calendar.WEEK_OF_YEAR, -1)){
                                  tickerList.add(demo);
                              }
! 
                              overdue = false;
                                                                                                                  
--- 394,409 ----
                              String specialist = theRequests.vSpecialist.elementAt(i);
                              String followUpDate = theRequests.followUpDate.elementAt(i);
!                             String siteName = ""; 
!                             if (bMultisites) {
!                             	siteName = (String) theRequests.siteName.elementAt(i);
!                             }
                              if(status.equals("1") && dateGreaterThan(date, Calendar.WEEK_OF_YEAR, -1)){
                                  tickerList.add(demo);
                              }
!                             
!                             //multisites. skip record if not belong to same site
!                             if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
!                              	if(!mgrSite.contains(siteName))  continue;
!                              }	
                              overdue = false;
                                                                                                                  
***************
*** 409,412 ****
--- 495,503 ----
  
                                  </td>
+                                 <% if (bMultisites) { %>   
+                                 <td bgcolor="<%=(siteBgColor.get(siteName)==null || siteBgColor.get(siteName).length()== 0 ? "#FFFFFF" : siteBgColor.get(siteName))%>">
+                                     <%=siteShortName.get(siteName)%>
+                                 </td>                      
+                                 <%} %>          
                              </tr>
                          <%}%>

Index: ConsultationFormPrint.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ConsultationFormPrint.jsp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ConsultationFormPrint.jsp	15 Nov 2010 03:26:16 -0000	1.39
--- ConsultationFormPrint.jsp	30 Nov 2010 08:17:55 -0000	1.40
***************
*** 45,49 ****
      reqFrm = new oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil ();
      reqFrm.estRequestFromId((String)request.getAttribute("reqId"));
! 
      reqFrm.specPhone = request.getParameter("phone");
  
--- 45,51 ----
      reqFrm = new oscar.oscarEncounter.oscarConsultationRequest.pageUtil.EctConsultationFormRequestUtil ();
      reqFrm.estRequestFromId((String)request.getAttribute("reqId"));
!     
! 	String selectedSite = reqFrm.siteName;
! 	
      reqFrm.specPhone = request.getParameter("phone");
  
***************
*** 103,107 ****
                  vecAddress.add(s.getAddress() + ", " + s.getCity() + ", " + s.getProvince() + "  " + s.getPostal());
                  vecAddressPhone.add(s.getPhone());
!                 vecAddressFax.add(s.getFax());      			
        		}
              // default address
--- 105,112 ----
                  vecAddress.add(s.getAddress() + ", " + s.getCity() + ", " + s.getProvince() + "  " + s.getPostal());
                  vecAddressPhone.add(s.getPhone());
!                 vecAddressFax.add(s.getFax());    
!                 if (selectedSite.equals(s.getName())) {
!                 	defaultSite = s;
!                 }
        		}
              // default address
***************
*** 320,325 ****
  		<% if(vecAddress != null) { %>
              <td align="center">
!                 Address
!                 <select name="addressSel" id="addressSel" onChange="addressSelect()">
              <%  for (int i =0; i < vecAddressName.size();i++){
                   String te = (String) vecAddressName.get(i);
--- 325,330 ----
  		<% if(vecAddress != null) { %>
              <td align="center">
!                 Address 
!                 <select name="addressSel" id="addressSel" onChange="addressSelect()" <%=(bMultisites && selectedSite != null ? " disabled " : " ") %>>>
              <%  for (int i =0; i < vecAddressName.size();i++){
                   String te = (String) vecAddressName.get(i);

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/dao ProviderDao.java, 1.8, 1.9

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dao
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/WEB-INF/classes/src/oscar/dao

Modified Files:
	ProviderDao.java 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: ProviderDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/dao/ProviderDao.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ProviderDao.java	7 Oct 2010 22:20:34 -0000	1.8
--- ProviderDao.java	30 Nov 2010 08:17:56 -0000	1.9
***************
*** 29,33 ****
  			{"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.current1='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,program_id from appointment where provider_no=? and appointment_date=? and program_id=? 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=? "},
--- 29,33 ----
  			{"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.current1='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,program_id,location from appointment where provider_no=? and appointment_date=? and program_id=? 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=? "},
***************
*** 88,91 ****
--- 88,92 ----
  			{"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'  and scheduledate.status = 'A'"},
  
+ 			{"search_pref_defaultbill", "select default_servicetype from preference where provider_no = ?"},
  			{"list_bills_servicetype", "select distinct servicetype, servicetype_name from ctl_billingservice where status='A'"},
  
***************
*** 95,99 ****
  		    {"search_provider", "select provider_no, last_name, first_name from provider where last_name like ? and first_name like ? order by last_name"}, 
  		    {"search_providersgroup", "select mygroup_no, last_name, first_name from mygroup where last_name like ? and first_name like ? order by last_name, first_name, mygroup_no"}, 
! 		    {"search_mygroup", "select mygroup_no from mygroup where mygroup_no like ? group by mygroup_no order by mygroup_no"}, 
  	};
  
--- 96,106 ----
  		    {"search_provider", "select provider_no, last_name, first_name from provider where last_name like ? and first_name like ? order by last_name"}, 
  		    {"search_providersgroup", "select mygroup_no, last_name, first_name from mygroup where last_name like ? and first_name like ? order by last_name, first_name, mygroup_no"}, 
! 		    {"search_mygroup", "select mygroup_no from mygroup where mygroup_no like ? group by mygroup_no order by mygroup_no"},
! 		    //multi-site query, schedule day view page
! 			{"site_searchmygroupcount", "select count(provider_no) from mygroup where mygroup_no=?  and provider_no in (select ps.provider_no from providersite ps inner join site s on ps.site_id = s.site_id where s.name = ?)"},
! 			{"site_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'  and scheduledate.status = 'A'  and mygroup.provider_no in (select ps.provider_no from providersite ps inner join site s on ps.site_id = s.site_id where s.name = ?) "},
! 			{"site_searchmygroupprovider", "select provider_no, last_name, first_name from mygroup where mygroup_no=?  and provider_no in (select ps.provider_no from providersite ps inner join site s on ps.site_id = s.site_id where s.name = ?)"},
! 			{"site_search_scheduledate_datep", "select * from scheduledate where sdate between ? and ? and status = 'A' and provider_no in (select ps.provider_no from providersite ps inner join site s on ps.site_id = s.site_id where s.name = ?) order by sdate" },
! 		    
  	};
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model Site.hbm.xml, 1.1, 1.2 Site.java, 1.1, 1.2 ConsultationRequest.java, 1.3, 1.4

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/WEB-INF/classes/src/org/oscarehr/common/model

Modified Files:
	Site.hbm.xml Site.java ConsultationRequest.java 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: Site.hbm.xml
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Site.hbm.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Site.hbm.xml	2 Oct 2009 21:38:23 -0000	1.1
--- Site.hbm.xml	30 Nov 2010 08:17:56 -0000	1.2
***************
*** 39,43 ****
              <column name="status" not-null="true" />
          </property>
! 
  		<set name="providers" table="providersite" cascade="all" lazy="false" fetch="join" inverse="true">
             <key column="site_id"/>
--- 39,48 ----
              <column name="status" not-null="true" />
          </property>
!         <property name="providerIdFrom" type="integer">
!             <column name="providerId_from"/>
!         </property>
!         <property name="providerIdTo" type="integer">
!             <column name="providerId_to"/>
!         </property>
  		<set name="providers" table="providersite" cascade="all" lazy="false" fetch="join" inverse="true">
             <key column="site_id"/>

Index: Site.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/Site.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Site.java	2 Oct 2009 21:38:23 -0000	1.1
--- Site.java	30 Nov 2010 08:17:56 -0000	1.2
***************
*** 45,51 ****
--- 45,69 ----
  	private String province;
  	private String postal;
+ 	private Integer providerIdFrom;
+ 	private Integer providerIdTo;
  	private byte status;
  	private Set<Provider> providers;
  
+ 	public Integer getProviderIdFrom() {
+ 		return providerIdFrom;
+ 	}
+ 
+ 	public void setProviderIdFrom(Integer providerIdFrom) {
+ 		this.providerIdFrom = providerIdFrom;
+ 	}
+ 
+ 	public Integer getProviderIdTo() {
+ 		return providerIdTo;
+ 	}
+ 
+ 	public void setProviderIdTo(Integer providerIdTo) {
+ 		this.providerIdTo = providerIdTo;
+ 	}
+ 
  	public Set<Provider> getProviders() {
  		return providers;
***************
*** 68,72 ****
  	public Site(String name, String shortName, String phone, String fax,
  			String bgColor, String address, String city, String province,
! 			String postal, byte status) {
  		this.name = name;
  		this.shortName = shortName;
--- 86,90 ----
  	public Site(String name, String shortName, String phone, String fax,
  			String bgColor, String address, String city, String province,
! 			String postal, byte status , int providerIdFrom, int providerIdTo) {
  		this.name = name;
  		this.shortName = shortName;
***************
*** 79,82 ****
--- 97,102 ----
  		this.postal = postal;
  		this.status = status;
+ 		this.providerIdFrom = providerIdFrom;
+ 		this.providerIdTo = providerIdTo;
  	}
  

Index: ConsultationRequest.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/model/ConsultationRequest.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ConsultationRequest.java	12 Nov 2010 21:01:02 -0000	1.3
--- ConsultationRequest.java	30 Nov 2010 08:17:56 -0000	1.4
***************
*** 79,82 ****
--- 79,85 ----
  	private String urgency;
  	private boolean patientWillBook;
+ 	
+ 	@Column(name = "site_name")
+ 	private String siteName;
          
          @Temporal(TemporalType.DATE)
***************
*** 215,218 ****
--- 218,229 ----
      	this.urgency = StringUtils.trimToNull(urgency);
      }
+ 	
+ 	public String getSiteName() {
+     	return siteName;
+     }
+ 
+ 	public void setSiteName(String siteName) {
+     	this.siteName = siteName;
+     }
  
  	public boolean isPatientWillBook() {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/admin providersearchrecordshtm.jsp, 1.12, 1.13 admincontrol.jsp, 1.36, 1.37 preferenceaddpreference.jsp, 1.15, 1.16 admindisplaymygroup.jsp, 1.13, 1.14 adminnewgroup.jsp, 1.13, 1.14 providerRole.jsp, 1.19, 1.20 providerupdateprovider.jsp, 1.34, 1.35 provideraddarecord.jsp, 1.27, 1.28 providerupdate.jsp, 1.18, 1.19 securitysearchrecordshtm.jsp, 1.9, 1.10 securitysearchresults.jsp, 1.12, 1.13 gstreport.jsp, 1.8, 1.9 logReport.jsp, 1.17, 1.18 sitesAdminDetail.jsp, 1.4, 1.5 sitesAdmin.jsp, 1.2, 1.3 securityaddarecord.jsp, 1.23, 1.24 provideraddarecordhtm.jsp, 1.40, 1.41 unLock.jsp, 1.10, 1.11

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/admin

Modified Files:
	providersearchrecordshtm.jsp admincontrol.jsp 
	preferenceaddpreference.jsp admindisplaymygroup.jsp 
	adminnewgroup.jsp providerRole.jsp providerupdateprovider.jsp 
	provideraddarecord.jsp providerupdate.jsp 
	securitysearchrecordshtm.jsp securitysearchresults.jsp 
	gstreport.jsp logReport.jsp sitesAdminDetail.jsp 
	sitesAdmin.jsp securityaddarecord.jsp 
	provideraddarecordhtm.jsp unLock.jsp 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: preferenceaddpreference.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/preferenceaddpreference.jsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** preferenceaddpreference.jsp	5 Sep 2010 07:05:24 -0000	1.15
--- preferenceaddpreference.jsp	30 Nov 2010 08:17:54 -0000	1.16
***************
*** 25,36 ****
  -->
  
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
  <%@ taglib uri="/WEB-INF/caisi-tag.tld" prefix="caisi"%>
  <%@ page import="java.sql.*, java.util.*" errorPage="errorpage.jsp"%>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean" scope="session" />
  
  <%@page import="org.oscarehr.common.model.ProviderPreference"%>
! <%@page import="org.oscarehr.web.admin.ProviderPreferencesUIBean"%><html:html locale="true">
  <head>
  <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
--- 25,55 ----
  -->
  
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
  <%@ taglib uri="/WEB-INF/caisi-tag.tld" prefix="caisi"%>
  <%@ page import="java.sql.*, java.util.*" errorPage="errorpage.jsp"%>
! <%@ page import="oscar.login.DBHelp"%>
! <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean"
! 	scope="session" />
  
  <%@page import="org.oscarehr.common.model.ProviderPreference"%>
! <%@page import="org.oscarehr.web.admin.ProviderPreferencesUIBean"%>
! <%
!     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
!     String curProvider_no = (String) session.getAttribute("user");
! 
!     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
!     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
!     
!     boolean isSiteAccessPrivacy=false;
! %>
! 
! 
! <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
! 	<%isSiteAccessPrivacy=true; %>
! </security:oscarSec>
! 	
! <html:html locale="true">
  <head>
  <script type="text/javascript" src="<%= request.getContextPath() %>/js/global.js"></script>
***************
*** 46,49 ****
--- 65,91 ----
  </table>
  <%
+ boolean isAccessPass = true;
+ 
+ if (isSiteAccessPrivacy) {
+ 	//multisite : check provider no
+ 	String provider_no = request.getParameter("provider_no");
+ 	String sqlStr = "select COUNT(*) as cou from providersite where provider_no = " + provider_no 
+ 		+ " and site_id in (select site_id from providersite where provider_no = " + curProvider_no + ") ";
+ 	DBHelp dbObj = new DBHelp();
+ 	ResultSet rs = dbObj.searchDBRecord(sqlStr);
+ 	
+     if(rs.next()){          
+           int ret = rs.getInt("cou");
+           if(ret >= 1){
+         	  isAccessPass = true;
+           }
+           else {
+         	  isAccessPass = false;
+           }
+     }
+     rs.close();
+ }
+ 
+ if (!isSiteAccessPrivacy || isAccessPass) {
  	ProviderPreference providerPreference=ProviderPreferencesUIBean.updateOrCreateProviderPreferences(request);
  
***************
*** 60,64 ****
  <h1><bean:message key="admin.preferenceaddarecord.msgSuccessful" />
  </h1>
! <!-- footer -->
  <hr width="100%" color="navy">
  <table border="0" cellspacing="0" cellpadding="0" width="100%">
--- 102,113 ----
  <h1><bean:message key="admin.preferenceaddarecord.msgSuccessful" />
  </h1>
! 	<%  
! } 
! else {
! 	%>
! 	<h1><bean:message key="admin.preferenceaddpreference.msgAccessFailure" />
! <%	
! }
! %> <!-- footer -->
  <hr width="100%" color="navy">
  <table border="0" cellspacing="0" cellpadding="0" width="100%">

Index: providerRole.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/providerRole.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** providerRole.jsp	29 Jul 2010 00:05:24 -0000	1.19
--- providerRole.jsp	30 Nov 2010 08:17:54 -0000	1.20
***************
*** 25,29 ****
  <%@ page import="java.util.*" %>
  <%@ page import="java.sql.*" %>
! <%@ page import="oscar.util.*" %>
  <%@ page import="oscar.login.*" %>
  <%@ page import="oscar.log.*" %>
--- 25,29 ----
  <%@ page import="java.util.*" %>
  <%@ page import="java.sql.*" %>
! <%@ page import="oscar.util.*,oscar.*" %>
  <%@ page import="oscar.login.*" %>
  <%@ page import="oscar.log.*" %>
***************
*** 40,43 ****
--- 40,51 ----
  </security:oscarSec>
  
+ <%    
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <%
  //check to see if new case management is request
***************
*** 71,75 ****
  // get role from database
  Vector vecRoleName = new Vector();
! String	sql   = "select * from secRole order by role_name";
  ResultSet rs = dbObj.searchDBRecord(sql);
  while (rs.next()) {
--- 79,93 ----
  // get role from database
  Vector vecRoleName = new Vector();
! String	sql;
! String adminRoleName = "";
! if (isSiteAccessPrivacy) {
! 	//multisites ,remove admin role from dropdown list
! 	OscarProperties props = OscarProperties.getInstance();
! 	adminRoleName = props.getProperty("multioffice.admin.role.name", "");
! 	sql   = "select * from secRole where role_name <> '" + adminRoleName + "' order by role_name";
! }
! else {
! 	sql   = "select * from secRole order by role_name";
! }
  ResultSet rs = dbObj.searchDBRecord(sql);
  while (rs.next()) {
***************
*** 293,298 ****
  	firstName = "%";
  }
! String query = "select u.id, u.role_name, p.provider_no, p.first_name, p.last_name from provider p LEFT JOIN secUserRole u ON ";
! query += " p.provider_no=u.provider_no where p.last_name like '" + lastName + "' and p.first_name like '" + firstName + "' and p.status='1' order by p.first_name, p.last_name, u.role_name";
  rs = dbObj.searchDBRecord(query);
  Vector<Properties> vec = new Vector<Properties>();
--- 311,331 ----
  	firstName = "%";
  }
! 
! 
! String query; 
! 
! if (isSiteAccessPrivacy){
! 	//multisites: only select providers have same site with current user
! 	query = "select u.id, u.role_name, p.provider_no, p.first_name, p.last_name from provider p LEFT JOIN secUserRole u ON ";
! 	query += " p.provider_no=u.provider_no LEFT JOIN providersite ps ON p.provider_no = ps.provider_no ";
! 	query += " where p.last_name like '" + lastName + "' and p.first_name like '" + firstName + "' and p.status='1' ";
! 	query += " and not exists(select * from secUserRole scr where scr.provider_no =  p.provider_no and scr.role_name = '" + adminRoleName + "') " ;
! 	query += " and ps.site_id in (select site_id from providersite where provider_no = " + curUser_no + ")  order by p.first_name, p.last_name, u.role_name";
! }
! else {
! 	query = "select u.id, u.role_name, p.provider_no, p.first_name, p.last_name from provider p LEFT JOIN secUserRole u ON ";
! 	query += " p.provider_no=u.provider_no where p.last_name like '" + lastName + "' and p.first_name like '" + firstName + "' and p.status='1' order by p.first_name, p.last_name, u.role_name";
! }
! //System.out.println(query);
  rs = dbObj.searchDBRecord(query);
  Vector<Properties> vec = new Vector<Properties>();

Index: admincontrol.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admincontrol.jsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** admincontrol.jsp	15 Nov 2010 03:26:15 -0000	1.36
--- admincontrol.jsp	30 Nov 2010 08:17:54 -0000	1.37
***************
*** 41,48 ****
--- 41,60 ----
  %>
  
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <%@ page errorPage="errorpage.jsp"%>
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean"
  	scope="session" />
  
+ 
  <%
    String orderby="", limit="", limit1="", limit2="";
***************
*** 153,157 ****
      {"search_wlstatus", "select * from waitingList where demographic_no=? AND is_history='N' order by onListSince DESC"}, 
      {"search_waiting_list", "select * from waitingListName where group_no='" + session.getAttribute("groupno") +"' AND is_history='N' order by name"}, 
!     
    };
  	}else{
--- 165,174 ----
      {"search_wlstatus", "select * from waitingList where demographic_no=? AND is_history='N' order by onListSince DESC"}, 
      {"search_waiting_list", "select * from waitingListName where group_no='" + session.getAttribute("groupno") +"' AND is_history='N' order by name"}, 
!     //muti-site query
!     {"site_searchproviderall","select p.provider_no, p.last_name, p.first_name from provider p INNER JOIN providersite s ON p.provider_no = s.provider_no WHERE s.site_id IN (SELECT site_id from providersite where provider_no=?) AND p.status='1' order by last_name"},
!     {"site_searchmygroupall" ,"select p.* from mygroup p INNER JOIN providersite s ON p.provider_no = s.provider_no WHERE s.site_id IN (SELECT site_id from providersite where provider_no=?) order by mygroup_no"},
!     {"site_preference_search_titlename", "select p.* from preference p INNER JOIN providersite s ON p.provider_no = s.provider_no where p."+fieldname+ " "+regularexp+" ?  AND s.site_id IN (SELECT site_id from providersite where provider_no= ? ) " +orderby + " "+limit},
!     {"site_security_search_titlename", "select p.* from security p INNER JOIN providersite s ON p.provider_no = s.provider_no where p."+fieldname+ " "+regularexp+" ?  AND s.site_id IN (SELECT site_id from providersite where provider_no= " + curProvider_no + " ) " +orderby + " "+limit},
!     {"site_provider_search_titlename", "select p.provider_no,p.first_name,p.last_name,p.specialty,p.sex,p.team,p.phone,p.status from provider p where "+fieldname+ " "+regularexp+" ? and exists(select * from providersite s where p.provider_no = s.provider_no and s.site_id IN (SELECT site_id from providersite where provider_no=" + curProvider_no + ")) "  +orderby + " "+limit},
    };
  	}else{
***************
*** 198,202 ****
      {"search_wlstatus", "select * from waitingList where demographic_no=? AND is_history='N' order by onListSince DESC"}, 
      {"search_waiting_list", "select * from waitingListName where group_no='" + session.getAttribute("groupno") +"' AND is_history='N' order by name"}, 
! 
    };
  }
--- 215,224 ----
      {"search_wlstatus", "select * from waitingList where demographic_no=? AND is_history='N' order by onListSince DESC"}, 
      {"search_waiting_list", "select * from waitingListName where group_no='" + session.getAttribute("groupno") +"' AND is_history='N' order by name"}, 
!     //muti-site query
!     {"site_searchproviderall","select p.provider_no, p.last_name, p.first_name from provider p INNER JOIN providersite s ON p.provider_no = s.provider_no WHERE s.site_id IN (SELECT site_id from providersite where provider_no=?) AND p.status='1' order by last_name"},
!     {"site_searchmygroupall" ,"select p.* from mygroup p INNER JOIN providersite s ON p.provider_no = s.provider_no WHERE s.site_id IN (SELECT site_id from providersite where provider_no=?) order by mygroup_no"},
!     {"site_preference_search_titlename", "select p.* from preference p INNER JOIN providersite s ON p.provider_no = s.provider_no where p."+fieldname+ " "+regularexp+" ?  AND s.site_id IN (SELECT site_id from providersite where provider_no=?) " +orderby + " "+limit},
!     {"site_security_search_titlename", "select p.* from security p INNER JOIN providersite s ON p.provider_no = s.provider_no where p."+fieldname+ " "+regularexp+" ?  AND s.site_id IN (SELECT site_id from providersite where provider_no= " + curProvider_no + " ) " +orderby + " "+limit},
!     {"site_provider_search_titlename", "select p.provider_no,p.first_name,p.last_name,p.specialty,p.sex,p.team,p.phone,p.status from provider p where "+fieldname+ " "+regularexp+" ? and exists(select * from providersite s where p.provider_no = s.provider_no and s.site_id IN (SELECT site_id from providersite where provider_no=" + curProvider_no + ")) "  +orderby + " "+limit},
    };
  }

Index: adminnewgroup.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/adminnewgroup.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** adminnewgroup.jsp	24 Nov 2010 03:55:33 -0000	1.13
--- adminnewgroup.jsp	30 Nov 2010 08:17:54 -0000	1.14
***************
*** 27,30 ****
--- 27,31 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  
  <%
***************
*** 36,39 ****
--- 37,54 ----
  	scope="session" />
  
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+ 
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <html:html locale="true">
  <head>
***************
*** 121,128 ****
  					size="-2">(Max. 10 chars.)</font></td>
  			</tr>
! 			<%
     ResultSet rsgroup = null;
     int i=0;
!    rsgroup = apptMainBean.queryResults("searchproviderall");
     while (rsgroup.next()) { 
       i++;
--- 136,152 ----
  					size="-2">(Max. 10 chars.)</font></td>
  			</tr>
! 
! 	
! <%
     ResultSet rsgroup = null;
     int i=0;
!    if (isSiteAccessPrivacy)
!    { 
! 	  rsgroup = apptMainBean.queryResults(curProvider_no,"site_searchproviderall");
!    }
!    else
!    {
! 	  rsgroup = apptMainBean.queryResults("searchproviderall");
!    }
     while (rsgroup.next()) { 
       i++;

Index: providerupdate.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/providerupdate.jsp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** providerupdate.jsp	8 Oct 2010 14:22:01 -0000	1.18
--- providerupdate.jsp	30 Nov 2010 08:17:54 -0000	1.19
***************
*** 4,7 ****
--- 4,12 ----
  	import="java.sql.*, oscar.login.*, java.util.*,oscar.*,oscar.oscarDB.*,oscar.util.SqlUtils,oscar.oscarProvider.data.ProviderBillCenter"
  	errorPage="errorpage.jsp"%>
+ 	
+ <%@page import="org.oscarehr.common.dao.SiteDao"%>
+ <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
+ <%@page import="org.oscarehr.common.model.Site"%>
+ 	
  <jsp:useBean id="apptMainBean" class="oscar.AppointmentMainBean"
  	scope="session" />
***************
*** 79,83 ****
--- 84,151 ----
    param[19]=new DBPreparedHandlerParam((String)session.getAttribute("user"));
    param[20]=new DBPreparedHandlerParam(request.getParameter("provider_no"));
+ //multi-office provide id formalize check, can be turn off on properties multioffice.formalize.provider.id
+   boolean isProviderFormalize = true;
+   String  errMsgProviderFormalize = "admin.provideraddrecord.msgAdditionFailure";
+   Integer min_value = 0;
+   Integer max_value = 0;
+   	
+   if (org.oscarehr.common.IsPropertiesOn.isProviderFormalizeEnable()) {
+ 
+   	String StrProviderId = request.getParameter("provider_no");
+   	OscarProperties props = OscarProperties.getInstance();
+ 
+   	String[] provider_sites = {};
+   	
+   	// get provider id ranger
+   	if (request.getParameter("provider_type").equalsIgnoreCase("doctor")) {
+   		//provider is doctor, get provider id range from Property
+   		min_value = new Integer(props.getProperty("multioffice.formalize.doctor.minimum.provider.id", ""));
+   		max_value = new Integer(props.getProperty("multioffice.formalize.doctor.maximum.provider.id", ""));
+   	}
+   	else {
+   		//non-doctor role
+   		provider_sites = request.getParameterValues("sites");
+   		provider_sites = (provider_sites == null ? new String[] {} : provider_sites);
+   		
+   		if (provider_sites.length > 1) {
+   			//non-doctor can only have one site
+   			isProviderFormalize = false;
+   			errMsgProviderFormalize = "admin.provideraddrecord.msgFormalizeProviderIdMultiSiteFailure";
+   		}
+   		else {
+   			if (provider_sites.length == 1) {
+   				//get provider id range from site
+   				String provider_site_id =  provider_sites[0];
+   				SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
+   				Site provider_site = siteDao.getById(new Integer(provider_site_id));
+   				min_value = provider_site.getProviderIdFrom();
+   				max_value = provider_site.getProviderIdTo();
+   			}
+   		}
+   	}
+ 
+   	if (isProviderFormalize) {
+   		try {
+   			    Integer providerId = Integer.parseInt(StrProviderId);
+ 
+   			    if (request.getParameter("provider_type").equalsIgnoreCase("doctor") ||  provider_sites.length == 1) {
+   				    if  (!(providerId >= min_value && providerId <=max_value)) {
+   				    	// providerId is not in the range
+   						isProviderFormalize = false;
+   						errMsgProviderFormalize = "admin.provideraddrecord.msgFormalizeProviderIdFailure";
+   				    }
+ 			    
+   			    }
+ 
+   		} catch(NumberFormatException e) {
+   			//providerId is not a number
+   			isProviderFormalize = false;
+   			errMsgProviderFormalize = "admin.provideraddrecord.msgFormalizeProviderIdFailure";
+   		}
+   	}
+ 
+   }
    
+   if (!org.oscarehr.common.IsPropertiesOn.isProviderFormalizeEnable() || isProviderFormalize) {  
      DBPreparedHandlerParam[] paramArch =new DBPreparedHandlerParam[] {new DBPreparedHandlerParam(request.getParameter("provider_no"))};
      apptMainBean.queryExecuteUpdate(paramArch, "provider_archive_record");
***************
*** 107,111 ****
  <%  
    } 
! %>
  <p></p>
  <%@ include file="footer2htm.jsp"%>
--- 175,189 ----
  <%  
    } 
! }
! else {
! 	if (!isProviderFormalize) {
! 		//output ProviderFormalize error message 	
! 	%>
! 		<h1><bean:message key="<%=errMsgProviderFormalize%>" />  </h1>
! 		Provider # range from : <%=min_value %> To : <%=max_value %>
! 	<%		
! 	}
! }
! %> 
  <p></p>
  <%@ include file="footer2htm.jsp"%>

Index: gstreport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/gstreport.jsp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** gstreport.jsp	16 Nov 2010 08:35:39 -0000	1.8
--- gstreport.jsp	30 Nov 2010 08:17:54 -0000	1.9
***************
*** 4,7 ****
--- 4,28 ----
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
  <%@ taglib uri="/WEB-INF/struts-logic.tld" prefix="logic"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+ 
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isTeamAccessPrivacy =true; %>
+ </security:oscarSec>
+ 
  <%
  GstReport gstReport = new GstReport(); 
***************
*** 22,26 ****
  BigDecimal gst = new BigDecimal(0);
  Vector list = gstReport.getGST(providerNo, startDate, endDate);
! List pList = (Vector)(new JdbcBillingPageUtil()).getCurProviderStr();
  %>
  <link rel="stylesheet" type="text/css" media="all"
--- 43,57 ----
  BigDecimal gst = new BigDecimal(0);
  Vector list = gstReport.getGST(providerNo, startDate, endDate);
! 
! List pList = new Vector();;
! if (isTeamAccessPrivacy) {
! 	pList= (Vector)(new JdbcBillingPageUtil()).getCurTeamProviderStr(curProvider_no);
! }
! else if (isSiteAccessPrivacy) {
! 	pList= (Vector)(new JdbcBillingPageUtil()).getCurSiteProviderStr(curProvider_no);
! }
! else {
! 	pList= (Vector)(new JdbcBillingPageUtil()).getCurProviderStr();
! }
  %>
  <link rel="stylesheet" type="text/css" media="all"

Index: admindisplaymygroup.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/admindisplaymygroup.jsp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** admindisplaymygroup.jsp	24 Nov 2010 03:55:33 -0000	1.13
--- admindisplaymygroup.jsp	30 Nov 2010 08:17:54 -0000	1.14
***************
*** 27,30 ****
--- 27,31 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  
  <%
***************
*** 32,35 ****
--- 33,53 ----
      response.sendRedirect("../login.htm");
  %>
+ 
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+ 
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ 
+ 
  <%@ page import="java.util.*,java.sql.*"
  	errorPage="../provider/errorpage.jsp"%>
***************
*** 79,83 ****
     boolean bNewNo=false;
     String oldNo="";
!    rsgroup = apptMainBean.queryResults("searchmygroupall");
     while (rsgroup.next()) { 
       if(!(rsgroup.getString("mygroup_no").equals(oldNo)) ) {
--- 97,108 ----
     boolean bNewNo=false;
     String oldNo="";
!    if (isSiteAccessPrivacy)
!    {
! 	   rsgroup = apptMainBean.queryResults(curProvider_no,"site_searchmygroupall");
!    }
!    else
!    {
!    		rsgroup = apptMainBean.queryResults("searchmygroupall");
!    }
     while (rsgroup.next()) { 
       if(!(rsgroup.getString("mygroup_no").equals(oldNo)) ) {

Index: provideraddarecordhtm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/provideraddarecordhtm.jsp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** provideraddarecordhtm.jsp	24 Nov 2010 03:52:19 -0000	1.40
--- provideraddarecordhtm.jsp	30 Nov 2010 08:17:54 -0000	1.41
***************
*** 2,5 ****
--- 2,7 ----
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
  <%@ taglib uri="/WEB-INF/caisi-tag.tld" prefix="caisi"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
  <%@ page
  	import="java.util.*, oscar.oscarProvider.data.*"%>
***************
*** 33,36 ****
--- 35,50 ----
    suggestProviderNo = "000000".substring(suggestProviderNo.length()) + suggestProviderNo;
  %>
+ 
+ <%
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <!--
  /*
***************
*** 144,148 ****
  		<td>
  <% SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
! List<Site> sites = siteDao.getAllActiveSites(); 
  for (int i=0; i<sites.size(); i++) {
  %>		
--- 158,162 ----
  		<td>
  <% SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
! List<Site> sites = ( isSiteAccessPrivacy ? siteDao.getActiveSitesByProviderNo(curProvider_no) : siteDao.getAllActiveSites()); 
  for (int i=0; i<sites.size(); i++) {
  %>		

Index: logReport.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/logReport.jsp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** logReport.jsp	6 Oct 2010 21:52:12 -0000	1.17
--- logReport.jsp	30 Nov 2010 08:17:54 -0000	1.18
***************
*** 31,34 ****
--- 31,36 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
  <%
  if(session.getAttribute("user") == null )
***************
*** 36,41 ****
--- 38,51 ----
  String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
  String curUser_no = (String)session.getAttribute("user");
+ 
+ boolean isSiteAccessPrivacy=false;
  %>
  
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ 
  <%
    String   tdTitleColor = "#CCCC99";
***************
*** 55,59 ****
    Properties propName = new   Properties();
    // select provider list
!   sql   = "select * from provider p order by p.first_name, p.last_name ";
    ResultSet rs = dbObj.queryResults(sql);
  
--- 65,74 ----
    Properties propName = new   Properties();
    // select provider list
!   if (isSiteAccessPrivacy) { 
!  	sql = "select p.* from provider p INNER JOIN providersite s ON p.provider_no = s.provider_no WHERE s.site_id IN (SELECT site_id from providersite where provider_no=" + curUser_no + ") order by p.first_name, p.last_name"; 
!   }
!   else {
!   	sql = "select * from provider p order by p.first_name, p.last_name ";
!   }
    ResultSet rs = dbObj.queryResults(sql);
  
***************
*** 179,184 ****
        if("*".equals(providerNo)) {
  		  bAll = true;
! 	      sql = "select * from log force index (datetime) where dateTime <= ?";
! 	      sql += " and dateTime >= ? and content like '" + content + "' order by dateTime desc ";
        }
        rs = dbObj.queryResults(sql, params);
--- 194,207 ----
        if("*".equals(providerNo)) {
  		  bAll = true;
! 		   if (isSiteAccessPrivacy)   { 
! 			      sql = "select * from log force index (datetime) where dateTime <= ?";
! 			      sql += " and dateTime >= ? and content like '" + content + "' ";
! 			      sql += "and provider_no IN (SELECT provider_no FROM providersite WHERE site_id IN (SELECT site_id from providersite where provider_no= " + curUser_no +") )";
! 			      sql += " order by dateTime desc ";
! 		   }
! 		   else {
! 		      sql = "select * from log force index (datetime) where dateTime <= ?";
! 		      sql += " and dateTime >= ? and content like '" + content + "' order by dateTime desc ";
! 		   }
        }
        rs = dbObj.queryResults(sql, params);

Index: unLock.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/unLock.jsp,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** unLock.jsp	24 Nov 2010 04:10:03 -0000	1.10
--- unLock.jsp	30 Nov 2010 08:17:54 -0000	1.11
***************
*** 38,41 ****
--- 38,50 ----
  
  <%
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ 
+ <%
    String ip = request.getRemoteAddr();
    String msg = "Unlock";
***************
*** 55,58 ****
--- 64,86 ----
      }
    } 
+   
+   //multi-office limit
+   if (isSiteAccessPrivacy && vec.size() > 0) {
+ 	  DBHelp dbObj = new DBHelp(); 
+ 	  String sqlString = "select user_name from security p inner join providersite s ON p.provider_no = s.provider_no WHERE s.site_id IN (SELECT site_id from providersite where provider_no=" + curUser_no + ")";
+ 	  
+ 	  ResultSet rs = dbObj.searchDBRecord(sqlString);
+ 	  List<String> userList = new ArrayList<String>();
+ 	  if (rs.next()) {
+ 		  userList.add(rs.getString(1));
+ 	  }
+ 	  
+ 	  for(int i=0; i<vec.size(); i++) {
+ 		  if (!userList.contains((String)vec.get(i))) {
+ 			  vec.remove((String)vec.get(i));
+ 		  }
+ 	  }
+   }
+   
  %>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>

Index: providerupdateprovider.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/providerupdateprovider.jsp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** providerupdateprovider.jsp	24 Nov 2010 03:52:19 -0000	1.34
--- providerupdateprovider.jsp	30 Nov 2010 08:17:54 -0000	1.35
***************
*** 37,44 ****
--- 37,46 ----
   */
  -->
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  
  <%@page import="org.oscarehr.common.dao.SiteDao"%>
  <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
  <%@page import="org.oscarehr.common.model.Site"%>
+ <%@page import="oscar.login.*"%>
  <%@page import="org.oscarehr.PMmodule.dao.ProviderDao"%><html:html locale="true">
  <head>
***************
*** 56,59 ****
--- 58,86 ----
  </head>
  
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+ 
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+ 	List<Integer> siteIDs = new ArrayList<Integer>();
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%
+ 	isSiteAccessPrivacy=true; 
+ 	DBHelp dbObj = new DBHelp();
+ 	String sqlString = "SELECT site_id from providersite where provider_no=" + curProvider_no;
+ 	ResultSet siters = dbObj.searchDBRecord(sqlString);
+ 
+ 	while (siters.next()) {
+ 		siteIDs.add(siters.getInt("site_id"));
+ 	}
+ 	
+ 	siters.close();
+ 	%>
+ </security:oscarSec>
+ 
  <body background="../images/gray_bg.jpg" bgproperties="fixed"
  	onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
***************
*** 119,123 ****
  for (int i=0; i<sites.size(); i++) {
  %>		
! 	<input type="checkbox" name="sites" value="<%= sites.get(i).getSiteId() %>" <%= psites.contains(sites.get(i))?"checked='checked'":"" %>><%= sites.get(i).getName() %><br />
  <%
  }
--- 146,151 ----
  for (int i=0; i<sites.size(); i++) {
  %>		
! 	<input type="checkbox" name="sites" value="<%= sites.get(i).getSiteId() %>" <%= psites.contains(sites.get(i))?"checked='checked'":"" %> <%=((!isSiteAccessPrivacy) || siteIDs.contains(sites.get(i).getSiteId()) ? "" : " disabled ") %>>
! 	<%= sites.get(i).getName() %><br />
  <%
  }

Index: provideraddarecord.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/provideraddarecord.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** provideraddarecord.jsp	8 Oct 2010 14:01:20 -0000	1.27
--- provideraddarecord.jsp	30 Nov 2010 08:17:54 -0000	1.28
***************
*** 3,6 ****
--- 3,11 ----
      if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
  %>
  <security:oscarSec roleName="<%=roleName$%>"
***************
*** 10,13 ****
--- 15,22 ----
  </security:oscarSec>
  
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
***************
*** 16,19 ****
--- 25,33 ----
  <%@ page import="oscar.log.LogAction,oscar.log.LogConst"%>
  <%@ page import="oscar.log.*, oscar.oscarDB.*"%>
+ 
+ <%@page import="org.oscarehr.common.dao.SiteDao"%>
+ <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
+ <%@page import="org.oscarehr.common.model.Site"%>
+ 
  <%@ page
  	import="org.apache.commons.lang.StringEscapeUtils,oscar.oscarProvider.data.ProviderBillCenter,oscar.util.SqlUtils"%>
***************
*** 90,93 ****
--- 104,167 ----
    param[20]=(String)session.getAttribute("user");
  }
+   
+ //multi-office provide id formalize check, can be turn off on properties multioffice.formalize.provider.id
+ boolean isProviderFormalize = true;
+ String  errMsgProviderFormalize = "admin.provideraddrecord.msgAdditionFailure";
+ Integer min_value = 0;
+ Integer max_value = 0;
+ 
+ if (org.oscarehr.common.IsPropertiesOn.isProviderFormalizeEnable()) {
+ 
+ 	String StrProviderId = request.getParameter("provider_no");
+ 	OscarProperties props = OscarProperties.getInstance();
+ 
+ 	String[] provider_sites = {};
+ 	
+ 	// get provider id ranger
+ 	if (request.getParameter("provider_type").equalsIgnoreCase("doctor")) {
+ 		//provider is doctor, get provider id range from Property
+ 		min_value = new Integer(props.getProperty("multioffice.formalize.doctor.minimum.provider.id", ""));
+ 		max_value = new Integer(props.getProperty("multioffice.formalize.doctor.maximum.provider.id", ""));
+ 	}
+ 	else {
+ 		//non-doctor role
+ 		provider_sites = request.getParameterValues("sites");
+ 		provider_sites = (provider_sites == null ? new String[] {} : provider_sites);
+ 		
+ 		if (provider_sites.length > 1) {
+ 			//non-doctor can only have one site
+ 			isProviderFormalize = false;
+ 			errMsgProviderFormalize = "admin.provideraddrecord.msgFormalizeProviderIdMultiSiteFailure";
+ 		}
+ 		else {
+ 			if (provider_sites.length == 1) {
+ 				//get provider id range from site
+ 				String provider_site_id =  provider_sites[0];
+ 				SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
+ 				Site provider_site = siteDao.getById(new Integer(provider_site_id));
+ 				min_value = provider_site.getProviderIdFrom();
+ 				max_value = provider_site.getProviderIdTo();
+ 			}
+ 		}
+ 	}
+ 	if (isProviderFormalize) {
+ 		try {
+ 			    Integer providerId = Integer.parseInt(StrProviderId);
+ 			    if (request.getParameter("provider_type").equalsIgnoreCase("doctor") ||  provider_sites.length == 1) {
+ 				    if  (!(providerId >= min_value && providerId <=max_value)) {
+ 				    	// providerId is not in the range
+ 						isProviderFormalize = false;
+ 						errMsgProviderFormalize = "admin.provideraddrecord.msgFormalizeProviderIdFailure";
+ 				    }
+ 			    }
+ 		} catch(NumberFormatException e) {
+ 			//providerId is not a number
+ 			isProviderFormalize = false;
+ 			errMsgProviderFormalize = "admin.provideraddrecord.msgFormalizeProviderIdFailure";
+ 		}
+ 	}
+ }
+ 
+ if (!org.oscarehr.common.IsPropertiesOn.isProviderFormalizeEnable() || isProviderFormalize) {
  for(int i=0; i< param.length; i++)
  {
***************
*** 158,161 ****
--- 232,245 ----
  <%
    }
+ }
+ else {
+ 		if 	(!isProviderFormalize) {
+ 	%>
+ 		<h1><bean:message key="<%=errMsgProviderFormalize%>" /> </h1>
+ 		Provider # range from : <%=min_value %> To : <%=max_value %>
+ 	<%		
+ 		}
+ 	}
+   //apptMainBean.closePstmtConn();
  
  %> <%@ include file="footer2htm.jsp"%></center>

Index: sitesAdminDetail.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/sitesAdminDetail.jsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** sitesAdminDetail.jsp	15 May 2010 22:10:50 -0000	1.4
--- sitesAdminDetail.jsp	30 Nov 2010 08:17:54 -0000	1.5
***************
*** 102,105 ****
--- 102,109 ----
  	</nested:select></td></tr>
  	<tr><td>Postal Code:</td><td><nested:text property="site.postal"></nested:text></td></tr>
+    <% if (org.oscarehr.common.IsPropertiesOn.isProviderFormalizeEnable()) { %>  	
+ 		<tr><td>ProviderID From:</td><td><nested:text property="site.providerIdFrom"></nested:text></td></tr>
+ 		<tr><td>ProviderID To:</td><td><nested:text property="site.providerIdTo"></nested:text></td></tr>
+ 	<% } %>
  	</table>
  

Index: securitysearchresults.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/securitysearchresults.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** securitysearchresults.jsp	30 Jul 2010 02:32:32 -0000	1.12
--- securitysearchresults.jsp	30 Nov 2010 08:17:54 -0000	1.13
***************
*** 24,28 ****
   */
  -->
! 
  <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
--- 24,28 ----
   */
  -->
! <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
***************
*** 61,64 ****
--- 61,76 ----
      </script>
  </head>
+ 
+ <%
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <body background="../images/gray_bg.jpg" bgproperties="fixed"
  	onLoad="setfocus()" topmargin="0" leftmargin="0" rightmargin="0">
***************
*** 89,94 ****
  		<td valign="middle" rowspan="2" ALIGN="left"><input type="text"
  			NAME="keyword" SIZE="17" MAXLENGTH="100"> <INPUT
! 			TYPE="hidden" NAME="orderby" VALUE="user_name"> <INPUT
! 			TYPE="hidden" NAME="dboperation" VALUE="security_search_titlename">
  		<INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT
  			TYPE="hidden" NAME="limit2" VALUE="10"> <INPUT TYPE="hidden"
--- 101,114 ----
  		<td valign="middle" rowspan="2" ALIGN="left"><input type="text"
  			NAME="keyword" SIZE="17" MAXLENGTH="100"> <INPUT
! 			TYPE="hidden" NAME="orderby" VALUE="user_name"> 
! 			<%if (isSiteAccessPrivacy)  {%>	 
! 				<INPUT	TYPE="hidden" NAME="dboperation" VALUE="site_security_search_titlename">
! 			<%}
! 			  else	  {
! 			 %>
! 				<INPUT	TYPE="hidden" NAME="dboperation" VALUE="security_search_titlename">
! 			 <%
! 			  }
! 			%>				
  		<INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT
  			TYPE="hidden" NAME="limit2" VALUE="10"> <INPUT TYPE="hidden"

Index: sitesAdmin.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/sitesAdmin.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sitesAdmin.jsp	15 May 2010 22:10:50 -0000	1.2
--- sitesAdmin.jsp	30 Nov 2010 08:17:54 -0000	1.3
***************
*** 87,91 ****
       <display-el:column property="province" title="Province" />
       <display-el:column property="postal" title="Postal Code" />
!           
    </display-el:table>
  		
--- 87,94 ----
       <display-el:column property="province" title="Province" />
       <display-el:column property="postal" title="Postal Code" />
!    <% if (org.oscarehr.common.IsPropertiesOn.isProviderFormalizeEnable()) { %>  
!      <display-el:column property="providerIdFrom" title="ProviderID From" />
!      <display-el:column property="providerIdTo" title="ProviderID To" />  
!    <% } %>   
    </display-el:table>
  		

Index: securitysearchrecordshtm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/securitysearchrecordshtm.jsp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** securitysearchrecordshtm.jsp	24 Nov 2010 03:52:19 -0000	1.9
--- securitysearchrecordshtm.jsp	30 Nov 2010 08:17:54 -0000	1.10
***************
*** 27,30 ****
--- 27,32 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
  <html:html locale="true">
  <head>
***************
*** 62,65 ****
--- 64,78 ----
  </table>
  
+ <%
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  <table cellspacing="0" cellpadding="2" width="100%" border="0"
  	BGCOLOR="#C4D9E7">
***************
*** 81,86 ****
  		<td valign="middle" rowspan="2" ALIGN="left"><input type="text"
  			NAME="keyword" SIZE="17" MAXLENGTH="100"> <INPUT
! 			TYPE="hidden" NAME="orderby" VALUE="user_name"> <INPUT
! 			TYPE="hidden" NAME="dboperation" VALUE="security_search_titlename">
  		<INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT
  			TYPE="hidden" NAME="limit2" VALUE="10"> <INPUT TYPE="hidden"
--- 94,107 ----
  		<td valign="middle" rowspan="2" ALIGN="left"><input type="text"
  			NAME="keyword" SIZE="17" MAXLENGTH="100"> <INPUT
! 			TYPE="hidden" NAME="orderby" VALUE="user_name"> 
! 			<%if (isSiteAccessPrivacy)  {%>	 
! 				<INPUT	TYPE="hidden" NAME="dboperation" VALUE="site_security_search_titlename">
! 			<%}
! 			  else	  {
! 			 %>
! 				<INPUT	TYPE="hidden" NAME="dboperation" VALUE="security_search_titlename">
! 			 <%
! 			  }
! 			%>	
  		<INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT
  			TYPE="hidden" NAME="limit2" VALUE="10"> <INPUT TYPE="hidden"

Index: securityaddarecord.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/securityaddarecord.jsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** securityaddarecord.jsp	24 Nov 2010 03:52:19 -0000	1.23
--- securityaddarecord.jsp	30 Nov 2010 08:17:54 -0000	1.24
***************
*** 29,32 ****
--- 29,44 ----
  </security:oscarSec>
  
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ 
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
***************
*** 165,169 ****
  			<option value="">-- select one --</option>
  <%
! 	List<Map> resultList = oscarSuperManager.find("adminDao", "provider_search_providerno", new Object[] {});
  	for (Map provider : resultList) {
  %>
--- 177,189 ----
  			<option value="">-- select one --</option>
  <%
! 	List<Map> resultList ; 
!     if (isSiteAccessPrivacy) {
!     	Object[] param =new Object[1];
!     	param[0] = curProvider_no;
!     	resultList = oscarSuperManager.find("adminDao", "site_provider_search_providerno", param);
!     }
!     else {
!     	resultList = oscarSuperManager.find("adminDao", "provider_search_providerno", new Object[] {});
!     }
  	for (Map provider : resultList) {
  %>

Index: providersearchrecordshtm.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/admin/providersearchrecordshtm.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** providersearchrecordshtm.jsp	24 Nov 2010 03:52:19 -0000	1.12
--- providersearchrecordshtm.jsp	30 Nov 2010 08:17:54 -0000	1.13
***************
*** 27,30 ****
--- 27,46 ----
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+ 
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
  
  <html:html locale="true">
***************
*** 102,107 ****
  		<td valign="middle" rowspan="2" ALIGN="left"><input type="text"
  			NAME="keyword" SIZE="17" MAXLENGTH="100"> <INPUT
! 			TYPE="hidden" NAME="orderby" VALUE="last_name"> <INPUT
! 			TYPE="hidden" NAME="dboperation" VALUE="provider_search_titlename">
  		<INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT
  			TYPE="hidden" NAME="limit2" VALUE="10"> <INPUT TYPE="hidden"
--- 118,132 ----
  		<td valign="middle" rowspan="2" ALIGN="left"><input type="text"
  			NAME="keyword" SIZE="17" MAXLENGTH="100"> <INPUT
! 			TYPE="hidden" NAME="orderby" VALUE="last_name"> 
! 			<%if (isSiteAccessPrivacy)  {%>	 
! 				<INPUT	TYPE="hidden" NAME="dboperation" VALUE="site_provider_search_titlename">
! 			<%}
! 			  else	  {
! 			 %>
! 				<INPUT	TYPE="hidden" NAME="dboperation" VALUE="provider_search_titlename">
! 			 <%
! 			  }
! 			%>				
! 			
  		<INPUT TYPE="hidden" NAME="limit1" VALUE="0"> <INPUT
  			TYPE="hidden" NAME="limit2" VALUE="10"> <INPUT TYPE="hidden"

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/billing/CA/ON billingONMRI.jsp, 1.11, 1.12 billingONOhipSimulation.jsp, 1.7, 1.8 billingONCorrection.jsp, 1.22, 1.23 onGenRA.jsp, 1.5, 1.6 billingONStatus.jsp, 1.20, 1.21

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/billing/CA/ON

Modified Files:
	billingONMRI.jsp billingONOhipSimulation.jsp 
	billingONCorrection.jsp onGenRA.jsp billingONStatus.jsp 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: billingONMRI.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONMRI.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** billingONMRI.jsp	24 Nov 2010 02:46:43 -0000	1.11
--- billingONMRI.jsp	30 Nov 2010 08:17:55 -0000	1.12
***************
*** 18,31 ****
--- 18,66 ----
   -->
  <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ <%@ page import="oscar.login.DBHelp"%>
+ 
  <%
+ 	if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+ 	String curProvider_no = (String) session.getAttribute("user");
      if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
      boolean isTeamBillingOnly=false;
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%=roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isTeamAccessPrivacy=true; %>
+ </security:oscarSec>
  
  
+ <% 
+ HashMap<String,String> providerMap = new HashMap<String,String>();
+ //multisites function
+ if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+ 	String sqlStr = "select provider_no from provider ";
+ 	if (isSiteAccessPrivacy) 
+ 		sqlStr = "select distinct p.provider_no from provider p inner join providersite s on s.provider_no = p.provider_no " 
+ 		 + " where s.site_id in (select site_id from providersite where provider_no = " + curProvider_no + ")";
+ 	if (isTeamAccessPrivacy) 
+ 		sqlStr = "select distinct p.provider_no from provider p where team in (select team from provider "
+ 				+ " where team is not null and team <> '' and provider_no = " + curProvider_no + ")";
+ 	DBHelp dbObj = new DBHelp();
+ 	ResultSet rs = dbObj.searchDBRecord(sqlStr);
+ 	while (rs.next()) {
+ 		providerMap.put(rs.getString("provider_no"),"true");
+ 	}
+ 	rs.close();
+ }
+ %>
+ 
+ <%@ page language="java" contentType="text/html; charset=ISO-8859-1"
+ 	pageEncoding="ISO-8859-1"%>
  <%@ page import="java.util.*,java.sql.*,oscar.*,oscar.util.*,java.net.*"
  	errorPage="errorpage.jsp"%>
***************
*** 172,176 ****
  		<td width="254"><select name="provider">
  			<%
! 			List providerStr = isTeamBillingOnly ? prep.getTeamProviderBillingStr(user_no) : prep.getProviderBillingStr();
  			
  			
--- 207,221 ----
  		<td width="254"><select name="provider">
  			<%
! 			List providerStr; 
! 			
! 			if (isTeamBillingOnly || isTeamAccessPrivacy) {
! 				providerStr = prep.getTeamProviderBillingStr(user_no);
! 			}
! 			else if (isSiteAccessPrivacy) {
! 				providerStr = prep.getSiteProviderBillingStr(user_no);
! 			}
! 			else {
! 				providerStr = prep.getProviderBillingStr();
! 			}
  			
  			
***************
*** 249,252 ****
--- 294,303 ----
  					String bgColor = count%2==0?yearColor:"ivory";
  					if(!updatedate.equals(createdate)) bgColor = "silver";
+ 					
+ 				    //multisites. skip record if not belong to same site/team
+ 				    if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+ 				    	if(providerMap.get(pro_no)== null)  continue;
+ 				    }
+ 
  %>
  

Index: onGenRA.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/onGenRA.jsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** onGenRA.jsp	2 Oct 2009 21:38:22 -0000	1.5
--- onGenRA.jsp	30 Nov 2010 08:17:55 -0000	1.6
***************
*** 22,30 ****
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
      boolean isTeamBillingOnly=false;
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%=roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
! 
  
  <% 
--- 22,37 ----
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
      boolean isTeamBillingOnly=false;
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%=roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
! <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
! 	<%isSiteAccessPrivacy=true; %>
! </security:oscarSec>
! <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
! 	<%isTeamAccessPrivacy=true; %>
! </security:oscarSec>
  
  <% 
***************
*** 133,138 ****
  
  	<% 
- List aL = isTeamBillingOnly? dbObj.getTeamRahd("D", (String) session.getAttribute("user")) : dbObj.getAllRahd("D");
  
  
  for(int i = 0; i < aL.size(); i++) {
--- 140,155 ----
  
  	<% 
  
+ List aL;
+ 
+ if (isTeamBillingOnly || isTeamAccessPrivacy) {
+ 	aL = dbObj.getTeamRahd("D", (String) session.getAttribute("user"));
+ }
+ else if (isSiteAccessPrivacy) {
+ 	aL = dbObj.getSiteRahd("D", (String) session.getAttribute("user"));
+ }
+ else {
+ 	aL =  dbObj.getAllRahd("D");
+ }
  
  for(int i = 0; i < aL.size(); i++) {

Index: billingONOhipSimulation.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONOhipSimulation.jsp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** billingONOhipSimulation.jsp	24 Nov 2010 04:10:03 -0000	1.7
--- billingONOhipSimulation.jsp	30 Nov 2010 08:17:55 -0000	1.8
***************
*** 18,31 ****
   */
   -->
!  
  <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  <%
      if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
      boolean isTeamBillingOnly=false;
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%=roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
  
  <% 
--- 18,42 ----
   */
   -->
!  <%! boolean bMultisites = org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
  <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ <%@ page import="java.math.*, java.util.*, oscar.util.*"%>
  <%
      if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
      boolean isTeamBillingOnly=false;
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%=roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isTeamAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ 
  
  <% 
***************
*** 34,37 ****
--- 45,49 ----
  %>
  
+ 
  <%@ page
  	import="java.util.*, java.sql.*, oscar.*, oscar.util.*, java.net.*"
***************
*** 122,127 ****
  	
  	dbObj.setBatchHeaderObj(bhObj);
! 	dbObj.createBillingFileStr("0", "(status='O' or status='W' or status='I')");
! 
  	htmlValue = "<font color='red'>" + errorMsg + "</font>" + dbObj.getHtmlValue();
  	request.setAttribute("html",htmlValue);
--- 134,143 ----
  	
  	dbObj.setBatchHeaderObj(bhObj);
! 	if (bMultisites) {
! 		dbObj.createSiteBillingFileStr("0", "(status='O' or status='W' or status='I')");
! 	}
! 	else {
! 		dbObj.createBillingFileStr("0", "(status='O' or status='W' or status='I')");
! 	}
  	htmlValue = "<font color='red'>" + errorMsg + "</font>" + dbObj.getHtmlValue();
  	request.setAttribute("html",htmlValue);
***************
*** 202,207 ****
  			
  			
! 		List providerStr = isTeamBillingOnly? prep.getTeamProviderBillingStr(user_no) : prep.getProviderBillingStr();
! 		
  		
  		for (int i = 0; i < providerStr.size(); i++) {
--- 218,232 ----
  			
  			
! 		List providerStr; 
! 			
! 		if (isTeamBillingOnly || isTeamAccessPrivacy) {
! 			providerStr = prep.getTeamProviderBillingStr(user_no);
! 		}
! 		else if (isSiteAccessPrivacy) {
! 			providerStr = prep.getSiteProviderBillingStr(user_no);
! 		}
! 		else {
! 			providerStr = prep.getProviderBillingStr();
! 		}
  		
  		for (int i = 0; i < providerStr.size(); i++) {

Index: billingONCorrection.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONCorrection.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** billingONCorrection.jsp	24 Nov 2010 03:55:33 -0000	1.22
--- billingONCorrection.jsp	30 Nov 2010 08:17:55 -0000	1.23
***************
*** 17,22 ****
   */
  -->
! <%! boolean bMultisites = org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
! 
  <%// start
  			if (session.getAttribute("user") == null)
--- 17,34 ----
   */
  -->
! <%! boolean bMultisites = org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();
! 	List<String> mgrSites = new ArrayList<String>();	
! %>
! <% 
! if (bMultisites) 
! { 
!         	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
!           	List<Site> sites = siteDao.getActiveSitesByProviderNo((String) session.getAttribute("user"));
!           	for (Site s : sites) {
!           		mgrSites.add(s.getName());
!           	}
! }         	
!  %>         	
! <%@ page import="oscar.login.DBHelp"%>
  <%// start
  			if (session.getAttribute("user") == null)
***************
*** 69,79 ****
  <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  <%
!     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
!     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
  	boolean isTeamBillingOnly=false; 
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%= roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
  
  <%@ page import="java.math.*,java.util.*,java.sql.*,oscar.*,java.net.*"
--- 81,125 ----
  <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
  <%
! 	if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
! 	String curProvider_no = (String) session.getAttribute("user");
! 	
! 	if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
! 	String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
! 
  	boolean isTeamBillingOnly=false; 
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
+     
+ 	boolean isMultiSiteProvider = true;
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%= roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isTeamAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ <% 
+ HashMap<String,String> providerMap = new HashMap<String,String>();
+ //multisites function
+ if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+ 	String sqlStr = "select provider_no from provider ";
+ 	if (isSiteAccessPrivacy) 
+ 		sqlStr = "select distinct p.provider_no from provider p inner join providersite s on s.provider_no = p.provider_no " 
+ 		 + " where s.site_id in (select site_id from providersite where provider_no = " + curProvider_no + ")";
+ 	if (isTeamAccessPrivacy) 
+ 		sqlStr = "select distinct p.provider_no from provider p where team in (select team from provider "
+ 				+ " where team is not null and team <> '' and provider_no = " + curProvider_no + ")";
+ 	DBHelp dbObj = new DBHelp();
+ 	ResultSet rs = dbObj.searchDBRecord(sqlStr);
+ 	while (rs.next()) {
+ 		providerMap.put(rs.getString("provider_no"),"true");
+ 	}
+ 	rs.close();
+ }
+ %>
  
  <%@ page import="java.math.*,java.util.*,java.sql.*,oscar.*,java.net.*"
***************
*** 275,280 ****
  					recordObj = obj.getBillingRecordObj(billNo);
  					if (recordObj != null && recordObj.size() > 0) {
  						ch1Obj = (BillingClaimHeader1Data) recordObj.get(0);
! 
  						UpdateDate = ch1Obj.getUpdate_datetime(); //.substring(0,10);
  						DemoNo = ch1Obj.getDemographic_no();
--- 321,332 ----
  					recordObj = obj.getBillingRecordObj(billNo);
  					if (recordObj != null && recordObj.size() > 0) {
+ 						
  						ch1Obj = (BillingClaimHeader1Data) recordObj.get(0);
! 						
! 						//multisite. check provider no
! 					    if ((isSiteAccessPrivacy || isTeamAccessPrivacy) && (providerMap.get(ch1Obj.getProviderNo())== null || !mgrSites.contains(ch1Obj.getClinic())))
! 					    		isMultiSiteProvider = false;
! 						
! 					    if 	(isMultiSiteProvider) {	
  						UpdateDate = ch1Obj.getUpdate_datetime(); //.substring(0,10);
  						DemoNo = ch1Obj.getDemographic_no();
***************
*** 317,320 ****
--- 369,393 ----
  						//paid = ch1Obj.getPaid();
  					}
+ 					    else {
+ 							UpdateDate = "";
+ 							DemoNo = "";
+ 							DemoName = "";
+ 							DemoAddress = "";
+ 							DemoCity = "";
+ 							DemoProvince = "";
+ 							DemoPostal = "";
+ 							DemoDOB = "";
+ 							DemoSex = "";		
+ 							r_doctor = "";
+ 							r_doctor_ohip_s = "";
+ 							r_doctor_s = "";
+ 							m_review = ch1Obj.getMan_review();
+ 							specialty = "";
+ 							r_status = "";
+ 							roster_status = "";
+ 							
+ 							out.write("<script>window.alert('sorry, billing access denied.')</script>");
+ 					    }
+ 					}
  				}
  
***************
*** 607,614 ****
          	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
            	List<Site> sites = siteDao.getActiveSitesByProviderNo((String) session.getAttribute("user"));
!           	// now get all providers eligible         	
! 			List pList = isTeamBillingOnly
! 					? (Vector) (new JdbcBillingPageUtil()).getCurTeamProviderStr((String) session.getAttribute("user"))
! 					: (Vector) (new JdbcBillingPageUtil()).getCurProviderStr();
            	HashSet<String> pros=new HashSet<String>();
            	for (Object s:pList) {
--- 680,698 ----
          	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
            	List<Site> sites = siteDao.getActiveSitesByProviderNo((String) session.getAttribute("user"));
!           	// now get all providers eligible
!           	
!           	
! 			List pList; 
! 			
! 			if (isTeamBillingOnly || isTeamAccessPrivacy) {
! 				pList = (new JdbcBillingPageUtil()).getCurTeamProviderStr((String) session.getAttribute("user"));
! 			}
! 			else if (isSiteAccessPrivacy) {
! 				pList = (new JdbcBillingPageUtil()).getCurSiteProviderStr((String) session.getAttribute("user"));
! 			}
! 			else {
! 				pList = (Vector) (new JdbcBillingPageUtil()).getCurProviderStr();
! 			}
! 			
            	HashSet<String> pros=new HashSet<String>();
            	for (Object s:pList) {
***************
*** 653,659 ****
  			<%
  			
! 			List pList = isTeamBillingOnly
! 					? (Vector) (new JdbcBillingPageUtil()).getCurTeamProviderStr((String) session.getAttribute("user"))
! 					: (Vector) (new JdbcBillingPageUtil()).getCurProviderStr();
  										
  					
--- 737,751 ----
  			<%
  			
! 			List pList; 
! 			
! 			if (isTeamBillingOnly || isTeamAccessPrivacy) {
! 				pList = (new JdbcBillingPageUtil()).getCurTeamProviderStr((String) session.getAttribute("user"));
! 			}
! 			else if (isSiteAccessPrivacy) {
! 				pList = (new JdbcBillingPageUtil()).getCurSiteProviderStr((String) session.getAttribute("user"));
! 			}
! 			else {
! 				pList = (Vector) (new JdbcBillingPageUtil()).getCurProviderStr();
! 			}
  										
  					
***************
*** 727,730 ****
--- 819,825 ----
  					if (recordObj.size() > 1) {
  						for (int i = 1; i < recordObj.size(); i++) {
+ 							//multisite. skip display if billing provider_no not in current access privacy 
+ 							if (!isMultiSiteProvider) continue;
+ 							
  							itemObj = (BillingItemData) recordObj.get(i);
  

Index: billingONStatus.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/billing/CA/ON/billingONStatus.jsp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** billingONStatus.jsp	24 Nov 2010 04:30:22 -0000	1.20
--- billingONStatus.jsp	30 Nov 2010 08:17:55 -0000	1.21
***************
*** 35,44 ****
--- 35,75 ----
      String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
      boolean isTeamBillingOnly=false;
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
  %>
  <security:oscarSec objectName="_team_billing_only" roleName="<%=roleName$ %>" rights="r" reverse="false">
  <% isTeamBillingOnly=true; %>
  </security:oscarSec>
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%isTeamAccessPrivacy=true; %>
+ </security:oscarSec>
  
  <%
+ 	//multi-site office , save all bgcolor to Hashmap
+ 	HashMap<String,String> siteBgColor = new HashMap<String,String>();
+ 	HashMap<String,String> siteShortName = new HashMap<String,String>();
+ 	if (bMultisites) {
+     	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
+     	
+     	List<Site> sites = siteDao.getAllSites();
+     	for (Site st : sites) {
+     		siteBgColor.put(st.getName(),st.getBgColor());
+     		siteShortName.put(st.getName(),st.getShortName());
+     	}
+ 	}
+ %>
+ 
+ <%//
+ response.setHeader("Pragma","no-cache"); //HTTP 1.0
+ response.setHeader("Cache-Control","no-cache"); //HTTP 1.1
+ response.setDateHeader("Expires", 0); //prevents caching at the proxy server
+ response.setHeader("Cache-Control", "private"); // HTTP 1.1 
+ response.setHeader("Cache-Control", "no-store"); // HTTP 1.1 
+ response.setHeader("Cache-Control", "max-stale=0"); // HTTP 1.1 
+ 
+ 
  boolean bSearch = true;
  String[] billType = request.getParameterValues("billType");
***************
*** 65,68 ****
--- 96,101 ----
  String filename = request.getParameter("demographicNo");
  
+ String selectedSite = (String) request.getParameter("site");
+ 
  if ( statusType == null ) { statusType = "O"; } 
  if ( "_".equals(statusType) ) { demoNo = "";}
***************
*** 386,397 ****
  <% } %>
  function changeSite(sel) {
! 	sel.form.providerview.innerHTML=sel.value=="none"?"":_providers[sel.value];
  	sel.style.backgroundColor=sel.options[sel.selectedIndex].style.backgroundColor;
! 	if (sel.value!="none") {
  		if (document.serviceform.provider_ohipNo.value!='')
  			sel.form.providerview.value='<%=request.getParameter("providerview")%>';
  	}
  	changeProvider(false);
- 	
  }
        </script>
--- 419,429 ----
  <% } %>
  function changeSite(sel) {
! 	sel.form.providerview.innerHTML=sel.value=="none"?"":"<option value='none'>---select provider---</option>"+_providers[sel.value];
  	sel.style.backgroundColor=sel.options[sel.selectedIndex].style.backgroundColor;
! 	if (sel.value=='<%=request.getParameter("site")%>') {
  		if (document.serviceform.provider_ohipNo.value!='')
  			sel.form.providerview.value='<%=request.getParameter("providerview")%>';
  	}
  	changeProvider(false);
  }
        </script>
***************
*** 422,426 ****
  			} else {
  			%>
!        <option value="">All Providers</option>
      <% for (int i = 0 ; i < pList.size(); i++) { 
  		String temp[] = ((String) pList.get(i)).split("\\|");
--- 454,458 ----
  			} else {
  			%>
!        <option value="all">All Providers</option>
      <% for (int i = 0 ; i < pList.size(); i++) { 
  		String temp[] = ((String) pList.get(i)).split("\\|");
***************
*** 573,576 ****
--- 605,611 ----
               <th>ACCOUNT</th>
               <th>MESSAGES</th>
+ 		<% if (bMultisites) {%>
+ 			 <th>SITE</th>             
+         <% }%>     
            </tr>
         
***************
*** 584,588 ****
      	   
      	   if (bMultisites && ch1Obj.getClinic()!=null && curSite!=null 
!     			   && !ch1Obj.getClinic().equals(curSite))
  				continue; // multisite: skip if the line doesn't belong to the selected clinic    		   
      		   
--- 619,623 ----
      	   
      	   if (bMultisites && ch1Obj.getClinic()!=null && curSite!=null 
!     			   && !ch1Obj.getClinic().equals(curSite) && isSiteAccessPrivacy) // only applies on user have siteAccessPrivacy (SiteManager)
  				continue; // multisite: skip if the line doesn't belong to the selected clinic    		   
      		   
***************
*** 637,640 ****
--- 672,677 ----
                     settleDate = settleDate.substring(0, settleDate.indexOf(" "));
                 }
+ 	       if (bMultisites && selectedSite != null && (!selectedSite.equals(ch1Obj.getClinic())))
+ 	    	   continue;
         %>       
            <tr <%=color %>> 
***************
*** 663,666 ****
--- 700,708 ----
                   <%=errorCode%>
               </td><!--MESSAGES-->
+              <% if (bMultisites) {%>
+ 				 <td "<%=(ch1Obj.getClinic()== null || ch1Obj.getClinic().equalsIgnoreCase("null") ? "" : "bgcolor='" + siteBgColor.get(ch1Obj.getClinic()) + "'")%>">
+ 				 	<%=(ch1Obj.getClinic()== null || ch1Obj.getClinic().equalsIgnoreCase("null") ? "" : siteShortName.get(ch1Obj.getClinic()))%>
+ 				 </td>     <!--SITE-->          
+         	<% }%>     
            </tr>
         <% } %>  
***************
*** 681,684 ****
--- 723,729 ----
               <td>&nbsp;</td><!--ACCOUNT-->
               <td>&nbsp;</td><!--MESSAGES-->
+              <% if (bMultisites) {%>
+ 				 <td>&nbsp;</td><!--SITE-->          
+         	<% }%>    
            </tr>
         <table>

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql oscarinit.sql, 1.270, 1.271 oscardata.sql, 1.107, 1.108

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/database/mysql

Modified Files:
	oscarinit.sql oscardata.sql 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: oscarinit.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscarinit.sql,v
retrieving revision 1.270
retrieving revision 1.271
diff -C2 -d -r1.270 -r1.271
*** oscarinit.sql	15 Nov 2010 15:07:21 -0000	1.270
--- oscarinit.sql	30 Nov 2010 08:17:55 -0000	1.271
***************
*** 280,283 ****
--- 280,284 ----
    urgency char(2) default NULL,
    patientWillBook tinyint(1),
+   site_name varchar(255) null,
    PRIMARY KEY  (requestId)
  ) ;
***************
*** 7990,7993 ****
--- 7991,7996 ----
    `postal` varchar(10) default '',
    `status` tinyint(4) NOT NULL default '0',
+   `providerId_from` int null,
+   `providerId_to` int null,
    PRIMARY KEY  (`site_id`),
    UNIQUE KEY `unique_name` (`name`),

Index: oscardata.sql
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/database/mysql/oscardata.sql,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** oscardata.sql	15 Nov 2010 15:00:16 -0000	1.107
--- oscardata.sql	30 Nov 2010 08:17:55 -0000	1.108
***************
*** 1728,1729 ****
--- 1728,1755 ----
  
  insert into gstControl set gstPercent = 5;
+ 
+ -- create security objects for multi-office control
+ insert into `secObjectName` 
+ 	(objectName, `description`, orgapplicable)
+ 	values
+ 	('_team_access_privacy', 'restrict access to only the same team of a provider', 0);
+ 
+ insert into `secObjectName` 
+ 	(objectName, `description`, orgapplicable)
+ 	values
+ 	('_site_access_privacy', 'restrict access to only the assigned sites of a provider', 0);
+ 
+ -- create new roles for multi-office control
+ insert into `secRole` 
+ 	(role_no, role_name, `description`)
+ SELECT 
+ 	 (SELECT MAX(role_no) from `secRole`)  +  1 AS role_no
+ 	,'Site Manager' AS role_name
+ 	,'Site Manager' AS `description`;
+ 
+ insert into `secRole` 
+ 	(role_no, role_name, `description`)
+ SELECT 
+ 	 (SELECT MAX(role_no) from `secRole`)  +  1 AS role_no
+ 	,'Partner Doctor' AS role_name
+ 	,'Partner Doctor' AS `description`;
\ No newline at end of file

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common IsPropertiesOn.java, 1.3, 1.4

[Victor <vic...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv3092/web/WEB-INF/classes/src/org/oscarehr/common

Modified Files:
	IsPropertiesOn.java 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: IsPropertiesOn.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/IsPropertiesOn.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IsPropertiesOn.java	2 Oct 2009 21:38:24 -0000	1.3
--- IsPropertiesOn.java	30 Nov 2010 08:17:54 -0000	1.4
***************
*** 50,53 ****
  		return propertiesOn("multisites");
  	}
! 	
  }
--- 50,56 ----
  		return propertiesOn("multisites");
  	}
! 
! 	public static boolean isProviderFormalizeEnable() {
! 		return propertiesOn("multioffice.formalize.provider.id");
! 	}
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/pageUtil PreventionReportDisplay.java, 1.4, 1.4.48.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9832

Modified Files:
      Tag: RELEASE_10_06
	PreventionReportDisplay.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: PreventionReportDisplay.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/pageUtil/PreventionReportDisplay.java,v
retrieving revision 1.4
retrieving revision 1.4.48.1
diff -C2 -d -r1.4 -r1.4.48.1
*** PreventionReportDisplay.java	25 Sep 2006 17:06:03 -0000	1.4
--- PreventionReportDisplay.java	29 Nov 2010 22:41:50 -0000	1.4.48.1
***************
*** 45,48 ****
--- 45,49 ----
     public String numShots = null;
     public String bonusStatus= null;
+    public String billStatus = null;
     
     //FollowUp Data

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports FOBTReport.java, 1.9, 1.9.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10012

Modified Files:
      Tag: RELEASE_10_06
	FOBTReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: FOBTReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/FOBTReport.java,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** FOBTReport.java	29 Jun 2010 20:22:59 -0000	1.9
--- FOBTReport.java	29 Nov 2010 22:42:13 -0000	1.9.2.1
***************
*** 78,81 ****
--- 78,82 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               Date prevDate = null;
               if(ineligible(prevs) || colonoscopywith5(colonoscopys,asofDate)){
***************
*** 133,136 ****
--- 134,138 ----
                  if (!refused && bonusStartDate.before(prevDate) && asofDate.after(prevDate) && !result.equalsIgnoreCase("pending") ){
                     prd.bonusStatus = "Y";
+                    prd.billStatus = "Y";
                     done++;
                  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports MammogramReport.java, 1.10.2.1, 1.10.2.2

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20659

Modified Files:
      Tag: RELEASE_10_06
	MammogramReport.java 
Log Message:
- ID: 3122624 set bill status to Y with grace state

Index: MammogramReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/MammogramReport.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -C2 -d -r1.10.2.1 -r1.10.2.2
*** MammogramReport.java	29 Nov 2010 22:42:49 -0000	1.10.2.1
--- MammogramReport.java	29 Nov 2010 23:15:00 -0000	1.10.2.2
***************
*** 156,159 ****
--- 156,160 ----
                     prd.color = "yellow"; //FF00FF
                     if(!prd.bonusStatus.equals("Y")){
+                        prd.billStatus = "Y";
                        doneWithGrace++;
                     }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports MammogramReport.java, 1.13, 1.14

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv20307

Modified Files:
	MammogramReport.java 
Log Message:
- ID: 3122624 set bill status to Y with grace state

Index: MammogramReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/MammogramReport.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** MammogramReport.java	29 Nov 2010 22:45:13 -0000	1.13
--- MammogramReport.java	29 Nov 2010 23:13:57 -0000	1.14
***************
*** 156,159 ****
--- 156,160 ----
                     prd.color = "yellow"; //FF00FF
                     if(!prd.bonusStatus.equals("Y")){
+                        prd.billStatus = "Y";
                        doneWithGrace++;
                     }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarPrevention PreventionReporting.jsp, 1.25, 1.26

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarPrevention
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11627

Modified Files:
	PreventionReporting.jsp 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: PreventionReporting.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarPrevention/PreventionReporting.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** PreventionReporting.jsp	15 Nov 2010 03:26:19 -0000	1.25
--- PreventionReporting.jsp	29 Nov 2010 22:46:42 -0000	1.26
***************
*** 433,437 ****
                              }
  
!                             if( dis.state != null && dis.bonusStatus.equals("Y")) {
                                setBill = true;
                              }
--- 433,437 ----
                              }
  
!                             if( dis.state != null && dis.billStatus.equals("Y")) {
                                setBill = true;
                              }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports PapReport.java, 1.11, 1.12

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11417

Modified Files:
	PapReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: PapReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/PapReport.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** PapReport.java	15 Nov 2010 01:27:32 -0000	1.11
--- PapReport.java	29 Nov 2010 22:45:32 -0000	1.12
***************
*** 77,80 ****
--- 77,81 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               if(ineligible(prevs)){
                  prd.rank = 5;
***************
*** 165,168 ****
--- 166,170 ----
                  if (!dateIsRefused && bonusStartDate.before(prevDate) && asofDate.after(prevDate)){
                     prd.bonusStatus = "Y";
+                    prd.billStatus = "Y";
                     done++;
                  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports MammogramReport.java, 1.12, 1.13

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv11281

Modified Files:
	MammogramReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: MammogramReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/MammogramReport.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MammogramReport.java	15 Nov 2010 01:27:32 -0000	1.12
--- MammogramReport.java	29 Nov 2010 22:45:13 -0000	1.13
***************
*** 75,78 ****
--- 75,79 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               Date prevDate = null;
               if(ineligible(prevs)){
***************
*** 131,134 ****
--- 132,136 ----
                  if (!refused && bonusStartDate.before(prevDate) && asofDate.after(prevDate) && !result.equalsIgnoreCase("pending")){
                     prd.bonusStatus = "Y";
+                    prd.billStatus = "Y";
                     done++;
                  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports FluReport.java, 1.13, 1.14

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10798

Modified Files:
	FluReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: FluReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/FluReport.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** FluReport.java	29 Nov 2010 19:13:25 -0000	1.13
--- FluReport.java	29 Nov 2010 22:44:56 -0000	1.14
***************
*** 78,81 ****
--- 78,82 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               
               Date[] begendDates =  getStartEndDate(asofDate);
***************
*** 169,175 ****
                  log.debug("bonusEl end date "+endOfYear+ " "+endOfYear.after(prevDate));                
                  log.debug("ASOFDATE "+asofDate);
!                 if (!refused && beginingOfYear.before(prevDate) && endOfYear.after(prevDate) && isOfAge(demo,asofDate)){
!                    prd.bonusStatus = "Y";
!                    done++;
                  }
                  //outcomes        
--- 170,182 ----
                  log.debug("bonusEl end date "+endOfYear+ " "+endOfYear.after(prevDate));                
                  log.debug("ASOFDATE "+asofDate);
!                 if (beginingOfYear.before(prevDate) && endOfYear.after(prevDate) && isOfAge(demo,asofDate)){
!                     if( refused ) {
!                         prd.billStatus = "Y";
!                     }
!                     else {
!                         prd.bonusStatus = "Y";
!                         prd.billStatus = "Y";
!                         done++;
!                     }
                  }
                  //outcomes        

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports FOBTReport.java, 1.11, 1.12

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10690

Modified Files:
	FOBTReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: FOBTReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/FOBTReport.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FOBTReport.java	15 Nov 2010 01:27:32 -0000	1.11
--- FOBTReport.java	29 Nov 2010 22:44:39 -0000	1.12
***************
*** 78,81 ****
--- 78,82 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               Date prevDate = null;
               if(ineligible(prevs) || colonoscopywith5(colonoscopys,asofDate)){
***************
*** 133,136 ****
--- 134,138 ----
                  if (!refused && bonusStartDate.before(prevDate) && asofDate.after(prevDate) && !result.equalsIgnoreCase("pending") ){
                     prd.bonusStatus = "Y";
+                    prd.billStatus = "Y";
                     done++;
                  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports ChildImmunizationReport.java, 1.17, 1.18

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10638

Modified Files:
	ChildImmunizationReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: ChildImmunizationReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/ChildImmunizationReport.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ChildImmunizationReport.java	15 Nov 2010 01:27:32 -0000	1.17
--- ChildImmunizationReport.java	29 Nov 2010 22:44:22 -0000	1.18
***************
*** 133,136 ****
--- 133,137 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               if (totalImmunizations == 0){// no info
                  prd.rank = 1;
***************
*** 228,231 ****
--- 229,233 ----
                      if (!refused && (totalImmunizations >= recommTotal  ) && lastDate.before(twoYearsAfterDOB) && ( ageInMonths > 24 )){//&& endOfYear.after(prevDate)){                  
                         prd.bonusStatus = "Y";
+                        prd.billStatus = "Y";
                         done++;
                      }

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

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/pageUtil
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10500

Modified Files:
	PreventionReportDisplay.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: PreventionReportDisplay.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/pageUtil/PreventionReportDisplay.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** PreventionReportDisplay.java	25 Sep 2006 17:06:03 -0000	1.4
--- PreventionReportDisplay.java	29 Nov 2010 22:43:51 -0000	1.5
***************
*** 45,48 ****
--- 45,49 ----
     public String numShots = null;
     public String bonusStatus= null;
+    public String billStatus = null;
     
     //FollowUp Data

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarPrevention PreventionReporting.jsp, 1.22.2.1, 1.22.2.2

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarPrevention
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10384

Modified Files:
      Tag: RELEASE_10_06
	PreventionReporting.jsp 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: PreventionReporting.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarPrevention/PreventionReporting.jsp,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -C2 -d -r1.22.2.1 -r1.22.2.2
*** PreventionReporting.jsp	1 Nov 2010 15:55:41 -0000	1.22.2.1
--- PreventionReporting.jsp	29 Nov 2010 22:43:28 -0000	1.22.2.2
***************
*** 435,439 ****
                              }
  
!                             if( dis.state != null && dis.bonusStatus.equals("Y")) {
                                setBill = true;                              
                              }
--- 435,439 ----
                              }
  
!                             if( dis.state != null && dis.billStatus.equals("Y")) {
                                setBill = true;                              
                              }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports PapReport.java, 1.8, 1.8.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10300

Modified Files:
      Tag: RELEASE_10_06
	PapReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: PapReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/PapReport.java,v
retrieving revision 1.8
retrieving revision 1.8.2.1
diff -C2 -d -r1.8 -r1.8.2.1
*** PapReport.java	29 Jun 2010 20:21:22 -0000	1.8
--- PapReport.java	29 Nov 2010 22:43:06 -0000	1.8.2.1
***************
*** 77,80 ****
--- 77,81 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               if(ineligible(prevs)){
                  prd.rank = 5;
***************
*** 165,168 ****
--- 166,170 ----
                  if (!dateIsRefused && bonusStartDate.before(prevDate) && asofDate.after(prevDate)){
                     prd.bonusStatus = "Y";
+                    prd.billStatus = "Y";
                     done++;
                  }
***************
*** 179,182 ****
--- 181,185 ----
                     if (!prd.bonusStatus.equals("Y")){
                        prd.bonusStatus = "Y";
+                       prd.billStatus = "Y";
                        doneWithGrace++;
                     }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports MammogramReport.java, 1.10, 1.10.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10188

Modified Files:
      Tag: RELEASE_10_06
	MammogramReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: MammogramReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/MammogramReport.java,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -C2 -d -r1.10 -r1.10.2.1
*** MammogramReport.java	29 Jun 2010 20:21:58 -0000	1.10
--- MammogramReport.java	29 Nov 2010 22:42:49 -0000	1.10.2.1
***************
*** 75,78 ****
--- 75,79 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               Date prevDate = null;
               if(ineligible(prevs)){
***************
*** 131,134 ****
--- 132,136 ----
                  if (!refused && bonusStartDate.before(prevDate) && asofDate.after(prevDate) && !result.equalsIgnoreCase("pending")){
                     prd.bonusStatus = "Y";
+                    prd.billStatus = "Y";
                     done++;
                  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports ChildImmunizationReport.java, 1.14, 1.14.2.1

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10082

Modified Files:
      Tag: RELEASE_10_06
	ChildImmunizationReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: ChildImmunizationReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/ChildImmunizationReport.java,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** ChildImmunizationReport.java	29 Jun 2010 20:20:56 -0000	1.14
--- ChildImmunizationReport.java	29 Nov 2010 22:42:31 -0000	1.14.2.1
***************
*** 133,136 ****
--- 133,137 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               if (totalImmunizations == 0){// no info
                  prd.rank = 1;
***************
*** 228,231 ****
--- 229,233 ----
                      if (!refused && (totalImmunizations >= recommTotal  ) && lastDate.before(twoYearsAfterDOB) && ( ageInMonths > 24 )){//&& endOfYear.after(prevDate)){                  
                         prd.bonusStatus = "Y";
+                        prd.billStatus = "Y";
                         done++;
                      }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports FluReport.java, 1.9.2.2, 1.9.2.3

[Randy J. <rj...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv9720

Modified Files:
      Tag: RELEASE_10_06
	FluReport.java 
Log Message:
- ID: 3122624 Distinguish bonus status from bill status as these may diverge as in Flu Report

Index: FluReport.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarPrevention/reports/FluReport.java,v
retrieving revision 1.9.2.2
retrieving revision 1.9.2.3
diff -C2 -d -r1.9.2.2 -r1.9.2.3
*** FluReport.java	29 Nov 2010 19:13:54 -0000	1.9.2.2
--- FluReport.java	29 Nov 2010 22:41:26 -0000	1.9.2.3
***************
*** 78,81 ****
--- 78,82 ----
               prd.demographicNo = demo;
               prd.bonusStatus = "N";
+              prd.billStatus = "N";
               
               Date[] begendDates =  getStartEndDate(asofDate);
***************
*** 109,115 ****
                
                  
! //                if ( h.get("refused") != null && ((String) h.get("refused")).equals("1")){
! //                   refused = true;
! //                }
                  
                  String prevDateStr = (String) h.get("prevention_date");
--- 110,116 ----
                
                  
!                 if ( h.get("refused") != null && ((String) h.get("refused")).equals("1")){
!                    refused = true;
!                 }
                  
                  String prevDateStr = (String) h.get("prevention_date");
***************
*** 169,176 ****
                  log.debug("bonusEl end date "+endOfYear+ " "+endOfYear.after(prevDate));                
                  log.debug("ASOFDATE "+asofDate);
!                 if (!refused && beginingOfYear.before(prevDate) && endOfYear.after(prevDate) && isOfAge(demo,asofDate)){
!                    prd.bonusStatus = "Y";
!                    done++;
                  }
                  //outcomes        
                  log.debug("due Date "+dueDate.toString()+" cutoffDate "+cutoffDate.toString()+" prevDate "+prevDate.toString());
--- 170,184 ----
                  log.debug("bonusEl end date "+endOfYear+ " "+endOfYear.after(prevDate));                
                  log.debug("ASOFDATE "+asofDate);
!                 if (beginingOfYear.before(prevDate) && endOfYear.after(prevDate) && isOfAge(demo,asofDate)){
!                     if( refused ) {
!                         prd.billStatus = "Y";
!                     }
!                     else {
!                         prd.bonusStatus = "Y";
!                         prd.billStatus = "Y";
!                         done++;
!                     }
                  }
+ 
                  //outcomes        
                  log.debug("due Date "+dueDate.toString()+" cutoffDate "+cutoffDate.toString()+" prevDate "+prevDate.toString());
***************
*** 252,279 ****
            return h;
      }
-     
-    
-     
-     
-     
-     
-     boolean ineligible(Hashtable h){
-        boolean ret =false;
-        if ( h.get("refused") != null && ((String) h.get("refused")).equals("2")){
-           ret = true;
-        }
-        return ret;
-    }
-     
-     
-    boolean ineligible(ArrayList list){
-        for (int i =0; i < list.size(); i ++){
-            Hashtable h = (Hashtable) list.get(i);
-            if (ineligible(h)){
-                return true;
-            }
-        }
-        return false;
-    } 
     
     boolean isOfAge(String d,Date asofDate){
--- 260,263 ----
***************
*** 286,290 ****
          bonusEl.setTime(asofDate); 
          int year = bonusEl.get(Calendar.YEAR);
!         Calendar cal = new GregorianCalendar(year, Calendar.DECEMBER, 31);
          cal.add(Calendar.YEAR,-65);
          Date cutoff = cal.getTime();
--- 270,274 ----
          bonusEl.setTime(asofDate); 
          int year = bonusEl.get(Calendar.YEAR);
!         Calendar cal = new GregorianCalendar(year, Calendar.JANUARY, 1);
          cal.add(Calendar.YEAR,-65);
          Date cutoff = cal.getTime();