Update of /cvsroot/oscarmcmaster/oscar_mcmaster/web/WEB-INF/classes/src/oscar/login
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv28620/web/WEB-INF/classes/src/oscar/login
Modified Files:
Tag: RELEASE_10_06
LoginAction.java
Log Message:
add pop up message to alert the provider that there are OCAN reassessments 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.57
retrieving revision 1.57.4.1
diff -C2 -d -r1.57 -r1.57.4.1
*** LoginAction.java 16 Apr 2010 01:41:39 -0000 1.57
--- LoginAction.java 14 Jan 2011 20:44:21 -0000 1.57.4.1
***************
*** 34,38 ****
--- 34,40 ----
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.OcanStaffFormDao;
import org.oscarehr.common.dao.UserPropertyDAO;
import org.oscarehr.common.model.Facility;
***************
*** 40,43 ****
--- 42,46 ----
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;
***************
*** 66,70 ****
private ProviderManager providerManager = (ProviderManager) SpringUtils.getBean("providerManager");
private FacilityDao facilityDao = (FacilityDao) SpringUtils.getBean("facilityDao");
!
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
--- 69,74 ----
private ProviderManager providerManager = (ProviderManager) SpringUtils.getBean("providerManager");
private FacilityDao facilityDao = (FacilityDao) SpringUtils.getBean("facilityDao");
! private static OcanStaffFormDao ocanStaffFormDao = (OcanStaffFormDao) SpringUtils.getBean("ocanStaffFormDao");
!
public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
***************
*** 80,83 ****
--- 84,90 ----
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);
}
***************
*** 176,179 ****
--- 183,187 ----
session.setAttribute("CaseMgmtUsers", newDocArr);
}
+
}
}
***************
*** 240,243 ****
--- 248,254 ----
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 {
***************
*** 252,256 ****
}
}
!
if( pvar.getProperty("LOGINTEST","").equalsIgnoreCase("yes")) {
String proceedURL = mapping.findForward(where).getPath();
--- 263,267 ----
}
}
!
if( pvar.getProperty("LOGINTEST","").equalsIgnoreCase("yes")) {
String proceedURL = mapping.findForward(where).getPath();
***************
*** 280,282 ****
--- 291,295 ----
return WebApplicationContextUtils.getWebApplicationContext(getServlet().getServletContext());
}
+
+
}
|