oscarmcmaster-cvscommit

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/schedule scheduletemplateapplying.jsp, 1.28, 1.29

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

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

Modified Files:
	scheduletemplateapplying.jsp 
Log Message:
move dependent code ahead

Index: scheduletemplateapplying.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduletemplateapplying.jsp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** scheduletemplateapplying.jsp	30 Nov 2010 18:08:51 -0000	1.28
--- scheduletemplateapplying.jsp	30 Nov 2010 18:30:55 -0000	1.29
***************
*** 40,46 ****
  <%@page import="org.springframework.web.context.support.WebApplicationContextUtils"%>
  <%@page import="org.oscarehr.common.model.Site"%><html:html locale="true">
- <%  if(!scheduleMainBean.getBDoConfigure()) { %>
- <%@ include file="scheduleMainBeanConn.jspf"%>
- <% } %>
  
  <%
--- 40,43 ----
***************
*** 54,57 ****
--- 51,60 ----
  %>
  
+ <%  if(!scheduleMainBean.getBDoConfigure()) { %>
+ <%@ include file="scheduleMainBeanConn.jspf"%>
+ <% } %>
+ 
+ 
+ 
  <security:oscarSec objectName="_site_access_privacy" roleName="<%=CurRoleName%>" rights="r" reverse="false">
  	<%isSiteAccessPrivacy=true; %>

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/schedule scheduleMainBeanConn.jspf, 1.1, 1.2 scheduletemplatesetting.jsp, 1.12, 1.13

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

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

Modified Files:
	scheduleMainBeanConn.jspf scheduletemplatesetting.jsp 
Log Message:
adding the missing merge code

Index: scheduletemplatesetting.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduletemplatesetting.jsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** scheduletemplatesetting.jsp	30 Nov 2010 08:17:54 -0000	1.12
--- scheduletemplatesetting.jsp	30 Nov 2010 18:18:55 -0000	1.13
***************
*** 36,39 ****
--- 36,47 ----
  	scope="session" />
  <%@ include file="scheduleMainBeanConn.jspf"%>
+ <%
+     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");
+ %>
+ 
  <%  
    GregorianCalendar now=new GregorianCalendar();

Index: scheduleMainBeanConn.jspf
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduleMainBeanConn.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** scheduleMainBeanConn.jspf	19 Aug 2010 09:27:56 -0000	1.1
--- scheduleMainBeanConn.jspf	30 Nov 2010 18:18:55 -0000	1.2
***************
*** 29,32 ****
--- 29,35 ----
    String [][] dbQueries=new String[][] {
      {"search_provider", "select provider_no, first_name, last_name from provider where status='1' and provider_type=? order by last_name" }, 
+     {"site_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and provider_type=? 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 + ")) order by last_name" }, 
+     {"team_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and provider_type=? and team in (select team from provider where provider_no=" + curProvider_no + ") and (not(team is null or team  = '') or provider_no=" + curProvider_no + ") order by last_name" },     
+     
  //    {"search_provider", "select provider_no, first_name, last_name from provider where  provider_type='doctor' order by ?" }, 
  

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/schedule scheduletemplateapplying.jsp, 1.27, 1.28

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

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

Modified Files:
	scheduletemplateapplying.jsp 
Log Message:
remove redundant code

Index: scheduletemplateapplying.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduletemplateapplying.jsp,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** scheduletemplateapplying.jsp	30 Nov 2010 17:25:53 -0000	1.27
--- scheduletemplateapplying.jsp	30 Nov 2010 18:08:51 -0000	1.28
***************
*** 1,34 ****
- <%!  boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
- <%!  String [] bgColors; %>
- <%
-   
-   String weekdaytag[] = {"SUN","MON","TUE","WED","THU","FRI","SAT"};
-   boolean bAlternate =(request.getParameter("alternate")!=null&&request.getParameter("alternate").equals("checked") )?true:false;
-   boolean bOrigAlt = false;
- 
-   OscarProperties props = OscarProperties.getInstance();
-   
-   boolean bMoreAddr = bMultisites
-   						? true
-   						: (props.getProperty("scheduleSiteID", "").equals("") ? false : true);
-   String [] addr;
-   if (bMultisites) {
- 	//multisite starts =====================	  
- 	  SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
-       List<Site> sites = siteDao.getActiveSitesByProviderNo((String)request.getParameter("provider_no")); 
- 	  addr = new String[sites.size()+1];
- 	  bgColors = new String[sites.size()+1];
-       for (int i=0; i<sites.size(); i++) {
- 		  addr[i]=sites.get(i).getName();
- 		  bgColors[i]=sites.get(i).getBgColor();
-       }
- 	  addr[sites.size()]="NONE";
- 	  bgColors[sites.size()]="white";
- 	//multisite ends =====================	 
-   } else {
-   	  addr = props.getProperty("scheduleSiteID", "").split("\\|");
-   }
-   
- %>
  <%@ page
  	import="java.util.*, java.net.*, java.sql.*, oscar.*, oscar.util.*, java.text.*, java.lang.*, org.apache.struts.util.*"
--- 1,2 ----
***************
*** 90,93 ****
--- 58,64 ----
  </security:oscarSec>
  
+ 
+ <%!  boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
+ <%!  String [] bgColors; %>
  <%!  List<String> excludedSites = new ArrayList<String>(); %>
  <%

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/provider appointmentprovideradminday.jsp, 1.200, 1.201

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

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

Modified Files:
	appointmentprovideradminday.jsp 
Log Message:
remove redundant code

Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.200
retrieving revision 1.201
diff -C2 -d -r1.200 -r1.201
*** appointmentprovideradminday.jsp	30 Nov 2010 08:17:56 -0000	1.200
--- appointmentprovideradminday.jsp	30 Nov 2010 18:03:20 -0000	1.201
***************
*** 86,90 ****
  	long loadPage = System.currentTimeMillis();
      if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
!     String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
  %>
  <security:oscarSec roleName="<%=roleName$%>" objectName="_appointment" rights="r" reverse="<%=true%>" >
--- 86,90 ----
  	long loadPage = System.currentTimeMillis();
      if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
!     //String roleName$ = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
  %>
  <security:oscarSec roleName="<%=roleName$%>" objectName="_appointment" rights="r" reverse="<%=true%>" >
***************
*** 1284,1288 ****
            <!--a href="providercontrol.jsp?year=<%=strYear%>&month=<%=strMonth%>&day=<%=strDay%>&view=1&curProvider=<%=curProvider_no[nProvider]%>&curProviderName=<%=curProviderName[nProvider]%>&displaymode=day&dboperation=searchappointmentday" title="<bean:message key="provider.appointmentProviderAdminDay.zoomView"/>"-->
            <%=curProviderName[nProvider]%></a></b>
-           <%=bMultisites?curScheduleMultisite[nProvider]:""%>
        <% } %>
  
--- 1284,1287 ----
***************
*** 1626,1630 ****
            <!--a href="providercontrol.jsp?year=<%=strYear%>&month=<%=strMonth%>&day=<%=strDay%>&view=1&curProvider=<%=curProvider_no[nProvider]%>&curProviderName=<%=curProviderName[nProvider]%>&displaymode=day&dboperation=searchappointmentday" title="<bean:message key="provider.appointmentProviderAdminDay.zoomView"/>"-->
            <%=curProviderName[nProvider]%></a></b>
-           <%=bMultisites?curScheduleMultisite[nProvider]:""%>
        <% } %>
  
--- 1625,1628 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctViewConsultationRequestsUtil.java, 1.20, 1.21

[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-serv24305/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil

Modified Files:
	EctViewConsultationRequestsUtil.java 
Log Message:
correct the providerNo check

Index: EctViewConsultationRequestsUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** EctViewConsultationRequestsUtil.java	30 Nov 2010 15:04:23 -0000	1.20
--- EctViewConsultationRequestsUtil.java	30 Nov 2010 17:56:50 -0000	1.21
***************
*** 70,73 ****
--- 70,74 ----
        patient = new Vector<String>();
        provider = new Vector<String>();
+       providerNo = new Vector();
        teams = new Vector<String>();
        service = new Vector<String>();
***************
*** 113,116 ****
--- 114,118 ----
                vSpecialist.add(specialist.getLastName() + ", " + specialist.getFirstName());
                urgency.add(consult.getUrgency());
+ 			  providerNo.add(prov.getProviderNo());
  			  siteName.add(consult.getSiteName());
                teams.add(consult.getSendTo());
***************
*** 200,203 ****
--- 202,206 ----
     public Vector<String> urgency;
     public Vector<String> followUpDate;
+    public Vector<String> providerNo;   
     public Vector<String> siteName;
     

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ViewConsultationRequests.jsp, 1.22, 1.23

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

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

Modified Files:
	ViewConsultationRequests.jsp 
Log Message:
correct the providerNo check

Index: ViewConsultationRequests.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ViewConsultationRequests.jsp	30 Nov 2010 17:45:04 -0000	1.22
--- ViewConsultationRequests.jsp	30 Nov 2010 17:56:49 -0000	1.23
***************
*** 378,382 ****
                               //multisites. skip record if not belong to same site/team
                               if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
!                              	if(providerMap.get((String) theRequests.provider.elementAt(i))== null)  continue;
                               }	
                              	
--- 378,382 ----
                               //multisites. skip record if not belong to same site/team
                               if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
!                              	if(providerMap.get((String) theRequests.providerNo.elementAt(i))== null)  continue;
                               }	
                              	

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

[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-serv22859

Modified Files:
      Tag: RELEASE_10_06
	FluReport.java 
Log Message:
- ID: 3122624 Forgot to change isOfAge func to work off of December 31 of the asof date

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.3
retrieving revision 1.9.2.4
diff -C2 -d -r1.9.2.3 -r1.9.2.4
*** FluReport.java	29 Nov 2010 22:41:26 -0000	1.9.2.3
--- FluReport.java	30 Nov 2010 17:52:30 -0000	1.9.2.4
***************
*** 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();
--- 270,274 ----
          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();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest ViewConsultationRequests.jsp, 1.21, 1.22

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

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

Modified Files:
	ViewConsultationRequests.jsp 
Log Message:
fix a typo

Index: ViewConsultationRequests.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/oscarEncounter/oscarConsultationRequest/ViewConsultationRequests.jsp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** ViewConsultationRequests.jsp	30 Nov 2010 08:17:55 -0000	1.21
--- ViewConsultationRequests.jsp	30 Nov 2010 17:45:04 -0000	1.22
***************
*** 378,382 ****
                               //multisites. skip record if not belong to same site/team
                               if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
!                              	if(providerMap.get((String) theRequests.providerNo.elementAt(i))== null)  continue;
                               }	
                              	
--- 378,382 ----
                               //multisites. skip record if not belong to same site/team
                               if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
!                              	if(providerMap.get((String) theRequests.provider.elementAt(i))== null)  continue;
                               }	
                              	

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao SiteDao.java, 1.7, 1.8

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

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

Modified Files:
	SiteDao.java 
Log Message:
update a missed merge

Index: SiteDao.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/common/dao/SiteDao.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SiteDao.java	9 Jul 2010 21:56:35 -0000	1.7
--- SiteDao.java	30 Nov 2010 17:32:02 -0000	1.8
***************
*** 32,36 ****
--- 32,38 ----
  import java.util.List;
  
+ import org.hibernate.Hibernate;
  import org.hibernate.HibernateException;
+ import org.hibernate.SQLQuery;
  import org.hibernate.Session;
  import org.oscarehr.common.model.Provider;
***************
*** 138,140 ****
--- 140,263 ----
  	}
  
