OSCARMcMaster

Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv29421/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web

Modified Files:
	CaseManagementViewAction.java 
Log Message:
fix the provider filter fix

Index: CaseManagementViewAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/org/oscarehr/casemgmt/web/CaseManagementViewAction.java,v
retrieving revision 1.92
retrieving revision 1.93
diff -C2 -d -r1.92 -r1.93
*** CaseManagementViewAction.java	11 Jul 2009 00:13:23 -0000	1.92
--- CaseManagementViewAction.java	13 Jul 2009 14:47:12 -0000	1.93
***************
*** 52,57 ****
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
  import org.caisi.model.CustomFilter;
- import org.caisi.model.Role;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
  import org.oscarehr.PMmodule.dao.OscarSecurityDAO;
--- 52,57 ----
  import org.apache.struts.action.ActionForward;
  import org.apache.struts.action.ActionMapping;
+ import org.apache.struts.util.LabelValueBean;
  import org.caisi.model.CustomFilter;
  import org.oscarehr.PMmodule.caisi_integrator.CaisiIntegratorManager;
  import org.oscarehr.PMmodule.dao.OscarSecurityDAO;
***************
*** 60,64 ****
  import org.oscarehr.PMmodule.model.Admission;
  import org.oscarehr.PMmodule.model.Program;
- import org.oscarehr.PMmodule.model.ProgramAccess;
  import org.oscarehr.PMmodule.model.ProgramProvider;
  import org.oscarehr.PMmodule.model.ProgramTeam;
--- 60,63 ----
***************
*** 89,93 ****
  import org.oscarehr.util.SessionConstants;
  import org.oscarehr.util.SpringUtils;
- import org.springframework.beans.factory.annotation.Autowired;
  
  import oscar.OscarProperties;
--- 88,91 ----
***************
*** 542,549 ****
  		addRemoteIssues(issuesToDisplay, demographicNo, !activeIssues);
  		
- 		boolean useNewCaseMgmt=false;
- 		String useNewCaseMgmtString = (String) request.getSession().getAttribute("newCaseManagement");		
- 		if (useNewCaseMgmtString!=null) useNewCaseMgmt=Boolean.parseBoolean(useNewCaseMgmtString);
- 		
      	request.setAttribute("Issues", issuesToDisplay);
      	log.debug("Get issues time : " + (System.currentTimeMillis()-startTime));
--- 540,543 ----
***************
*** 578,595 ****
  	    localNotes = caseManagementMgr.filterNotes(localNotes, providerNo, programId, loggedInInfo.currentFacility.getId());                        
  
- 	    HashSet providers=new HashSet();
- 	    
- 	    if(useNewCaseMgmt) {
- 			localNotes = applyProviderFilters(localNotes, providers, caseForm.getFilter_providers());
- 		}else{
- 			String [] fp = new String[1];
- 			fp[0]=caseForm.getFilter_provider();
- 			if(fp[0]=="")	
- 				fp = null;
- 			localNotes = applyProviderFilters(localNotes, providers, fp);
- 		}
- 	    
- 	    request.setAttribute("providers", providers);
- 
  	    caseManagementMgr.getEditors(localNotes);
  
--- 572,575 ----
***************
*** 622,625 ****
--- 602,617 ----
  	    log.debug("Filter on Role " + (System.currentTimeMillis()-startTime));
  	                
+ 	    // filter providers
+ 	    notesToDisplay = applyProviderFilter(notesToDisplay, caseForm.getFilter_providers());
+ 	    
+ 	    // set providers to display
+ 	    HashSet<LabelValueBean> providers=new HashSet<LabelValueBean>();
+ 	    for (NoteDisplay tempNote : notesToDisplay)
+ 	    {
+ 	    	String tempProvider=tempNote.getProvider();
+ 	    	providers.add(new LabelValueBean(tempProvider,tempProvider));
+ 	    }
+ 	    request.setAttribute("providers", providers);
+ 	    
  	    /*
  	     * people are changing the default sorting of notes so it's safer to explicity set it here, some one already changed it once and it reversed our sorting.
***************
*** 686,689 ****
--- 678,684 ----
  
  	private boolean hasIssueToBeDisplayed(CachedDemographicNote cachedDemographicNote, ArrayList<String> issueCodesToDisplay) {
+ 		// no issue selected means display all
+ 		if (issueCodesToDisplay==null || issueCodesToDisplay.size()==0) return(true);
+ 		
  		for (NoteIssue noteIssue : cachedDemographicNote.getIssues())
  		{
***************
*** 1128,1158 ****
  	
  	
- 	/*
- 	 * This method extracts a unique list of providers, and optionally filters out all notes belonging to providerNo (arg2).
- 	 */
- 	protected List applyProviderFilter(List notes, Set providers, String providerNo) {
- 		boolean filter = false;
- 		List filteredNotes = new ArrayList();
- 
- 		if (providerNo != null && providerNo.length() > 0) {
- 			filter = true;
- 		}
- 
- 		for (Iterator iter = notes.iterator(); iter.hasNext();) {
- 			CaseManagementNote note = (CaseManagementNote) iter.next();
- 			providers.add(note.getProvider());
- 			if (!filter) {
- 				// no filter, add all
- 				filteredNotes.add(note);
- 			}
- 			else if (filter && note.getProviderNo().equals(providerNo)) {
- 				// correct provider
- 				filteredNotes.add(note);
- 			}
- 		}
- 
- 		return filteredNotes;
- 	}
- 
  	private Collection<CaseManagementNote> manageLockedNotes(Collection<CaseManagementNote> notes, boolean removeLockedNotes, Map unlockedNotesMap) {
  		List<CaseManagementNote> notesNoLocked = new ArrayList<CaseManagementNote>();
--- 1123,1126 ----
***************
*** 1173,1203 ****
  	}
  
! 	/**
! 	 * This method extracts a unique list of providers, and optionally filters out all notes belonging to providerNo (arg2).
! 	 * @param notes
! 	 * @param providers
! 	 * @param providerNo
! 	 * @return
! 	 */
! 	protected List applyProviderFilters(Collection<CaseManagementNote> notes, Set providers, String[] providerNo) {
! 		boolean filter = false;
! 		List filteredNotes = new ArrayList();
! 
! 		if (providerNo != null && Arrays.binarySearch(providerNo, "a") < 0) {
! 			filter = true;
! 		}
  
! 		for (Iterator iter = notes.iterator(); iter.hasNext();) {
! 			CaseManagementNote note = (CaseManagementNote) iter.next();
! 			providers.add(note.getProvider());
! 			if (!filter) {
! 				// no filter, add all
! 				filteredNotes.add(note);
  
! 			}
! 			else {
! 				if (Arrays.binarySearch(providerNo, note.getProviderNo()) >= 0)
! 				// correct provider
! 					filteredNotes.add(note);
  			}
  		}
--- 1141,1155 ----
  	}
  
! 	private ArrayList<NoteDisplay> applyProviderFilter(ArrayList<NoteDisplay> notes, String[] providerName) {
! 		ArrayList<NoteDisplay> filteredNotes = new ArrayList<NoteDisplay>();
  
! 		if (providerName == null || providerName.length==0) return(notes);
  
! 		for (NoteDisplay note : notes) {
! 			String tempName=note.getProvider();
! 			
! 			for (String temp : providerName)
! 			{
! 				if (tempName.equals(temp)) filteredNotes.add(note);
  			}
  		}