[Oscarmcmaster-cvscommit] oscar_mcmaster/web/WEB-INF/classes/src/oscar/login LoginAction.java, 1.62, 1.63

[annie <ann...@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-serv21186/web/WEB-INF/classes/src/oscar/login

Modified Files:
	LoginAction.java 
Log Message:
add pop up message to alert the provider after login if there are any OCAN reassessment need to be done.

Index: LoginAction.java
===================================================================
RCS file: /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login/LoginAction.java,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** LoginAction.java	20 Sep 2010 16:28:26 -0000	1.62
--- LoginAction.java	14 Jan 2011 21:35:17 -0000	1.63
***************
*** 31,36 ****
--- 31,38 ----
  import org.oscarehr.PMmodule.dao.ProviderDao;
  import org.oscarehr.PMmodule.service.ProviderManager;
+ import org.oscarehr.PMmodule.web.OcanForm;
  import org.oscarehr.common.dao.FacilityDao;
  import org.oscarehr.common.dao.ProviderPreferenceDao;
+ import org.oscarehr.common.dao.OcanStaffFormDao;
  import org.oscarehr.common.dao.UserPropertyDAO;
  import org.oscarehr.common.model.Facility;
***************
*** 39,42 ****
--- 41,45 ----
  import org.oscarehr.common.model.UserProperty;
  import org.oscarehr.decisionSupport.service.DSService;
+ import org.oscarehr.util.LoggedInInfo;
  import org.oscarehr.util.SessionConstants;
  import org.oscarehr.util.SpringUtils;
***************
*** 65,68 ****
--- 68,72 ----
      private FacilityDao facilityDao = (FacilityDao) SpringUtils.getBean("facilityDao");
      private ProviderPreferenceDao providerPreferenceDao = (ProviderPreferenceDao) SpringUtils.getBean("providerPreferenceDao");
+     private static OcanStaffFormDao ocanStaffFormDao = (OcanStaffFormDao) SpringUtils.getBean("ocanStaffFormDao");
      
      public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
***************
*** 79,82 ****
--- 83,89 ----
              String username=(String)request.getSession().getAttribute("user");
              LogAction.addLog(username, LogConst.LOGIN, LogConst.CON_LOGIN, "facilityId="+facilityIdString, ip);
+             if(facility.isEnableOcanForms()) {
+             	request.getSession().setAttribute("ocanWarningWindow", OcanForm.getOcanWarningMessage(facility.getId()));
+             }
              return mapping.findForward(nextPage);
          }
***************
*** 237,240 ****
--- 244,250 ----
                  request.getSession().setAttribute("currentFacility", facility);
                  LogAction.addLog(strAuth[0], LogConst.LOGIN, LogConst.CON_LOGIN, "facilityId="+facilityIds.get(0), ip);
+                 if(facility.isEnableOcanForms()) {
+                 	request.getSession().setAttribute("ocanWarningWindow", OcanForm.getOcanWarningMessage(facility.getId()));
+                 }
              }
              else {