+ 	public List<String> getGroupBySiteLocation(String location) {
+ 		List<String> groupList = new ArrayList<String>();
+ 		Session sess = getSession();
+ 		try {
+ 			SQLQuery  q = sess.createSQLQuery(
+ 					"select distinct g.mygroup_no from mygroup g	" +
+ 					" inner join provider p on p.provider_no = g.provider_no and p.status = 1 " +
+ 					" inner join providersite ps on ps.provider_no = g.provider_no " +
+ 					" inner join site s on s.site_id = ps.site_id " +
+ 					" where  s.name = :sitename ") ;
+ 			q.setParameter("sitename", location);
+ 			q.addScalar("mygroup_no", Hibernate.STRING);			
+ 			groupList = q.list();
+ 
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		} finally {
+ 			try {
+ 				sess.close();
+ 			} catch (HibernateException e) {
+ 				e.printStackTrace();
+ 			}
+ 		}		
+ 		return groupList;
+ 	}
+ 	
+ 	public List<String> getProviderNoBySiteLocation(String location) {
+ 		List<String> pList = new ArrayList<String>();
+ 		Session sess = getSession();
+ 		try {
+ 			SQLQuery  q = sess.createSQLQuery(
+ 					"select distinct p.provider_no	" +
+ 					" from provider p " +
+ 					" inner join providersite ps on ps.provider_no = p.provider_no " +
+ 					" inner join site s on s.site_id = ps.site_id " +
+ 					" where  s.name = :sitename ") ;
+ 			q.setParameter("sitename", location);
+ 			q.addScalar("provider_no", Hibernate.STRING);			
+ 			pList = q.list();
+ 
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		} finally {
+ 			try {
+ 				sess.close();
+ 			} catch (HibernateException e) {
+ 				e.printStackTrace();
+ 			}
+ 		}		
+ 		return pList;
+ 	}
+ 	
+ 	public List<String> getProviderNoBySiteManagerProviderNo(String providerNo) {
+ 		List<String> pList = new ArrayList<String>();
+ 		Session sess = getSession();
+ 		try {
+ 			SQLQuery  q = sess.createSQLQuery(
+ 					"select distinct p.provider_no	" +
+ 					" from provider p " +
+ 					" inner join providersite ps on ps.provider_no = p.provider_no " +
+ 					" where ps.site_id in (select site_id from providersite where provider_no = :providerno)");
+ 			q.setParameter("providerno", providerNo);
+ 			q.addScalar("provider_no", Hibernate.STRING);			
+ 			pList = q.list();
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		} finally {
+ 			try {
+ 				sess.close();
+ 			} catch (HibernateException e) {
+ 				e.printStackTrace();
+ 			}
+ 		}		
+ 		return pList;
+ 	}	
+ 	
+ 	public List<String> getGroupBySiteManagerProviderNo(String providerNo) {
+ 		List<String> groupList = new ArrayList<String>();
+ 		Session sess = getSession();
+ 		try {
+ 			SQLQuery  q = sess.createSQLQuery(
+ 					"select distinct g.mygroup_no from mygroup g	" +
+ 					" inner join provider p on p.provider_no = g.provider_no and p.status = 1 " +
+ 					" inner join providersite ps on ps.provider_no = g.provider_no " +
+ 					" where ps.site_id in (select site_id from providersite where provider_no = :providerno)");
+ 			q.setParameter("providerno", providerNo);
+ 			q.addScalar("mygroup_no", Hibernate.STRING);			
+ 			groupList = q.list();
+ 		
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		} finally {
+ 			try {
+ 				sess.close();
+ 			} catch (HibernateException e) {
+ 				e.printStackTrace();
+ 			}
+ 		}		
+ 		return groupList;
+ 	}
+ 	
+ 	public String getSiteNameByAppointmentNo(String appointmentNo) {
+ 		String siteName="";
+ 		Session sess = getSession();
+ 		try {
+ 			SQLQuery  q = sess.createSQLQuery("select location from appointment where appointment_no = :appointmentno");
+ 			q.setParameter("appointmentno", appointmentNo);
+ 			q.addScalar("location", Hibernate.STRING);			
+ 			siteName = (String)q.list().get(0);
+ 		
+ 		} catch (Exception e) {
+ 			e.printStackTrace();
+ 		} finally {
+ 			try {
+ 				sess.close();
+ 			} catch (HibernateException e) {
+ 				e.printStackTrace();
+ 			}
+ 		}		
+ 		return siteName;		
+ 	}
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/schedule scheduletemplateapplying.jsp, 1.26, 1.27

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

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

Modified Files:
	scheduletemplateapplying.jsp 
Log Message:
remove redundant jsp var

Index: scheduletemplateapplying.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduletemplateapplying.jsp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** scheduletemplateapplying.jsp	30 Nov 2010 08:17:54 -0000	1.26
--- scheduletemplateapplying.jsp	30 Nov 2010 17:25:53 -0000	1.27
***************
*** 90,96 ****
  </security:oscarSec>
  
- 
- <%!  boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
- <%!  String [] bgColors; %>
  <%!  List<String> excludedSites = new ArrayList<String>(); %>
  <%
--- 90,93 ----

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil EctViewConsultationRequestsUtil.java, 1.19, 1.20

[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-serv31444/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil

Modified Files:
	EctViewConsultationRequestsUtil.java 
Log Message:
fix the missing property

Index: EctViewConsultationRequestsUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarEncounter/oscarConsultationRequest/pageUtil/EctViewConsultationRequestsUtil.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** EctViewConsultationRequestsUtil.java	30 Nov 2010 08:17:55 -0000	1.19
--- EctViewConsultationRequestsUtil.java	30 Nov 2010 15:04:23 -0000	1.20
***************
*** 199,203 ****
     public Vector<String> patientWillBook;
     public Vector<String> urgency;
!    public Vector<String> followUpDate;;
     
  }
--- 199,204 ----
     public Vector<String> patientWillBook;
     public Vector<String> urgency;
!    public Vector<String> followUpDate;
!    public Vector<String> siteName;
     
  }

[Oscarmcmaster-cvscommit] oscar_mcmaster/build grep_check_web.data, 1.9, 1.10

[Ted L. <ted...@us...>]

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

Modified Files:
	grep_check_web.data 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: grep_check_web.data
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/grep_check_web.data,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
Binary files /tmp/cvsi2lfxf and /tmp/cvs0H7huD differ

[Oscarmcmaster-cvscommit] oscar_mcmaster/build/tasks/src GrepStuffDirectoryWalker.java, 1.19, 1.20

[Ted L. <ted...@us...>]

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv10285/build/tasks/src

Modified Files:
	GrepStuffDirectoryWalker.java 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: GrepStuffDirectoryWalker.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/build/tasks/src/GrepStuffDirectoryWalker.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** GrepStuffDirectoryWalker.java	27 Nov 2010 00:32:26 -0000	1.19
--- GrepStuffDirectoryWalker.java	30 Nov 2010 10:22:37 -0000	1.20
***************
*** 62,65 ****
--- 62,69 ----
  			
  			checkContains(relativePath, fileContents, "DBHandler.", "use jpa");
+ 			checkContains(relativePath, fileContents, "DBPreparedHandler", "use jpa");
+ 			checkContains(relativePath, fileContents, "DBHelp", "use jpa");
+ 			checkContains(relativePath, fileContents, ".selectIntList(", "use jpa");
+ 			checkContains(relativePath, fileContents, ".selectStringList(", "use jpa");
  			checkContains(relativePath, fileContents, "OscarSuperManager", "use jpa");
  			checkContains(relativePath, fileContents, "org.apache.commons.logging.Log", "use log4j logger");
***************
*** 75,78 ****
--- 79,85 ----
  			checkContains(relativePath, fileContents, "StringBuffer", "very very rare that this is required, usually StringBuilder is the better choice");
  			checkContains(relativePath, fileContents, "com.Ostermiller", "use org.apache libraries instead, duplicated libs and apache is... more standard (if that's a word)");
+ 			checkContains(relativePath, fileContents, "BaseGenericIntakeAction", "do not use the BaseAction concept, just extends struts directly, no mass imports should be done like that, no one can tell what is used when that happens.");
+ 			checkContains(relativePath, fileContents, "BaseAction", "do not use the BaseAction concept, just extends struts directly, no mass imports should be done like that, no one can tell what is used when that happens.");
+ 			checkContains(relativePath, fileContents, "ProfessionalSpecialists", "Use the new ProfessionalSpecialist JPA object instead.");
  
  			checkContains(relativePath, fileContents, "Vector", "excessively rare that this is required, usually ArrayList is the better choice");

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDB DBPreparedHandlerParam.java, 1.7, 1.8 DBPreparedHandler.java, 1.44, 1.45 DBHandler.java, 1.22, 1.23

[Ted L. <ted...@us...>]

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

Modified Files:
	DBPreparedHandlerParam.java DBPreparedHandler.java 
	DBHandler.java 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: DBPreparedHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDB/DBPreparedHandler.java,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** DBPreparedHandler.java	6 Oct 2010 21:52:12 -0000	1.44
--- DBPreparedHandler.java	30 Nov 2010 10:22:37 -0000	1.45
***************
*** 38,42 ****
  
  /**
!  * @deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBPreparedHandler {
--- 38,42 ----
  
  /**
!  * deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBPreparedHandler {

Index: DBHandler.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDB/DBHandler.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** DBHandler.java	12 Nov 2010 18:01:33 -0000	1.22
--- DBHandler.java	30 Nov 2010 10:22:37 -0000	1.23
***************
*** 36,40 ****
  
  /**
!  * @deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBHandler {
--- 36,40 ----
  
  /**
!  * deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBHandler {

Index: DBPreparedHandlerParam.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarDB/DBPreparedHandlerParam.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DBPreparedHandlerParam.java	30 Jul 2010 00:52:25 -0000	1.7
--- DBPreparedHandlerParam.java	30 Nov 2010 10:22:37 -0000	1.8
***************
*** 6,10 ****
  
  /**
!  * @deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBPreparedHandlerParam {
--- 6,10 ----
  
  /**
!  * deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBPreparedHandlerParam {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/caisi/model ProfessionalSpecialists.java, 1.5, 1.6

[Ted L. <ted...@us...>]

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

Modified Files:
	ProfessionalSpecialists.java 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: ProfessionalSpecialists.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/caisi/model/ProfessionalSpecialists.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ProfessionalSpecialists.java	27 May 2010 17:02:17 -0000	1.5
--- ProfessionalSpecialists.java	30 Nov 2010 10:22:37 -0000	1.6
***************
*** 24,28 ****
  
  /**
!  * @deprecated use ProfessionalSpecialist.java instead
  */		
  public class ProfessionalSpecialists extends BaseObject {
--- 24,28 ----
  
  /**
!  * deprecated use ProfessionalSpecialist.java instead
  */		
  public class ProfessionalSpecialists extends BaseObject {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/login DBHelp.java, 1.20, 1.21

[Ted L. <ted...@us...>]

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

Modified Files:
	DBHelp.java 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: DBHelp.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/DBHelp.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** DBHelp.java	15 Nov 2010 01:27:32 -0000	1.20
--- DBHelp.java	30 Nov 2010 10:22:37 -0000	1.21
***************
*** 17,21 ****
  
  /**
!  * @deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBHelp {
--- 17,21 ----
  
  /**
!  * deprecated Use JPA instead, no new code should be written against this class.
   */
  public final class DBHelp {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/util SqlUtils.java, 1.42, 1.43

[Ted L. <ted...@us...>]

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

Modified Files:
	SqlUtils.java 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: SqlUtils.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/util/SqlUtils.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** SqlUtils.java	15 Nov 2010 01:27:35 -0000	1.42
--- SqlUtils.java	30 Nov 2010 10:22:36 -0000	1.43
***************
*** 615,619 ****
  
  	/**
! 	 * @deprecated use jpa native queries instead 
  	 */
  	public static List<Integer> selectIntList(String sqlCommand) {
--- 615,619 ----
  
  	/**
! 	 * deprecated use jpa native queries instead 
  	 */
  	public static List<Integer> selectIntList(String sqlCommand) {
***************
*** 642,646 ****
  
  	/**
! 	 * @deprecated use jpa native queries instead 
  	 */
  	public static List<String> selectStringList(String sqlCommand) {
--- 642,646 ----
  
  	/**
! 	 * deprecated use jpa native queries instead 
  	 */
  	public static List<String> selectStringList(String sqlCommand) {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web BaseAction.java, 1.40, 1.41

[Ted L. <ted...@us...>]

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

Modified Files:
	BaseAction.java 
Log Message:
moved deprecation checks into codeCheck so the compiler output is more "useful" instead of a spam of over 100 deprecation warnings

Index: BaseAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/PMmodule/web/BaseAction.java,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** BaseAction.java	11 Nov 2010 01:35:15 -0000	1.40
--- BaseAction.java	30 Nov 2010 10:22:36 -0000	1.41
***************
*** 63,67 ****
  
  /**
!  * @deprecated do not use this class anymore, there's no good reason for this classes existance. Action classes should generally speaking stand on their own without a common super class. If utilities are required, then a utility class should be made, not a super class.
   */
  public abstract class BaseAction extends DispatchAction {
--- 63,67 ----
  
  /**
!  * deprecated do not use this class anymore, there's no good reason for this classes existance. Action classes should generally speaking stand on their own without a common super class. If utilities are required, then a utility class should be made, not a super class.
   */
  public abstract class BaseAction extends DispatchAction {

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscar_mcmaster.properties, 1.75, 1.76

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

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

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

Index: oscar_mcmaster.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscar_mcmaster.properties,v
retrieving revision 1.75
retrieving revision 1.76
diff -C2 -d -r1.75 -r1.76
*** oscar_mcmaster.properties	26 Nov 2010 19:01:53 -0000	1.75
--- oscar_mcmaster.properties	30 Nov 2010 08:25:47 -0000	1.76
***************
*** 591,593 ****
--- 591,608 ----
  HELP_SEARCH_URL=http://oscarmanual.org/search?SearchableText=%s
  
+ # For clinic with multiple satellites, so that each provider can be assigned to multiple sites and have different location when set schedule, book appt., billing etc. 
+ ## off : turn off multisites support, oscar will behave as before
+ ## on : turn on multisites support, use Admin-Misc-Satellite-sites Admin to manage sites and assign them to the provider in provider profile
+ # multisites=on
  
+ 
+ # multisites function. When add a new provide, should system validate the provider id range.
+ # false : turn off provider id validation (default value for backward compatible)
+ # true : turn on provider id validation. Range will be defined by sites admin 
+ multioffice.formalize.provider.id=false
+ # the id range for doctors. other staff's id ranges are defined in the site admin page.
+ multioffice.formalize.doctor.minimum.provider.id=1
+ multioffice.formalize.doctor.maximum.provider.id=100
+ 
+ # multisites function: so as to identify the role name of the real admin role (the super root in oscar)
+ multioffice.admin.role.name=admin

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/data JdbcBillingPageUtil.java, 1.6, 1.7 JdbcBillingCreateBillingFile.java, 1.10, 1.11 JdbcBillingRAImpl.java, 1.10, 1.11

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

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

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

Index: JdbcBillingCreateBillingFile.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/data/JdbcBillingCreateBillingFile.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JdbcBillingCreateBillingFile.java	7 Jul 2010 21:01:33 -0000	1.10
--- JdbcBillingCreateBillingFile.java	30 Nov 2010 08:17:54 -0000	1.11
***************
*** 26,33 ****
--- 26,37 ----
  import java.text.SimpleDateFormat;
  import java.util.GregorianCalendar;
+ import java.util.HashMap;
  import java.util.List;
  import java.util.Properties;
  
  import org.apache.log4j.Logger;
+ import org.oscarehr.common.dao.SiteDao;
+ import org.oscarehr.common.model.Site;
+ import org.oscarehr.util.SpringUtils;
  
  import oscar.OscarProperties;
***************
*** 85,93 ****
  	private String totalAmount;
  	private String value;
! 
  	public JdbcBillingCreateBillingFile() {
  		formatter = new SimpleDateFormat("yyyyMMdd"); // yyyyMMddHmm");
  		today = new java.util.Date();
  		output = formatter.format(today);
  	}
  
--- 89,107 ----
  	private String totalAmount;
  	private String value;
! 	private String clinicBgColor;
! 	private HashMap<String,String> clinicShortName;
! 	
  	public JdbcBillingCreateBillingFile() {
  		formatter = new SimpleDateFormat("yyyyMMdd"); // yyyyMMddHmm");
  		today = new java.util.Date();
  		output = formatter.format(today);
+ 		
+ 		//multisite, get site short name
+ 		clinicShortName = new HashMap<String,String>();
+ 		SiteDao siteDao = (SiteDao)SpringUtils.getBean("siteDao");
+ 		List<Site> sites = siteDao.getAllSites();
+ 		for (Site s : sites) {
+ 			clinicShortName.put(s.getName(), s.getShortName());
+ 		}
  	}
  
***************
*** 197,200 ****
--- 211,239 ----
  	}
  
+ 	private String buildSiteHTMLContentHeader() {
+ 		String ret = null;
+ 		ret = "<script type=\"text/JavaScript\">\n<!--\nfunction popupPage(vheight,vwidth,varpage) {\n  var page = \"\" + varpage;\n";
+ 		ret += "  windowprops = \"height=\"+vheight+\",width=\"+vwidth+\",location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=yes,screenX=0,screenY=0,top=0,left=0\";\n";
+ 		ret += "  var popup=window.open(page, \"billcorrection\", windowprops);\n";
+ 		ret += "    if (popup != null) {\n";
+ 		ret += "    if (popup.opener == null) {\n";
+ 		ret += "      popup.opener = self;\n";
+ 		ret += "    }\n";
+ 		ret += "    popup.focus();\n";
+ 		ret += "  }\n";
+ 		ret += "}\n//-->\n</script>\n";
+ 		ret += "\n<table width='100%' border='0' cellspacing='0' cellpadding='2' class='myIvory'>\n"
+ 				+ "<tr><td colspan='4' class='myGreen'>OHIP Invoice for OHIP No." + bhObj.getProvider_reg_num()
+ 				+ "</td><td colspan='5' class='myGreen'>Payment date of " + output + "\n</td></tr>";
+ 		ret += "\n<tr><td class='myGreen'>ACCT NO</td>"
+ 				+ "<td width='25%' class='myGreen'>NAME</td><td class='myGreen'>HEALTH #</td>"
+ 				+ "<td class='myGreen'>BILLDATE</td><td class='myGreen'>CODE</td>"
+ 				+ "<td align='right' class='myGreen'>BILLED</td>"
+ 				+ "<td align='right' class='myGreen'>DX</td><td align='right' class='myGreen'>Comment</td>"
+ 				+ "<td align='centre' class='myGreen'>SITE</td></tr>";;
+ 		return ret;
+ 	}
+ 
+ 	
  	private String buildHTMLContentRecord(int invCount) {
  		String ret = null;
***************
*** 230,233 ****
--- 269,306 ----
  	}
  
+ 	private String buildSiteHTMLContentRecord(int invCount) {
+ 		String ret = null;
+ 		if (invCount == 0) {
+ 			ret = "\n<tr><td class='myIvory'><a href=# onclick=\"popupPage(720,640,'billingONCorrection.jsp?billing_no="
+ 					+ ch1Obj.getId()
+ 					+ "');return false;\">"
+ 					+ ch1Obj.getId()
+ 					+ "</a></td>"
+ 					+ "<td class='myIvory'><a href=# onclick=\"popupPage(720,740,'../../../demographic/demographiccontrol.jsp?demographic_no="
+ 					+ ch1Obj.getDemographic_no()
+ 					+ "&displaymode=edit&dboperation=search_detail');return false;\">"
+ 					+ ch1Obj.getDemographic_name()
+ 					+ "</a></td><td class='myIvory'>"
+ 					+ ch1Obj.getHin() + ch1Obj.getVer()
+ 					+ "</td><td class='myIvory'>"
+ 					+ ch1Obj.getBilling_date()
+ 					+ "</td><td class='myIvory'>"
+ 					+ itemObj.getService_code()
+ 					+ "</td><td align='right' class='myIvory'>"
+ 					+ itemObj.getFee()
+ 					+ "</td><td align='right' class='myIvory'>"
+ 					+ itemObj.getDx()
+ 					+ "</td><td class='myIvory'> &nbsp; &nbsp;" + referral + hcFlag + m_Flag + " </td>" 
+ 					+ "<td bgcolor='" + clinicBgColor + "'> " + clinicShortName.get(ch1Obj.getClinic()) + "</td></tr>";
+ 		} else {
+ 			ret = "\n<tr><td class='myIvory'>&nbsp;</td> <td class='myIvory'>&nbsp;</td>"
+ 					+ "<td class='myIvory'>&nbsp;</td> <td class='myIvory'>&nbsp;</td>" + "<td class='myIvory'>"
+ 					+ itemObj.getService_code() + "</td><td align='right' class='myIvory'>" + itemObj.getFee()
+ 					+ "</td><td align='right' class='myIvory'>" + itemObj.getDx()
+ 					+ "</td><td class='myIvory'>&nbsp;</td>" 
+ 					+ "<td bgcolor='" + clinicBgColor + "'> " + clinicShortName.get(ch1Obj.getClinic()) + "</td></tr>";
+ 		}
+ 		return ret;
+ 	}
  	private String buildHTMLContentTrailer() {
  		htmlContent += "\n<tr><td colspan='8' class='myIvory'>&nbsp;</td></tr><tr><td colspan='4' class='myIvory'>OHIP No: "
***************
*** 248,251 ****
--- 321,342 ----
  	}
  
+ 	private String buildSiteHTMLContentTrailer() {
+ 		htmlContent += "\n<tr><td colspan='9' class='myIvory'>&nbsp;</td></tr><tr><td colspan='4' class='myIvory'>OHIP No: "
+ 				+ bhObj.getProvider_reg_num()
+ 				+ ": "
+ 				+ pCount
+ 				+ " RECORDS PROCESSED</td><td colspan='5' class='myIvory'>TOTAL: "
+ 				+ BigTotal.toString()
+ 				+ "\n</td></tr>" + "\n</table>";
+ 		// writeFile(value);
+ 		String checkSummary = errorMsg.equals("") ? "\n<table border='0' width='100%' bgcolor='green'><tr><td>Pass</td></tr></table>"
+ 				: "\n<table border='0' width='100%' bgcolor='orange'><tr><td>Please correct the errors and run this simulation again!</td></tr></table>";
+ 		htmlValue += htmlContent + checkSummary;
+ 		htmlHeader = "<html><body><style type='text/css'><!-- .myGreen{  font-family: Arial, Helvetica, sans-serif;  font-size: 12px; font-style: normal;  line-height: normal;  font-weight: normal;  font-variant: normal;  text-transform: none;  color: #003366;  text-decoration: none; --></style>";
+ 		htmlFooter = "</body></html>";
+ 		htmlCode = htmlHeader + htmlValue + htmlFooter;
+ 		return htmlCode;
+ 	}
+ 	
  	private String buildItem() {
  		String ret = "\n" + itemObj.getTransc_id() + itemObj.getRec_id() + itemObj.getService_code() + space(2)
***************
*** 315,318 ****
--- 406,417 ----
  		return ret;
  	}
+ 	
+ 	private String printSiteErrorPartMsg() {
+ 		String ret = "";
+ 		ret = errorPartMsg.length() > 0 ? ("\n<tr bgcolor='yellow'><td colspan='9'><font color='red'>" + errorPartMsg + "</font></td></tr>")
+ 				: "";
+ 		errorPartMsg = "";
+ 		return ret;
+ 	}
  
  	public void createBillingFileStr(String bid, String status) {
***************
*** 472,475 ****
--- 571,741 ----
  	}
  
+ 	public void createSiteBillingFileStr(String bid, String status) {
+ 		
+ 		SiteDao siteDao = (SiteDao)SpringUtils.getBean("siteDao");
+ 		
+ 		try {
+ 			if (!"0".equals(bid)) { // for simulation only
+ 				getBatchHeaderObj(bid);
+ 			}
+ 			checkBatchHeader();
+ 			batchHeader = buildBatchHeader();
+ 			htmlValue = buildSiteHTMLContentHeader();
+ 			// start here
+ 			value = batchHeader;
+ 			BillingONDataHelp dbObj = new BillingONDataHelp();
+ 			// (status='O' or status='W')
+ 			query = "select * from billing_on_cheader1 where provider_no='" + providerNo + "' and  " + status + " "
+ 					+ dateRange + " and pay_program in ('HCP', 'WCB', 'RMB') order by billing_date, billing_time";
+ 			_logger.info("createBillingFileStr(sql = " + query + ")");
+ 			ResultSet rs = dbObj.searchDBRecord(query);
+ 			while (rs.next()) {
+ 				// recreate judge
+ 				String bNo = "" + rs.getInt("id");
+ 				if(propBillingNo != null && !propBillingNo.containsKey(bNo)) {
+ 					continue;
+ 				}
+ 				
+ 				patientCount++;
+ 				ch1Obj = new BillingClaimHeader1Data();
+ 				ch1Obj.setId(bNo);
+ 				ch1Obj.setTransc_id(rs.getString("transc_id"));
+ 				ch1Obj.setRec_id(rs.getString("rec_id"));
+ 				ch1Obj.setHin(rs.getString("hin"));
+ 				ch1Obj.setVer(rs.getString("ver"));
+ 				ch1Obj.setDob(rs.getString("dob"));
+ 
+ 				ch1Obj.setPay_program(rs.getString("pay_program"));
+ 				ch1Obj.setPayee(rs.getString("payee"));
+ 				ch1Obj.setRef_num(rs.getString("ref_num"));
+ 				ch1Obj.setFacilty_num(rs.getString("facilty_num"));
+ 				ch1Obj.setAdmission_date(rs.getString("admission_date"));
+ 				ch1Obj.setRef_lab_num(rs.getString("ref_lab_num"));
+ 				ch1Obj.setMan_review(rs.getString("man_review"));
+ 				ch1Obj.setLocation(rs.getString("location"));
+ 
+ 				ch1Obj.setDemographic_no(rs.getString("demographic_no"));
+ 				ch1Obj.setProviderNo(rs.getString("provider_no"));
+ 				ch1Obj.setAppointment_no(rs.getString("appointment_no"));
+ 				ch1Obj.setDemographic_name(rs.getString("demographic_name"));
+ 				// String temp[] =
+ 				// getPatientLF(val.getParameter("demographic_name"));
+ 				// ch1Obj.setLast_name(rs.getString("transc_id"));
+ 				// ch1Obj.setFirst_name(rs.getString("transc_id"));
+ 				ch1Obj.setSex(rs.getString("sex"));
+ 				ch1Obj.setProvince(rs.getString("province"));
+ 
+ 				ch1Obj.setBilling_date(rs.getString("billing_date"));
+ 				ch1Obj.setBilling_time(rs.getString("billing_time"));
+ 				// ch1Obj.setUpdate_datetime(rs.getString("transc_id"));
+ 				ch1Obj.setTotal(rs.getString("total"));
+ 				ch1Obj.setPaid(rs.getString("paid"));
+ 				ch1Obj.setStatus(rs.getString("status"));
+ 				ch1Obj.setComment(rs.getString("comment1"));
+ 				ch1Obj.setVisittype(rs.getString("visittype"));
+ 				ch1Obj.setProvider_ohip_no(rs.getString("provider_ohip_no"));
+ 				ch1Obj.setProvider_rma_no(rs.getString("provider_rma_no"));
+ 				ch1Obj.setApptProvider_no(rs.getString("apptProvider_no"));
+ 				ch1Obj.setAsstProvider_no(rs.getString("asstProvider_no"));
+ 				ch1Obj.setCreator(rs.getString("creator"));
+ 				
+ 				ch1Obj.setClinic(rs.getString("clinic"));
+ 				if (ch1Obj.getClinic() == null || ch1Obj.getClinic().equalsIgnoreCase("null")) {
+ 					ch1Obj.setClinic("");
+ 					clinicBgColor = "FFFFFF";
+ 				}
+ 				else {
+ 					clinicBgColor = siteDao.getByLocation(ch1Obj.getClinic()).getBgColor();
+ 					clinicBgColor = (clinicBgColor == null || clinicBgColor.equalsIgnoreCase("null") ? "FFFFFF" : clinicBgColor);
+ 				}
+ 				
+ 				// invNo = rs.getString("id");
+ 				// ohipVer = rs.getString("organization_spec_code");
+ 				// inPatient = rs.getString("clinic_no");
+ 				// if there is no clinic no for a clinic, it should be an empty
+ 				// str
+ 				// inPatient = "0".equals(inPatient) ? " " : inPatient;
+ 				// demoName = rs.getString("demographic_name");
+ 				// hin = rs.getString("hin");
+ 				// dob = rs.getString("dob");
+ 				// visitDate = rs.getDate("visitdate");
+ 				// visitType = rs.getString("visittype");
+ 				// outPatient = rs.getString("clinic_ref_code");
+ 				// specCode = rs.getString("status");
+ 				// content = rs.getString("content");
+ 				value += buildHeader1();
+ 				htmlContent += printSiteErrorPartMsg();
+ 				// build billing detail
+ 				invCount = 0;
+ 				query = "select * from billing_on_item where ch1_id=" + ch1Obj.getId()
+ 						+ " and status!='D' and status!='S'";
+ 				_logger.info("createBillingFileStr(sql = " + query + ")");
+ 				ResultSet rs2 = dbObj.searchDBRecord(query);
+ 				while (rs2.next()) {
+ 					itemObj = new BillingItemData();
+ 					recordCount++;
+ 					// int count = 0;
+ 
+ 					itemObj.setTransc_id(rs2.getString("transc_id"));
+ 					itemObj.setRec_id(rs2.getString("rec_id"));
+ 					itemObj.setService_code(rs2.getString("service_code"));
+ 					itemObj.setFee(rs2.getString("fee"));
+ 					itemObj.setSer_num(rs2.getString("ser_num"));
+ 					itemObj.setService_date(rs2.getString("service_date"));
+ 					diagcode = rs2.getString("dx");
+ 					diagcode = ":::".equals(diagcode) ? "   " : diagcode;
+ 					itemObj.setDx(diagcode);
+ 					itemObj.setDx1(rs2.getString("dx1"));
+ 					itemObj.setDx2(rs2.getString("dx2"));
+ 					itemObj.setStatus(rs2.getString("status"));
+ 
+ 					// serviceCode = rs2.getString("service_code");
+ 					fee = rs2.getString("fee");
+ 					// appt = rs2.getDate("appointment_date").toString();
+ 					// billingUnit = rs2.getString("billingunit");
+ 					// count = 6 - fee.length();
+ 					// apptDate =
+ 					// UtilDateUtilities.DateToString(rs2.getDate("appointment_date"),
+ 					// "yyyyMMdd");
+ 					dFee = Double.parseDouble(fee);
+ 					bdFee = new BigDecimal((double) dFee).setScale(2, BigDecimal.ROUND_HALF_UP);
+ 					BigTotal = BigTotal.add(bdFee);
+ 					_logger.info("createBillingFileStr(BigTotal = " + BigTotal + ")");
+ 					checkItem();
+ 					value += buildItem();
+ 					_logger.info("createBillingFileStr(value = " + value + ")");
+ 					htmlContent += buildSiteHTMLContentRecord(invCount);
+ 					htmlContent += printSiteErrorPartMsg();
+ 					invCount++;
+ 				}
+ 				checkNoDetailRecord(invCount);
+ 				htmlContent += printSiteErrorPartMsg();
+ 				if (eFlag.compareTo("1") == 0) {
+ 					updateHeader1BilledBatchId(ch1Obj.getId(), bhObj.getId());
+ 				}
+ 			}
+ 			hcCount = hcCount + healthcardCount;
+ 			pCount = pCount + patientCount;
+ 			rCount = rCount + recordCount;
+ 			// percent = new BigDecimal((double) 0.01).setScale(2,
+ 			// BigDecimal.ROUND_HALF_UP);
+ 			// BigTotal = BigTotal.multiply(percent);
+ 			BigTotal = BigTotal.setScale(2, BigDecimal.ROUND_HALF_UP);
+ 			value += buildTrailer();
+ 
+ 			htmlCode = buildSiteHTMLContentTrailer();
+ 			// writeHtml(htmlCode);
+ 			ohipReciprocal = String.valueOf(hcCount);
+ 			ohipRecord = String.valueOf(rCount);
+ 			ohipClaim = String.valueOf(pCount);
+ 			totalAmount = BigTotal.toString();
+ 			if (eFlag.compareTo("1") == 0) {
+ 				updateBatchHeaderSum(bhObj.getId(), "" + healthcardCount, "" + patientCount, "" + recordCount);
+ 			}
+ 		} catch (SQLException e) {
+ 			_logger.error("JdbcBillingCreateBillingFile(sql = " + query + ")");
+ 		}
+ 	}
+ 	
  	public String getHtmlCode() {
  		return htmlCode;

Index: JdbcBillingRAImpl.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/data/JdbcBillingRAImpl.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JdbcBillingRAImpl.java	7 Jul 2010 14:04:02 -0000	1.10
--- JdbcBillingRAImpl.java	30 Nov 2010 08:17:54 -0000	1.11
***************
*** 432,435 ****
--- 432,463 ----
  	}
  	
+ 	public List getSiteRahd(String status, String provider_no) {
+ 		List ret = new Vector();
+ 		String sql = "select r.raheader_no, r.totalamount, r.status, r.paymentdate, r.payable, r.records, r.claims, r.readdate "
+ 				+ "from raheader r, radetail t, provider p where r.raheader_no=t.raheader_no and p.ohip_no=t.providerohip_no and r.status <> '" + status + "' "
+ 				+ " 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='"+provider_no+"'))"
+ 				+ " group by r.raheader_no"
+ 				+ " order by r.paymentdate desc, r.readdate desc";
+ 		ResultSet rsdemo = dbObj.searchDBRecord(sql);
+ 		try {
+ 			while (rsdemo.next()) {
+ 				Properties prop = new Properties();
+ 				prop.setProperty("raheader_no", rsdemo.getString("raheader_no"));
+ 				prop.setProperty("readdate", rsdemo.getString("readdate"));
+ 				prop.setProperty("paymentdate", rsdemo.getString("paymentdate"));
+ 				prop.setProperty("payable", rsdemo.getString("payable"));
+ 				prop.setProperty("claims", rsdemo.getString("claims"));
+ 				prop.setProperty("records", rsdemo.getString("records"));
+ 				prop.setProperty("totalamount", rsdemo.getString("totalamount"));
+ 				prop.setProperty("status", rsdemo.getString("status"));
+ 				ret.add(prop);
+ 			}
+ 			rsdemo.close();
+ 		} catch (SQLException e) {
+ 			_logger.error("getAllRahd(sql = " + sql + ")");
+ 		}
+ 		return ret;
+ 	}	
+ 	
  	private String getPointNum(String strNum) {
  		String ret = null;

Index: JdbcBillingPageUtil.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/oscarBilling/ca/on/data/JdbcBillingPageUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** JdbcBillingPageUtil.java	7 Oct 2010 22:31:33 -0000	1.6
--- JdbcBillingPageUtil.java	30 Nov 2010 08:17:54 -0000	1.7
***************
*** 62,66 ****
--- 62,98 ----
  		return retval;
  	}
+ 	
+ 	public List getCurSiteProviderStr(String provider_no) {
+ 		List retval = new Vector();
+ 		String sql = "select provider_no,last_name,first_name,ohip_no,comments from provider p "
+ 				+ "where status='1' and ohip_no!='' " +
+ 						"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="+provider_no+"))" +
+ 						" order by last_name, first_name";
+ 		String proid = "";
+ 		String proFirst = "";
+ 		String proLast = "";
+ 		String proOHIP = "";
+ 		String specialty_code;
+ 		String billinggroup_no;
+ 		ResultSet rslocal = dbObj.searchDBRecord(sql);
+ 		try {
+ 			while (rslocal.next()) {
+ 				proid = rslocal.getString("provider_no");
+ 				proLast = rslocal.getString("last_name");
+ 				proFirst = rslocal.getString("first_name");
+ 				proOHIP = rslocal.getString("ohip_no");
+ 				billinggroup_no = getXMLStringWithDefault(rslocal.getString("comments"), "xml_p_billinggroup_no",
+ 						"0000");
+ 				specialty_code = getXMLStringWithDefault(rslocal.getString("comments"), "xml_p_specialty_code", "00");
+ 				retval.add(proid + "|" + proLast + "|" + proFirst + "|" + proOHIP + "|" + billinggroup_no + "|"
+ 						+ specialty_code);
+ 			}
+ 		} catch (SQLException e) {
+ 			_logger.error("getCurProviderStr(sql = " + sql + ")");
+ 		}
  
+ 		return retval;
+ 	}
+ 	
  	public List getCurProviderStr() {
  		List retval = new Vector();

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/schedule scheduletemplateapplying.jsp, 1.25, 1.26 scheduletemplatesetting.jsp, 1.11, 1.12

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

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

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

Index: scheduletemplateapplying.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduletemplateapplying.jsp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** scheduletemplateapplying.jsp	24 Nov 2010 03:59:41 -0000	1.25
--- scheduletemplateapplying.jsp	30 Nov 2010 08:17:54 -0000	1.26
***************
*** 41,44 ****
--- 41,46 ----
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
  <%@ taglib uri="/WEB-INF/rewrite-tag.tld" prefix="rewrite"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
  <!--  
  /*
***************
*** 73,76 ****
--- 75,146 ----
  <%@ include file="scheduleMainBeanConn.jspf"%>
  <% } %>
+ 
+ <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String CurProviderNo = (String) session.getAttribute("user");
+ 
+     if(session.getAttribute("userrole") == null )  response.sendRedirect("../logout.jsp");
+     String CurRoleName = (String)session.getAttribute("userrole") + "," + (String) session.getAttribute("user");
+     
+     boolean isSiteAccessPrivacy=false;
+ %>
+ 
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=CurRoleName%>" rights="r" reverse="false">
+ 	<%isSiteAccessPrivacy=true; %>
+ </security:oscarSec>
+ 
+ 
+ <%!  boolean bMultisites=org.oscarehr.common.IsPropertiesOn.isMultisitesEnable(); %>
+ <%!  String [] bgColors; %>
+ <%!  List<String> excludedSites = new ArrayList<String>(); %>
+ <%
+   
+   String weekdaytag[] = {"SUN","MON","TUE","WED","THU","FRI","SAT"};
+   boolean bAlternate =(request.getParameter("alternate")!=null&&request.getParameter("alternate").equals("checked") )?true:false;
+   boolean bOrigAlt = false;
+ 
+   OscarProperties props = OscarProperties.getInstance();
+   
+   boolean bMoreAddr = bMultisites
+   						? true
+   						: (props.getProperty("scheduleSiteID", "").equals("") ? false : true);
+   String [] addr;
+   
+   if (bMultisites) {
+ 	//multisite starts =====================	  
+ 	  SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
+       List<Site> sites = siteDao.getActiveSitesByProviderNo((String)request.getParameter("provider_no")); 
+       List<Site> managerSites; 
+ 
+ 	  if (isSiteAccessPrivacy) {
+ 		  // login user have site manager role
+ 		  managerSites = siteDao.getActiveSitesByProviderNo(CurProviderNo);
+ 		  //build excluded sites list for sites that not in current site manager 
+ 		  for (Site site : sites) {
+ 			  if (!managerSites.contains(site)) {
+ 				  excludedSites.add(site.getName());
+ 			  }
+ 		  }
+ 		  
+ 	  }
+ 
+ 	  //login user have admin role
+ 	  addr = new String[sites.size()+1];
+ 	  bgColors = new String[sites.size()+1];
+   
+       for (int i=0; i<sites.size(); i++) {
+ 		  addr[i]=sites.get(i).getName();
+ 		  bgColors[i]=sites.get(i).getBgColor();
+       }
+ 	  addr[sites.size()]="NONE";
+ 	  bgColors[sites.size()]="white";
+ 
+ 
+ 	//multisite ends =====================	 
+   } else {
+   	  addr = props.getProperty("scheduleSiteID", "").split("\\|");
+   }
+   
+ %>
  <%
    String today = UtilDateUtilities.DateToString(UtilDateUtilities.now(), "yyyy-MM-dd" );  
***************
*** 847,861 ****
  </body>
  <%! String getSelectAddr(String s, String [] site, String sel) {
! 		String ret = "<select name='" + s + "' onchange='this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor'>";
  		int ind=0;
  		for(int i=0; i<site.length; i++) {
  			String t = site[i].equals(sel) ? " selected" : "";
! 			if (site[i].equals(sel))
  				ind=i;
! 			ret += "<option value='" + site[i] + "'" + t + (bMultisites? " style='background-color:"+bgColors[i]+"'" : "") +">" + site[i] + "</option>";
  		}
  		ret += "</select>";
  		if (bMultisites)
! 			ret += "<script>document.schedule."+s+".style.backgroundColor='"+bgColors[ind]+"'</script>";
  		return ret;
  }
--- 917,951 ----
  </body>
  <%! String getSelectAddr(String s, String [] site, String sel) {
! 	
! 		boolean isExcludedSiteSelected = false;
! 		if (bMultisites && excludedSites.contains(sel)) 	
! 			isExcludedSiteSelected = true; //"; text-decoration:line-through;";
! 		
! 		String ret = "<select name='" + s + "' "  + (isExcludedSiteSelected ? " disabled style='text-decoration:line-through;'  " : "")  
! 			+ " onchange='this.style.backgroundColor=this.options[this.selectedIndex].style.backgroundColor'>";
  		int ind=0;
+ 		boolean isSiteSel=false;
+ 		
  		for(int i=0; i<site.length; i++) {
  			String t = site[i].equals(sel) ? " selected" : "";
! 			if (site[i].equals(sel)) {
  				ind=i;
! 				isSiteSel = true;
! 			}
! 			if (i==site.length - 1 && isSiteSel ==false) {
! 				//if None of the site has been selected, default select to the last one "None"
! 				ind=i;
! 				t = " selected";
! 			}
! 			
! 			if ((isExcludedSiteSelected) || (!excludedSites.contains(site[i]))) {
! 				ret += "<option value='" + site[i] + "'" + t + (bMultisites? " style='background-color:"+bgColors[i] + "'": "") +">" + site[i] + "</option>";
! 			}
  		}
  		ret += "</select>";
  		if (bMultisites)
! 			ret += "<script>document.schedule."+s+".style.backgroundColor='"+bgColors[ind]+"';</script>";
! 		if (isExcludedSiteSelected)
! 			ret += "<script>document.schedule.check"+s.substring(0,3)+".disabled='true';</script>";
  		return ret;
  }

Index: scheduletemplatesetting.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/schedule/scheduletemplatesetting.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** scheduletemplatesetting.jsp	24 Nov 2010 03:59:41 -0000	1.11
--- scheduletemplatesetting.jsp	30 Nov 2010 08:17:54 -0000	1.12
***************
*** 31,34 ****
--- 31,35 ----
  <%@ 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"%>
  
  <jsp:useBean id="scheduleMainBean" class="oscar.AppointmentMainBean"
***************
*** 43,46 ****
--- 44,66 ----
  %>
  
+ <%
+     boolean isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
+     String dboperation = "search_provider";
+ %>
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%
+ 		isSiteAccessPrivacy=true;
+ 		dboperation = "site_search_provider";
+ 	%>
+ </security:oscarSec>
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%
+ 		isTeamAccessPrivacy=true; 
+ 		dboperation = "team_search_provider";
+ 	%>
+ </security:oscarSec>
+ 
+ 
  <html:html locale="true">
  <head>
***************
*** 144,148 ****
  					<%
     String param = "doctor";
!    ResultSet rsgroup = scheduleMainBean.queryResults(param, "search_provider");
   	 while (rsgroup.next()) { 
  %>
--- 164,168 ----
  					<%
     String param = "doctor";
!    ResultSet rsgroup = scheduleMainBean.queryResults(param, dboperation);
   	 while (rsgroup.next()) { 
  %>
***************
*** 150,154 ****
  					<% } 
     param = "receptionist";
!    rsgroup = scheduleMainBean.queryResults(param, "search_provider");
   	 while (rsgroup.next()) { 
  %>
--- 170,174 ----
  					<% } 
     param = "receptionist";
!    rsgroup = scheduleMainBean.queryResults(param, dboperation);
   	 while (rsgroup.next()) { 
  %>
***************
*** 156,160 ****
  					<% } 
     param = "admin";
!    rsgroup = scheduleMainBean.queryResults(param, "search_provider");
   	 while (rsgroup.next()) { 
  %>
--- 176,180 ----
  					<% } 
     param = "admin";
!    rsgroup = scheduleMainBean.queryResults(param, dboperation);
   	 while (rsgroup.next()) { 
  %>
***************
*** 174,177 ****
--- 194,198 ----
  				<td>&nbsp;</td>
  			</tr>
+ 		<%if (!( isSiteAccessPrivacy  || isTeamAccessPrivacy )) {%>
  			<tr>
  				<td nowrap bgcolor="#CCFFCC">&nbsp; <a HREF="#"
***************
*** 184,191 ****
--- 205,216 ----
  			</tr>
  			<tr>
+ 
  				<td nowrap bgcolor="#CCFFFF">&nbsp; <a HREF="#"
  					ONCLICK="popupPage(600,700,'scheduletemplatecodesetting.jsp')"><bean:message
  					key="schedule.scheduletemplatesetting.btnTemplateCodeSetting" /></a></td>
+ 					
+ 
  			</tr>
+ 		<%} %>				
  			<tr>
  				<td nowrap bgcolor="#CCFFFF">&nbsp; <a HREF="#" onClick="go()"><bean:message
***************
*** 197,201 ****
  					<%
     param = "doctor";
!    rsgroup = scheduleMainBean.queryResults(param, "search_provider");
   	 while (rsgroup.next()) { 
  %>
--- 222,226 ----
  					<%
     param = "doctor";
!    rsgroup = scheduleMainBean.queryResults(param, dboperation);
   	 while (rsgroup.next()) { 
  %>
***************
*** 203,207 ****
  					<% } 
     param = "receptionist";
!    rsgroup = scheduleMainBean.queryResults(param, "search_provider");
   	 while (rsgroup.next()) { 
  %>
--- 228,232 ----
  					<% } 
     param = "receptionist";
!    rsgroup = scheduleMainBean.queryResults(param, dboperation);
   	 while (rsgroup.next()) { 
  %>
***************
*** 209,213 ****
  					<% } 
     param = "admin";
!    rsgroup = scheduleMainBean.queryResults(param, "search_provider");
   	 while (rsgroup.next()) { 
  %>
--- 234,238 ----
  					<% } 
     param = "admin";
!    rsgroup = scheduleMainBean.queryResults(param, dboperation);
   	 while (rsgroup.next()) { 
  %>

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

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

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

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

Index: appointmentprovideradminmonth.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminmonth.jsp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** appointmentprovideradminmonth.jsp	24 Nov 2010 03:55:33 -0000	1.38
--- appointmentprovideradminmonth.jsp	30 Nov 2010 08:17:56 -0000	1.39
***************
*** 29,32 ****
--- 29,39 ----
  private boolean bMultisites = org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();
  
+ private List<Site> curUserSites = new ArrayList<Site>();
+ private String [] curScheduleMultisite;
+ private List<String> siteProviderNos = new ArrayList<String>();
+ private List<String> siteGroups = new ArrayList<String>();
+ private String selectedSite = null;
+ private HashMap<String,String> siteBgColor = new HashMap<String,String>();
+ private HashMap<String,String> CurrentSiteMap = new HashMap<String,String>();
  private String getSiteHTML(String reason, List<Site> sites) {
  	 if (reason==null||reason.trim().length()==0) 
***************
*** 35,48 ****
  		 return "<span style='background-color:"+ApptUtil.getColorFromLocation(sites, reason)+"'>"+ApptUtil.getShortNameFromLocation(sites, reason)+"</span>";	
  }
- %>
- <%
- if (bMultisites) {
- 	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
- 	sites = siteDao.getAllSites();
- }
  //multisite ends =====================
  %>
  
- 
  <!--oscarMessenger Code block -->
  <%@ taglib uri="/WEB-INF/msg-tag.tld" prefix="oscarmessage"%>
--- 42,48 ----
***************
*** 65,69 ****
    userfirstname = (String) session.getAttribute("userfirstname");
    userlastname = (String) session.getAttribute("userlastname");
!   mygroupno = (String) session.getAttribute("groupno");  
  if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){
    n_t_w_w = (String) session.getAttribute("newticklerwarningwindow");
--- 65,69 ----
    userfirstname = (String) session.getAttribute("userfirstname");
    userlastname = (String) session.getAttribute("userlastname");
!   mygroupno = ((String) request.getParameter("mygroup_no") == null ? (String) session.getAttribute("groupno") : (String) request.getParameter("mygroup_no"));  
  if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){
    n_t_w_w = (String) session.getAttribute("newticklerwarningwindow");
***************
*** 79,86 ****
    int everyMin=Integer.parseInt(((String) session.getAttribute("everymin")).trim());
    int view=0;
!   String providerview = request.getParameter("providerview")==null?(mygroupno.equals(".default")?curProvider_no:("_grp_"+mygroupno)):request.getParameter("providerview") ;
    //String providerview = request.getParameter("providerview")==null?curProvider_no:request.getParameter("providerview") ;
    int NameMaxLen = 15;
  %>
  <%@ page
  	import="java.lang.*, java.util.*, java.text.*,java.net.*,java.sql.*,oscar.*"
--- 79,169 ----
    int everyMin=Integer.parseInt(((String) session.getAttribute("everymin")).trim());
    int view=0;
!   
!   boolean isMygroupnoNumber = true;
!   
!   if (mygroupno!=null) {
!       try {
!           Integer.parseInt(mygroupno);
!       }
!       catch (NumberFormatException ex) {
!     	  isMygroupnoNumber = false;
!       }	  
!   }
!   else {
! 	  isMygroupnoNumber = false;
!   }
!   
!   String providerview;
!   
!   if (isMygroupnoNumber) {
! 	  providerview = request.getParameter("providerview")==null?(mygroupno.equals(".default")?curProvider_no:mygroupno):request.getParameter("providerview") ;
!   }
!   else {
! 	  providerview = request.getParameter("providerview")==null?(mygroupno.equals(".default")?curProvider_no:("_grp_"+mygroupno)):request.getParameter("providerview") ;
!   }
    //String providerview = request.getParameter("providerview")==null?curProvider_no:request.getParameter("providerview") ;
    int NameMaxLen = 15;
  %>
+ <%
+ //multisite starts =====================
+ 	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>
+ 
+ <% 
+ if (bMultisites) {
+ 	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
+ 	sites = siteDao.getAllActiveSites(); 
+ 	
+ 	String requestSite = (String) request.getParameter("site") ;
+ 	if (requestSite!=null) 
+ 	{
+ 		requestSite = (requestSite.equals("none") ? null : requestSite);
+ 		session.setAttribute("site_selected", requestSite );
+ 	}
+ 	selectedSite = (requestSite == null ? (String)session.getAttribute("site_selected") : requestSite) ;
+ 	
+ 	System.out.println("selectedSite:" + selectedSite + "  providerview: " + providerview + " mygroupno: " + mygroupno);
+ 
+ 	if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+ 		//user has Access Privacy, set user provider and group list
+ 		String siteManagerProviderNo = (String) session.getAttribute("user");
+ 		curUserSites = siteDao.getActiveSitesByProviderNo(siteManagerProviderNo);
+ 		if (selectedSite==null) {
+ 			siteProviderNos = siteDao.getProviderNoBySiteManagerProviderNo(siteManagerProviderNo);
+ 			siteGroups = siteDao.getGroupBySiteManagerProviderNo(siteManagerProviderNo);
+ 		}
+ 	}
+ 	else {
+ 		//get all active site as user site list
+ 		curUserSites = sites;
+ 	}
+ 	
+ 	for (Site s : curUserSites) {
+ 		CurrentSiteMap.put(s.getName(),"Y");
+ 	}
+ 	// a site has been seleceted
+ 	if (selectedSite != null) {
+ 		//get site provider list
+ 		siteProviderNos = siteDao.getProviderNoBySiteLocation(selectedSite);
+ 		siteGroups = siteDao.getGroupBySiteLocation(selectedSite);
+ 	}
+ 	
+ 	//get all sites bgColors
+ 	for (Site st : sites) {
+ 		siteBgColor.put(st.getName(),st.getBgColor());
+ 	}
+ 	
+ 
+ }
+ //multisite ends =======================
+ %>
+ 
  <%@ page
  	import="java.lang.*, java.util.*, java.text.*,java.net.*,java.sql.*,oscar.*"
***************
*** 476,479 ****
--- 559,595 ----
  
  <% boolean isTeamOnly=false; %>
+ 
+ 	<!--  multi-site , add site dropdown list -->
+  <%if (bMultisites) { %>		
+ 	   <script>
+ 			function changeSite(sel) {
+ 				sel.style.backgroundColor=sel.options[sel.selectedIndex].style.backgroundColor;
+ 				var siteName = sel.options[sel.selectedIndex].value;
+ 				var newGroupNo = "<%=(mygroupno == null ? "all" : mygroupno)%>";
+ 				var providerview = "<%=providerview%>" ;
+ 				if(providerview.indexOf("_grp_")!=-1 ) 
+         		{				
+         		
+         			window.open("providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=1&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=month&dboperation=searchappointmentmonth" + "&site=" + siteName +"&mygroup_no="+newGroupNo,"_self");	
+ 	            }
+ 	            else
+ 		        {
+ 					window.open("providercontrol.jsp?year=<%=year%>&month=<%=month%>&day=1&view=<%=view==0?"0":("1&curProvider="+request.getParameter("curProvider")+"&curProviderName="+request.getParameter("curProviderName") )%>&displaymode=month&dboperation=searchappointmentmonth" + "&site=" + siteName + "&providerview=" + providerview,"_self");
+ 		        }
+ 			}
+       </script>
+       
+     	<select id="site" name="site" onchange="changeSite(this)" style="background-color: <%=( selectedSite == null || siteBgColor.get(selectedSite) == null ? "#FFFFFF" : siteBgColor.get(selectedSite))%>">
+     		<option value="none" style="background-color:white">---all clinic---</option>
+     	<%
+     	for (int i=0; i<curUserSites.size(); i++) {
+     	%>
+     		<option value="<%= curUserSites.get(i).getName() %>" style="background-color:<%= curUserSites.get(i).getBgColor() %>" 
+     				<%=(curUserSites.get(i).getName().equals(selectedSite)) ? " selected " : "" %> >
+     			<%= curUserSites.get(i).getName() %>
+     		</option>
+     	<% } %>
+     	</select>
+ <%} %>    	
  				<select name="provider_no" onChange="selectprovider(this)">
  					<option value="all" <%=providerview.equals("all")?"selected":""%>><bean:message
***************
*** 500,512 ****
  	resultList = oscarSuperManager.find("providerDao", "searchmygroupno", new Object[] {});
  	for (Map group : resultList) {
  %>
  					<option value="<%="_grp_"+group.get("mygroup_no")%>"
! 						<%=mygroupno.equals(group.get("mygroup_no"))?"selected":""%>><bean:message
  						key="provider.appointmentprovideradminmonth.formGRP" />: <%=group.get("mygroup_no")%></option>
  <%
  	}
  
  	resultList = oscarSuperManager.find("providerDao", "searchprovider", new Object[] {});
  	for (Map provider : resultList) {
  		providerNameBean.setDef(String.valueOf(provider.get("provider_no")), provider.get("last_name")+","+provider.get("first_name"));
  %>
--- 616,631 ----
  	resultList = oscarSuperManager.find("providerDao", "searchmygroupno", new Object[] {});
  	for (Map group : resultList) {
+ 		if (!bMultisites || siteGroups == null || siteGroups.size() == 0 || siteGroups.contains(group.get("mygroup_no"))) {  		
  %>
  					<option value="<%="_grp_"+group.get("mygroup_no")%>"
! 						<%=(providerview.indexOf("_grp_") != -1 && mygroupno.equals(group.get("mygroup_no")))?"selected":""%>><bean:message
  						key="provider.appointmentprovideradminmonth.formGRP" />: <%=group.get("mygroup_no")%></option>
  <%
+ 		}
  	}
  
  	resultList = oscarSuperManager.find("providerDao", "searchprovider", new Object[] {});
  	for (Map provider : resultList) {
+ 		if (!bMultisites || siteProviderNos  == null || siteProviderNos.size() == 0 || siteProviderNos.contains(provider.get("provider_no"))) { 
  		providerNameBean.setDef(String.valueOf(provider.get("provider_no")), provider.get("last_name")+","+provider.get("first_name"));
  %>
***************
*** 514,517 ****
--- 633,637 ----
  						<%=providerview.equals(provider.get("provider_no"))?"selected":""%>><%=providerNameBean.getShortDef(String.valueOf(provider.get("provider_no")), "", NameMaxLen)%></option>
  <%
+ 		}
  	}
  %>
***************
*** 568,574 ****
     	} else
      if(providerview.equals("all") || providerview.startsWith("_grp_",0)) {
!       param[0] = year+"-"+month+"-"+"1";
!       param[1] = cal.get(Calendar.YEAR)+"-"+(cal.get(Calendar.MONTH)+1)+"-"+"1";
!       resultList = oscarSuperManager.find("providerDao", "search_scheduledate_datep", param);
      } else {
        String[] param1 = new String[3];
--- 688,699 ----
     	} else
      if(providerview.equals("all") || providerview.startsWith("_grp_",0)) {
! 	      param[0] = year+"-"+month+"-"+"1";
! 	      param[1] = cal.get(Calendar.YEAR)+"-"+(cal.get(Calendar.MONTH)+1)+"-"+"1";
! 		  if (selectedSite == null) {  
! 		      resultList = oscarSuperManager.find("providerDao", "search_scheduledate_datep", param);
! 	    	}
! 	    	else	{
! 	    	  resultList = oscarSuperManager.find("providerDao", "site_search_scheduledate_datep", new String[]{param[0], param[1], selectedSite});	
! 	      }
      } else {
        String[] param1 = new String[3];
***************
*** 612,615 ****
--- 737,741 ----
      }
      if(isTeamOnly || !providerview.startsWith("_grp_",0) || myGrpBean.containsKey(String.valueOf(date.get("provider_no"))) ) {
+     	if (bMultisites && CurrentSiteMap.get((String)date.get("reason")) != null && ( selectedSite == null || (selectedSite != null && selectedSite.equals((String)date.get("reason"))))) {
  %> <br>
  <% if (bMultisites) { out.print(getSiteHTML((String)date.get("reason"), sites)); } %>
***************
*** 619,623 ****
  						<span class='datepreason'><%=date.get("reason") %></span>
  <% } %>
! <%  }  } %>
  					</a></font></td>
  					<%
--- 745,749 ----
  						<span class='datepreason'><%=date.get("reason") %></span>
  <% } %>
! <%  } } } %>
  					</a></font></td>
  					<%

Index: appointmentprovideradminday.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/provider/appointmentprovideradminday.jsp,v
retrieving revision 1.199
retrieving revision 1.200
diff -C2 -d -r1.199 -r1.200
*** appointmentprovideradminday.jsp	24 Nov 2010 04:30:23 -0000	1.199
--- appointmentprovideradminday.jsp	30 Nov 2010 08:17:56 -0000	1.200
***************
*** 1,8 ****
  <%!
  //multisite starts =====================
  private boolean bMultisites = org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();	
  private JdbcApptImpl jdbc = new JdbcApptImpl();
! private List<Site> sites;
! private String [] curScheduleMultisite;
  private String getSiteHTML(String scDate, String provider_no, List<Site> sites) {
  	 if (!bMultisites) return "";
--- 1,32 ----
+ <% response.setHeader("Cache-Control","no-cache");%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ <%@page import="org.oscarehr.common.model.Provider"%>
+ 
+ <%
+ 	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>
+ 
  <%!
  //multisite starts =====================
  private boolean bMultisites = org.oscarehr.common.IsPropertiesOn.isMultisitesEnable();	
  private JdbcApptImpl jdbc = new JdbcApptImpl();
! private List<Site> sites = new ArrayList<Site>();
! private List<Site> curUserSites = new ArrayList<Site>();
! private List<String> siteProviderNos = new ArrayList<String>();
! private List<String> siteGroups = new ArrayList<String>();
! private String selectedSite = null;
! private HashMap<String,String> siteBgColor = new HashMap<String,String>();
! private HashMap<String,String> CurrentSiteMap = new HashMap<String,String>();
! 
  private String getSiteHTML(String scDate, String provider_no, List<Site> sites) {
  	 if (!bMultisites) return "";
***************
*** 11,17 ****
  }
  %>
! <% if (bMultisites) {
! SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
! sites = siteDao.getAllSites(); 
  }
  //multisite ends =======================
--- 35,70 ----
  }
  %>
! <% 
! if (bMultisites) {
! 	SiteDao siteDao = (SiteDao)WebApplicationContextUtils.getWebApplicationContext(application).getBean("siteDao");
! 	sites = siteDao.getAllActiveSites(); 
! 	selectedSite = (String)session.getAttribute("site_selected");
! 	
! 	if (selectedSite != null) {
! 		//get site provider list
! 		siteProviderNos = siteDao.getProviderNoBySiteLocation(selectedSite);
! 		siteGroups = siteDao.getGroupBySiteLocation(selectedSite);
! 	}
! 	
! 	if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
! 		String siteManagerProviderNo = (String) session.getAttribute("user");
! 		curUserSites = siteDao.getActiveSitesByProviderNo(siteManagerProviderNo);
! 		if (selectedSite==null) {
! 			siteProviderNos = siteDao.getProviderNoBySiteManagerProviderNo(siteManagerProviderNo);
! 			siteGroups = siteDao.getGroupBySiteManagerProviderNo(siteManagerProviderNo);
! 		}
! 	}
! 	else {
! 		curUserSites = sites;
! 	}
! 	
! 	for (Site s : curUserSites) {
! 		CurrentSiteMap.put(s.getName(),"Y");
! 	}
! 	
! 	//get all sites bgColors
! 	for (Site st : sites) {
! 		siteBgColor.put(st.getName(),st.getBgColor());
! 	}
  }
  //multisite ends =======================
***************
*** 484,494 ****
  
  function review(key) {
! if(self.location.href.lastIndexOf("?") > 0) {
! if(self.location.href.lastIndexOf("&viewall=") > 0 ) a = self.location.href.substring(0,self.location.href.lastIndexOf("&viewall="));
! else a = self.location.href;
! } else {
! a="providercontrol.jsp?year="+document.jumptodate.year.value+"&month="+document.jumptodate.month.value+"&day="+document.jumptodate.day.value+"&view=0&displaymode=day&dboperation=searchappointmentday";
! }
! self.location.href = a + "&viewall="+key ;
  }
  
--- 537,547 ----
  
  function review(key) {
!   if(self.location.href.lastIndexOf("?") > 0) {
!     if(self.location.href.lastIndexOf("&viewall=") > 0 ) a = self.location.href.substring(0,self.location.href.lastIndexOf("&viewall="));
!     else a = self.location.href;
!   } else {
!     a="providercontrol.jsp?year="+document.jumptodate.year.value+"&month="+document.jumptodate.month.value+"&day="+document.jumptodate.day.value+"&view=0&displaymode=day&dboperation=searchappointmentday&site=" + "<%=(selectedSite==null? "none" : selectedSite)%>";
!   }
!   self.location.href = a + "&viewall="+key ;
  }
  
***************
*** 512,517 ****
  }
  
! function changeGroup() {
! var s = document.appointmentForm.elements['mygroup_no'];		
  var newGroupNo = s.options[s.selectedIndex].value;
  if(newGroupNo.indexOf("_grp_") != -1) {
--- 565,569 ----
  }
  
! function changeGroup(s) {
  var newGroupNo = s.options[s.selectedIndex].value;
  if(newGroupNo.indexOf("_grp_") != -1) {
***************
*** 664,680 ****
       curProvider_no[0]=mygroupno;
       curProviderName[0]=providerBean.getProperty(mygroupno);
- // multisite start =============
- 	 curScheduleMultisite = new String[]{ bMultisites?getSiteHTML(_scheduleDate, curProvider_no[0], sites):"" };
- // multisite end =============
  } else {
! if(view==0) { //multiple views
!            resultList = oscarSuperManager.find("providerDao", "searchmygroupcount", new Object[] {mygroupno});
!            for (Map count : resultList) {
!                 numProvider = ((Long)(count.get(count.keySet().toArray()[0]))).intValue();
  	   }
! String [] param3 = new String [2];
! param3[0] = mygroupno;
! param3[1] = strDate; //strYear +"-"+ strMonth +"-"+ strDay ;
!        resultList = oscarSuperManager.find("providerDao", "search_numgrpscheduledate", param3);
         for (Map count : resultList) {
           numAvailProvider = ((Long)(count.get(count.keySet().toArray()[0]))).intValue();
--- 716,739 ----
       curProvider_no[0]=mygroupno;
       curProviderName[0]=providerBean.getProperty(mygroupno);
  } else {
! 	if(view==0) { //multiple views
! 	   if (selectedSite!=null) {
! 		   	resultList = oscarSuperManager.find("providerDao", "site_searchmygroupcount", new Object[] {mygroupno,selectedSite});   
  	   }
! 	   else {
! 			resultList = oscarSuperManager.find("providerDao", "searchmygroupcount", new Object[] {mygroupno});
! 	   }
! 	   for (Map count : resultList) {
! 	        numProvider = ((Long)(count.get(count.keySet().toArray()[0]))).intValue();
! 	   }
!        String [] param3 = new String [2];
!        param3[0] = mygroupno;
!        param3[1] = strDate; //strYear +"-"+ strMonth +"-"+ strDay ;
!        if (selectedSite!=null) {
!     	   	resultList = oscarSuperManager.find("providerDao", "site_search_numgrpscheduledate", new Object[]{mygroupno,strDate,selectedSite});
!        }
!        else {
!        		resultList = oscarSuperManager.find("providerDao", "search_numgrpscheduledate", param3);
!        }
         for (Map count : resultList) {
           numAvailProvider = ((Long)(count.get(count.keySet().toArray()[0]))).intValue();
***************
*** 686,692 ****
         curProvider_no = new String []{curUser_no};  //[numProvider];
         curProviderName = new String []{(userlastname+", "+userfirstname)}; //[numProvider];
- // multisite start =============	 
-   	 curScheduleMultisite = new String[]{ bMultisites?getSiteHTML(_scheduleDate, curProvider_no[0], sites):"" };
- // multisite end =============       
       } else {
         if(request.getParameter("viewall")!=null && request.getParameter("viewall").equals("1") ) {
--- 745,748 ----
***************
*** 699,712 ****
       curProvider_no = new String [numProvider];
       curProviderName = new String [numProvider];
- curScheduleMultisite = new String [numProvider];
       
       int iTemp = 0;
!      resultList = oscarSuperManager.find("providerDao", "searchmygroupprovider", new Object[] {mygroupno});
       for (Map provider : resultList) {
         curProvider_no[iTemp] = String.valueOf(provider.get("provider_no"));
         curProviderName[iTemp] = provider.get("first_name")+" "+provider.get("last_name");
-  // multisite start =============  	 
-   	 curScheduleMultisite[iTemp] = bMultisites?getSiteHTML(_scheduleDate, curProvider_no[iTemp], sites):"";
-  // multisite end =============       
         iTemp++;
       }
--- 755,769 ----
       curProvider_no = new String [numProvider];
       curProviderName = new String [numProvider];
       
       int iTemp = 0;
!      if (selectedSite!=null) {
!     	 resultList = oscarSuperManager.find("providerDao", "site_searchmygroupprovider", new Object[] {mygroupno,selectedSite}); 
!      }
!      else {
!      	 resultList = oscarSuperManager.find("providerDao", "searchmygroupprovider", new Object[] {mygroupno});
!      }
       for (Map provider : resultList) {
         curProvider_no[iTemp] = String.valueOf(provider.get("provider_no"));
         curProviderName[iTemp] = provider.get("first_name")+" "+provider.get("last_name");
         iTemp++;
       }
***************
*** 718,724 ****
       curProvider_no[0]=request.getParameter("curProvider");
       curProviderName[0]=request.getParameter("curProviderName");
- // multisite start =============
- 	 curScheduleMultisite = new String[]{ bMultisites?getSiteHTML(_scheduleDate, curProvider_no[0], sites):"" };
- // multisite end =============
     }
  }
--- 775,778 ----
***************
*** 991,997 ****
  //session.setAttribute("case_program_id", null);
  %>
    <a href=# onClick = "popupPage(300,450,'providerchangemygroup.jsp?mygroup_no=<%=mygroupno%>' );return false;" title="<bean:message key="provider.appointmentProviderAdminDay.chGrpNo"/>"><bean:message key="global.group"/>:</a>
  
!   <select id="mygroup_no" name="mygroup_no" onChange="changeGroup()">
    <option value=".<bean:message key="global.default"/>">.<bean:message key="global.default"/></option>
  
--- 1045,1078 ----
  //session.setAttribute("case_program_id", null);
  %>
+ 	<!--  multi-site , add site dropdown list -->
+  <%if (bMultisites) { %>	
+ 	   <script>
+ 			function changeSite(sel) {
+ 				sel.style.backgroundColor=sel.options[sel.selectedIndex].style.backgroundColor;
+ 				var siteName = sel.options[sel.selectedIndex].value;
+ 				var newGroupNo = "<%=(mygroupno == null ? ".default" : mygroupno)%>";
+ 			        <%if (org.oscarehr.common.IsPropertiesOn.isCaisiEnable() && org.oscarehr.common.IsPropertiesOn.isTicklerPlusEnable()){%>
+ 				  popupPage(10,10, "providercontrol.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&new_tickler_warning_window=<%=newticklerwarningwindow%>&default_pmm=<%=default_pmm%>&color_template=deepblue&dboperation=updatepreference&displaymode=updatepreference&mygroup_no="+newGroupNo+"&site="+siteName);
+ 			        <%}else {%>
+ 			          popupPage(10,10, "providercontrol.jsp?provider_no=<%=curUser_no%>&start_hour=<%=startHour%>&end_hour=<%=endHour%>&every_min=<%=everyMin%>&color_template=deepblue&dboperation=updatepreference&displaymode=updatepreference&mygroup_no="+newGroupNo+"&site="+siteName);
+ 			        <%}%>
+ 			}
+       </script>
+       
+     	<select id="site" name="site" onchange="changeSite(this)" style="background-color: <%=( selectedSite == null || siteBgColor.get(selectedSite) == null ? "#FFFFFF" : siteBgColor.get(selectedSite))%>">
+     		<option value="none" style="background-color:white">---all clinic---</option>
+     	<%
+     	for (int i=0; i<curUserSites.size(); i++) {
+     	%>
+     		<option value="<%= curUserSites.get(i).getName() %>" style="background-color:<%= curUserSites.get(i).getBgColor() %>" 
+     				<%=(curUserSites.get(i).getName().equals(selectedSite)) ? " selected " : "" %> >
+     			<%= curUserSites.get(i).getName() %>
+     		</option>
+     	<% } %>
+     	</select>
+ <%} %>	
    <a href=# onClick = "popupPage(300,450,'providerchangemygroup.jsp?mygroup_no=<%=mygroupno%>' );return false;" title="<bean:message key="provider.appointmentProviderAdminDay.chGrpNo"/>"><bean:message key="global.group"/>:</a>
  
!   <select id="mygroup_no" name="mygroup_no" onChange="changeGroup(this)">
    <option value=".<bean:message key="global.default"/>">.<bean:message key="global.default"/></option>
  
***************
*** 1017,1032 ****
--- 1098,1117 ----
  	resultList = oscarSuperManager.find("providerDao", "searchmygroupno", new Object[] {});
  	for (Map group : resultList) {
+ 		if (!bMultisites || siteGroups == null || siteGroups.size() == 0 || siteGroups.contains(group.get("mygroup_no"))) {  
  %>
    <option value="<%="_grp_"+group.get("mygroup_no")%>"
  		<%=mygroupno.equals(group.get("mygroup_no"))?"selected":""%>><%=group.get("mygroup_no")%></option>
  <%
+ 		}
  	}
  
  	resultList = oscarSuperManager.find("providerDao", "searchprovider", new Object[] {});
  	for (Map provider : resultList) {
+ 		if (!bMultisites || siteProviderNos  == null || siteProviderNos.size() == 0 || siteProviderNos.contains(provider.get("provider_no"))) { 
  %>
    <option value="<%=provider.get("provider_no")%>" <%=mygroupno.equals(provider.get("provider_no"))?"selected":""%>>
  		<%=provider.get("last_name")+", "+provider.get("first_name")%></option>
  <%
+ 		}
  	}
  %>
***************
*** 1349,1357 ****
--- 1434,1451 ----
                    String notes = String.valueOf(appointment.get("notes")).trim();
                    String status = String.valueOf(appointment.get("status")).trim();
+           	  String sitename = String.valueOf(appointment.get("location")).trim();
            	  bFirstTimeRs=true;
  			    as.setApptStatus(status);
+ 			    
+ 			 //multi-site. if a site have been selected, only display appointment in that site   
+ 			 if (!bMultisites || (selectedSite == null && CurrentSiteMap.get(sitename) != null) || sitename.equals(selectedSite)) {   
          %>
              <td class="appt" bgcolor='<%=as.getBgColor()%>' rowspan="<%=iRows%>" <%-- =view==0?(len==lenLimitedL?"nowrap":""):"nowrap"--%> nowrap>
  
+ 			 <!-- multisites : add colour-coded to the "location" value of that appointment. -->
+ 			 <%if (bMultisites) {%>
+ 			 	<span title="<%= sitename %>" style="background-color:<%=siteBgColor.get(sitename)%>;">&nbsp;</span>|
+ 			 <%} %>
+ 			 
              <%
  			    if (as.getNextStatus() != null && !as.getNextStatus().equals("")) {
***************
*** 1472,1476 ****
  
  	  <security:oscarSec roleName="<%=roleName$%>" objectName="_appointment.doctorLink" rights="r">
!       <a href=# onClick="popupOscarRx(700,1027,'../oscarRx/choosePatient.do?providerNo=<%=curUser_no%>&demographicNo=<%=demographic_no%>')" title="<bean:message key="global.prescriptions"/>">|<bean:message key="global.rx"/></a>
        <%
  	  if("bc".equalsIgnoreCase(prov)){
--- 1566,1571 ----
  
  	  <security:oscarSec roleName="<%=roleName$%>" objectName="_appointment.doctorLink" rights="r">
!       <a href=# onClick="popupWithApptNo(700,1027,'../oscarRx/choosePatient.do?providerNo=<%=curUser_no%>&demographicNo=<%=demographic_no%>','rx',<%=appointment.get("appointment_no")%>)" title="<bean:message key="global.prescriptions"/>">|<bean:message key="global.rx"/>
!       </a>
        <%
  	  if("bc".equalsIgnoreCase(prov)){
***************
*** 1505,1508 ****
--- 1600,1604 ----
          <%
          			}
+         			}
          			bFirstFirstR = false;
            	}

[Oscarmcmaster-cvscommit] oscar_mcmaster/database/mysql/updates update-2010-11-30.sql, NONE, 1.1

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

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

Added Files:
	update-2010-11-30.sql 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

--- NEW FILE: update-2010-11-30.sql ---
-- ET: Multiple Offices Support
-- updated by vweng July 15, 2010

-- create security objects
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
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`;

-- add site provider id range

ALTER TABLE site ADD providerId_from int null;
ALTER TABLE site ADD providerId_to int null;


alter table consultationRequests add site_name varchar(255) null ;

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes oscarResources_en.properties, 1.357, 1.358

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

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

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

Index: oscarResources_en.properties
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/oscarResources_en.properties,v
retrieving revision 1.357
retrieving revision 1.358
diff -C2 -d -r1.357 -r1.358
*** oscarResources_en.properties	29 Nov 2010 18:53:27 -0000	1.357
--- oscarResources_en.properties	30 Nov 2010 08:17:56 -0000	1.358
***************
*** 624,627 ****
--- 624,628 ----
  global.documents=documents
  global.edoc=e<u>D</u>oc
+ global.inbox=inboxManager
  global.edocShortcut=68
  global.eForms=E-Forms
***************
*** 1067,1070 ****
--- 1068,1073 ----
  admin.provideraddrecord.msgAdditionFailure=Sorry, addition has failed.
  admin.provider.sitesAssigned=Sites Assigned
+ admin.provideraddrecord.msgFormalizeProviderIdFailure=Provider Number is out of range or invalid. Please change site range setting on Satellite-sites Admin or turn off validation on properties multioffice.formalize.provider.id
+ admin.provideraddrecord.msgFormalizeProviderIdMultiSiteFailure=Non-doctor role can not be assigned multi-sites. This validation can be turn off on properties multioffice.formalize.provider.id
  
  global.btnBack=Back
***************
*** 1144,1147 ****
--- 1147,1151 ----
  admin.preferenceaddpreference.msgAdditionSuccess=Successful Addition of a Preference Record.
  admin.preferenceaddpreference.msgAdditionFailure=Sorry, addition has failed.
+ admin.preferenceaddpreference.msgAccessFailure=Sorry, the provider no you are trying to access is in different site, access denied.
  
  admin.preferencesearchrecordshtm.title=Search a Preference
***************
*** 1640,1643 ****
--- 1644,1648 ----
  oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.optAllServices = All Services
  oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.optAllSpecs = All Specialists
+ oscarEncounter.oscarConsultationRequest.ConsultationFormRequest.siteName = Referring Site
  
  oscarEncounter.oscarConsultationRequest.msgNothingPrinted=There are currently no pdf documents attached to this consultation
***************
*** 1747,1751 ****
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsultant=Consultant
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgFollowUpDate=Last Followup
! 
  oscarEncounter.RemoteAttachments.title=oscarComm
  oscarEncounter.RemoteAttachments.msgViewAtt=oscarVA
--- 1752,1756 ----
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgConsultant=Consultant
  oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgFollowUpDate=Last Followup
! oscarEncounter.oscarConsultationRequest.ViewConsultationRequests.msgSiteName=Site Name
  oscarEncounter.RemoteAttachments.title=oscarComm
  oscarEncounter.RemoteAttachments.msgViewAtt=oscarVA

[Oscarmcmaster-cvscommit] oscar_mcmaster/web/report reportindex.jsp, 1.48, 1.49 reportnoshowapptlist.jsp, 1.16, 1.17 reportpatientchartlistspecial.jsp, 1.14, 1.15 reportpatientchartlist.jsp, 1.16, 1.17 reportdaysheet.jsp, 1.36, 1.37 reportMainBeanConn.jspf, 1.1, 1.2 reportapptsheet.jsp, 1.19, 1.20

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

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

Modified Files:
	reportindex.jsp reportnoshowapptlist.jsp 
	reportpatientchartlistspecial.jsp reportpatientchartlist.jsp 
	reportdaysheet.jsp reportMainBeanConn.jspf reportapptsheet.jsp 
Log Message:
adding full multi-office support with site-aware filtering. Contributed by Dr.Eric Tam

Index: reportapptsheet.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportapptsheet.jsp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** reportapptsheet.jsp	24 Nov 2010 04:11:26 -0000	1.19
--- reportapptsheet.jsp	30 Nov 2010 08:17:55 -0000	1.20
***************
*** 31,37 ****
  %>
  <%@ page
! 	import="java.util.*, java.sql.*, oscar.*, java.text.*, java.lang.*,java.net.*"
  	errorPage="../appointment/errorpage.jsp"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
  <jsp:useBean id="daySheetBean" class="oscar.AppointmentMainBean"
  	scope="page" />
--- 31,39 ----
  %>
  <%@ page
! 	import="java.util.*, java.sql.*, oscar.*,oscar.login.*, java.text.*, java.lang.*,java.net.*"
  	errorPage="../appointment/errorpage.jsp"%>
  <%@ taglib uri="/WEB-INF/struts-bean.tld" prefix="bean"%>
+ <%@ taglib uri="/WEB-INF/security.tld" prefix="security"%>
+ 
  <jsp:useBean id="daySheetBean" class="oscar.AppointmentMainBean"
  	scope="page" />
***************
*** 49,52 ****
--- 51,92 ----
    daySheetBean.doConfigure(dbQueries,responseTargets);
  %>
+ 
+ <%
+     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>
+ 
+ <% 
+ 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();
+ }
+ %>
+ 
  <html>
  <head>
***************
*** 128,132 ****
  	  if(myGroupBean.getProperty(rsdemo.getString("provider_no"))==null) continue;
  	}
!   
    bodd = bodd?false:true;
  	if(!strTemp.equals(rsdemo.getString("provider_no")) ) { //new provider for a new table
--- 168,177 ----
  	  if(myGroupBean.getProperty(rsdemo.getString("provider_no"))==null) continue;
  	}
! 
!     //multisites. skip record if not belong to same site/team
!     if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
!     	if(providerMap.get(rsdemo.getString("provider_no"))== null)  continue;
!     }
!     
    bodd = bodd?false:true;
  	if(!strTemp.equals(rsdemo.getString("provider_no")) ) { //new provider for a new table

Index: reportnoshowapptlist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportnoshowapptlist.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** reportnoshowapptlist.jsp	24 Nov 2010 04:11:26 -0000	1.16
--- reportnoshowapptlist.jsp	30 Nov 2010 08:17:55 -0000	1.17
***************
*** 34,37 ****
--- 34,38 ----
  	import="java.util.*, java.sql.*, oscar.*, java.text.*, java.lang.*,java.net.*"
  	errorPage="../appointment/errorpage.jsp"%>
+ <%@ page import="oscar.login.DBHelp"%>
  <jsp:useBean id="patientBean" class="oscar.AppointmentMainBean"
  	scope="page" />
***************
*** 51,54 ****
--- 52,92 ----
  <%@ 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;
+     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>
+ 
+ <% 
+ 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();
+ }
+ %>
  <html:html locale="true">
  <head>
***************
*** 118,121 ****
--- 156,164 ----
  	  rsdemo = patientBean.queryResults(param, "search_noshowappt");
      while (rsdemo.next()) { 
+         //multisites. skip record if not belong to same site/team
+         if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+         	if(providerMap.get(rsdemo.getString("provider_no"))== null)  continue;
+         }    	
+     	
        bodd = bodd?false:true;
  	    if(!strTemp.equals(rsdemo.getString("provider_no")) ) { //new provider for a new table

Index: reportpatientchartlistspecial.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportpatientchartlistspecial.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** reportpatientchartlistspecial.jsp	24 Nov 2010 04:11:26 -0000	1.14
--- reportpatientchartlistspecial.jsp	30 Nov 2010 08:17:55 -0000	1.15
***************
*** 35,38 ****
--- 35,40 ----
  	import="java.util.*, java.sql.*, oscar.*, java.text.*, java.lang.*,java.net.*"
  	errorPage="../appointment/errorpage.jsp"%>
+ <%@ page import="oscar.login.DBHelp"%>
+ 
  <jsp:useBean id="patientBean" class="oscar.AppointmentMainBean"
  	scope="page" />
***************
*** 67,70 ****
--- 69,110 ----
  <%@ 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;
+     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>
+ 
+ <% 
+ 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();
+ }
+ %>
+ 
  <html:html locale="true">
  <head>
***************
*** 137,140 ****
--- 177,186 ----
  
      while (rsdemo.next()) { 
+     	
+         //multisites. skip record if not belong to same site/team
+         if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+         	if(providerMap.get(rsdemo.getString("provider_no"))== null)  continue;
+         }
+     	
        if (rsdemo.getInt("demographic_no") != dnoTemp) dnoTemp = rsdemo.getInt("demographic_no");
  	  else continue;

Index: reportdaysheet.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportdaysheet.jsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** reportdaysheet.jsp	24 Nov 2010 04:11:26 -0000	1.36
--- reportdaysheet.jsp	30 Nov 2010 08:17:55 -0000	1.37
***************
*** 9,12 ****
--- 9,14 ----
  <%@ 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"%>
+ 
  <jsp:useBean id="daySheetBean" class="oscar.AppointmentMainBean"
  	scope="page" />
***************
*** 47,50 ****
--- 49,90 ----
      daySheetBean.doConfigure(dbQueries);
  %>
+ 
+ <%
+     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>
+ <% 
+ 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();
+ }
+ %>
+ 
  <!--
  /*
***************
*** 165,168 ****
--- 205,213 ----
  	  if(myGroupBean.getProperty(rsdemo.getString("provider_no"))==null) continue;
  	}
+     
+     //multisites. skip record if not belong to same site/team
+     if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+     	if(providerMap.get(rsdemo.getString("provider_no"))== null)  continue;
+     }
  
    bodd = bodd?false:true;

Index: reportindex.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportindex.jsp,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -d -r1.48 -r1.49
*** reportindex.jsp	24 Nov 2010 03:59:41 -0000	1.48
--- reportindex.jsp	30 Nov 2010 08:17:55 -0000	1.49
***************
*** 50,53 ****
--- 50,79 ----
  <%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html"%>
  <%@ taglib uri="/WEB-INF/oscar-tag.tld" prefix="oscar"%>
+ <%@ 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 isSiteAccessPrivacy=false;
+     boolean isTeamAccessPrivacy=false; 
+     String provider_dboperation = "search_provider";
+     String mygroup_dboperation = "search_group";
+ %>
+ <security:oscarSec objectName="_site_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%
+ 		isSiteAccessPrivacy =true;
+ 		provider_dboperation = "site_search_provider";
+ 		mygroup_dboperation = "site_search_group";
+ 	%>
+ </security:oscarSec>
+ <security:oscarSec objectName="_team_access_privacy" roleName="<%=roleName$%>" rights="r" reverse="false">
+ 	<%
+ 		isTeamAccessPrivacy =true; 
+ 		provider_dboperation = "team_search_provider";
+ 	%>
+ 	
+ </security:oscarSec>
  <html:html locale="true">
  <head>
***************
*** 282,287 ****
  		<td><select name="provider_no">
  			<%
!                ResultSet rsgroup = reportMainBean.queryResults("search_group");
                       while (rsgroup.next()) {
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
--- 308,315 ----
  		<td><select name="provider_no">
  			<%
!                ResultSet rsgroup = reportMainBean.queryResults(mygroup_dboperation);
                       while (rsgroup.next()) {
+                     	 if (isTeamAccessPrivacy) 
+                     		 continue;	//skip mygroup display if user have TeamAccessPrivacy 
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
***************
*** 291,295 ****
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults("search_provider");
                       while (rsgroup.next()) {
              %>
--- 319,323 ----
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults(provider_dboperation);
                       while (rsgroup.next()) {
              %>
***************
*** 445,450 ****
  		<td><select name="pprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults("search_group");
                       while (rsgroup.next()) {
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
--- 473,480 ----
  		<td><select name="pprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults(mygroup_dboperation);
                       while (rsgroup.next()) {
+                     	 if (isTeamAccessPrivacy) 
+                     		 continue;	//skip mygroup display if user have TeamAccessPrivacy 
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
***************
*** 454,458 ****
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults("search_provider");
                       while (rsgroup.next()) {
              %>
--- 484,488 ----
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults(provider_dboperation);
                       while (rsgroup.next()) {
              %>
***************
*** 489,494 ****
  		<td><select name="pcprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults("search_group");
                       while (rsgroup.next()) {
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
--- 519,526 ----
  		<td><select name="pcprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults(mygroup_dboperation);
                       while (rsgroup.next()) {
+                     	 if (isTeamAccessPrivacy) 
+                     		 continue;	//skip mygroup display if user have TeamAccessPrivacy 
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
***************
*** 498,502 ****
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults("search_provider");
                       while (rsgroup.next()) {
              %>
--- 530,534 ----
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults(provider_dboperation);
                       while (rsgroup.next()) {
              %>
***************
*** 520,525 ****
  		<td><select name="opcprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults("search_group");
                       while (rsgroup.next()) {
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
--- 552,559 ----
  		<td><select name="opcprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults(mygroup_dboperation);
                       while (rsgroup.next()) {
+                     	 if (isTeamAccessPrivacy) 
+                     		 continue;	//skip mygroup display if user have TeamAccessPrivacy 
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
***************
*** 529,533 ****
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults("search_provider");
                       while (rsgroup.next()) {
              %>
--- 563,567 ----
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults(provider_dboperation);
                       while (rsgroup.next()) {
              %>
***************
*** 552,557 ****
  		<td><select name="nsprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults("search_group");
                       while (rsgroup.next()) {
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
--- 586,593 ----
  		<td><select name="nsprovider_no">
  			<%
!                rsgroup = reportMainBean.queryResults(mygroup_dboperation);
                       while (rsgroup.next()) {
+                     	 if (isTeamAccessPrivacy) 
+                     		 continue;	//skip mygroup display if user have TeamAccessPrivacy 
              %>
  			<option value="<%="_grp_"+rsgroup.getString("mygroup_no")%>"
***************
*** 561,565 ****
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults("search_provider");
                       while (rsgroup.next()) {
              %>
--- 597,601 ----
              %>
  			<%
!                  rsgroup = reportMainBean.queryResults(provider_dboperation);
                       while (rsgroup.next()) {
              %>

Index: reportMainBeanConn.jspf
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportMainBeanConn.jspf,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** reportMainBeanConn.jspf	19 Aug 2010 09:26:12 -0000	1.1
--- reportMainBeanConn.jspf	30 Nov 2010 08:17:55 -0000	1.2
***************
*** 28,34 ****
  
  <%
    String [][] dbQueries=new String[][] {
      {"search_provider", "select provider_no, last_name, first_name from provider where provider_type='doctor' and status='1' order by last_name"}, 
!     {"search_group", "select mygroup_no from mygroup group by mygroup_no order by mygroup_no"}, 
      {"drop_reporttemp", "DROP TABLE ?" }, 
      {"create_reporttemp", "create table reporttemp ( edb date not null,last_name varchar(30) not null,first_name varchar(30) not null,family_doctor varchar(20) not null,address varchar(60),phone varchar(20))" }, 
--- 28,45 ----
  
  <%
+     if(session.getAttribute("user") == null ) response.sendRedirect("../logout.jsp");
+     String curProvider_no = (String) session.getAttribute("user");
+ 
+ %>
+ 
+ <%
    String [][] dbQueries=new String[][] {
      {"search_provider", "select provider_no, last_name, first_name from provider where provider_type='doctor' and status='1' order by last_name"}, 
!     {"site_search_provider", "select provider_no, first_name, last_name from provider p where status='1' 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 + ")) order by last_name" }, 
!     {"team_search_provider", "select provider_no, first_name, last_name from provider p where status='1' and team in (select team from provider where provider_no=" + curProvider_no + ") and (not(team is null or team  = '') or provider_no=" + curProvider_no + ") order by last_name" },     
!     
!     {"search_group", "select mygroup_no from mygroup group by mygroup_no order by mygroup_no"},
!     {"site_search_group", "select mygroup_no from mygroup g WHERE exists(SELECT * FROM providersite ps where ps.provider_no = g.provider_no and site_id in (select site_id from providersite where provider_no = 5544 )) group by mygroup_no order by mygroup_no"},
!     
      {"drop_reporttemp", "DROP TABLE ?" }, 
      {"create_reporttemp", "create table reporttemp ( edb date not null,last_name varchar(30) not null,first_name varchar(30) not null,family_doctor varchar(20) not null,address varchar(60),phone varchar(20))" }, 

Index: reportpatientchartlist.jsp
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/report/reportpatientchartlist.jsp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** reportpatientchartlist.jsp	24 Nov 2010 04:11:26 -0000	1.16
--- reportpatientchartlist.jsp	30 Nov 2010 08:17:55 -0000	1.17
***************
*** 34,37 ****
--- 34,39 ----
  	import="java.util.*, java.sql.*, oscar.*, java.text.*, java.lang.*,java.net.*"
  	errorPage="../appointment/errorpage.jsp"%>
+ <%@ page import="oscar.login.DBHelp"%>
+ 
  <jsp:useBean id="patientBean" class="oscar.AppointmentMainBean"
  	scope="page" />
***************
*** 50,53 ****
--- 52,93 ----
  <%@ 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;
+     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>
+ <% 
+ 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();
+ }
+ %>
+ 
  <html:html locale="true">
  <head>
***************
*** 108,111 ****
--- 148,157 ----
  	  rsdemo = patientBean.queryResults(param, "search_patient");
      while (rsdemo.next()) { 
+     	
+         //multisites. skip record if not belong to same site/team
+         if (isSiteAccessPrivacy || isTeamAccessPrivacy) {
+         	if(providerMap.get(rsdemo.getString("provider_no"))== null)  continue;
+         }    	
+     	
        bodd = bodd?false:true;
  	    if(!strTemp.equals(param[0]) ) { //new provider for a new table