Index: lams_central/web/indexContent.jsp =================================================================== diff -u -r1454b2fd27486dd14b1ccf172b96df61a0b0d355 -r440554bb4a9a414c6e3e676a93de72de3298951c --- lams_central/web/indexContent.jsp (.../indexContent.jsp) (revision 1454b2fd27486dd14b1ccf172b96df61a0b0d355) +++ lams_central/web/indexContent.jsp (.../indexContent.jsp) (revision 440554bb4a9a414c6e3e676a93de72de3298951c) @@ -5,20 +5,19 @@ <%@ page import="org.lamsfoundation.lams.usermanagement.service.UserManagementService" %> <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %> <%@ page import="org.lamsfoundation.lams.usermanagement.User" %> +<%@ page import="org.lamsfoundation.lams.lesson.Lesson" %> <%@ page import="org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO" %> +<%@ page import="org.apache.commons.collections.functors.WhileClosure" %> + <%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %> - - - - - +
-
spacer.gif
+ <%String login = request.getRemoteUser(); WebApplicationContext ctx = WebApplicationContextUtils.getWebApplicationContext(request.getSession().getServletContext()); UserManagementService service = (UserManagementService)ctx.getBean("userManagementServiceTarget"); @@ -28,98 +27,121 @@ in but we didn't get the username. Try closing your browser and starting again.

<%}%> - + + + + + + +
+ - - + + + + + <%orgDTO = service.getOrganisationsForUserByRole(user,null); + if(orgDTO!=null){ + Vector courses = orgDTO.getNodes(); + Iterator courseIter = courses.iterator(); + while ( courseIter.hasNext() ) { + + OrganisationDTO course = (OrganisationDTO)courseIter.next();%> + + + + + <% List lessons = service.getMonitorLessonsFromOrganisation(user.getUserId(),course.getOrganisationID()); + Iterator lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } + } %> + <% List lessons = service.getLearnerLessonsFromOrganisation(user.getUserId(),course.getOrganisationID()); + Iterator lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } %> + + <% + Vector classes = course.getNodes(); + Iterator classIter = classes.iterator(); + while ( classIter.hasNext() ) { + OrganisationDTO courseClass = (OrganisationDTO)classIter.next(); %> + + + + + <% lessons = service.getMonitorLessonsFromOrganisation(user.getUserId(),courseClass.getOrganisationID()); + lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } + + } %> + <% lessons = service.getLearnerLessonsFromOrganisation(user.getUserId(),courseClass.getOrganisationID()); + lessonIterator = lessons.iterator(); + while ( lessonIterator.hasNext() ) { + Lesson lesson = (Lesson) lessonIterator.next(); + %> + + + <% } %> + <% }%> + <% } %> + <%}%> +
+

Welcome <%=user.getFirstName()%>

-

- You are logged into LAMS.Please choose a workspace from the buttons on the right or - Change Password here. -

- 		- - - <% ArrayList roleList = new ArrayList(); - roleList.add(Role.SYSADMIN); - OrganisationDTO orgDTO = service.getOrganisationsForUserByRole(user,roleList); - if(orgDTO!=null){%> - - - - <%}%> - <%orgDTO = service.getOrganisationsForUserByRole(user,null); - if(orgDTO!=null){ - Vector courses = orgDTO.getNodes(); - Iterator courseIter = courses.iterator(); - while ( courseIter.hasNext() ) { - - OrganisationDTO course = (OrganisationDTO)courseIter.next();%> - - - - - - - - <% - Vector classes = course.getNodes(); - Iterator classIter = classes.iterator(); - while ( classIter.hasNext() ) { - OrganisationDTO courseClass = (OrganisationDTO)classIter.next(); %> - - - - - - - <% }%> - <% } %> - <%}%> -
- -
Course: <%=course.getName()%>: - <% Vector roleNames = course.getRoleNames(); - if ( roleNames.contains(Role.AUTHOR) ) {%> - - <% } %> - - <% if ( roleNames.contains(Role.STAFF) || roleNames.contains(Role.TEACHER) ) {%> - - <% } %> - - <% if ( roleNames.contains(Role.LEARNER) ) {%> - - <% } %> -
Class: <%=courseClass.getName()%>: - <% Vector classRoleNames = courseClass.getRoleNames(); - if ( classRoleNames.contains(Role.AUTHOR) ) {%> - - <% } %> - - <% if ( classRoleNames.contains(Role.STAFF) || classRoleNames.contains(Role.TEACHER) ) {%> - - <% } %> - - <% if ( classRoleNames.contains(Role.LEARNER) ) {%> - - <% } %> -
-
+ + <% ArrayList roleList = new ArrayList(); + roleList.add(Role.SYSADMIN); + OrganisationDTO orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + + <%}%> + + <% roleList.clear(); + roleList.add(Role.AUTHOR); + orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + + <%} + roleList.clear(); + roleList.add(Role.STAFF); + roleList.add(Role.TEACHER); + orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + Dummy Monitoring Screen + <%} + roleList.clear(); + roleList.add(Role.LEARNER); + orgDTO = service.getOrganisationsForUserByRole(user,roleList); + if(orgDTO!=null){%> + Dummy Learning Screen + <%}%> +
Course: <%=course.getName()%>: + <% Vector roleNames = course.getRoleNames(); + if ( roleNames.contains(Role.STAFF) || roleNames.contains(Role.TEACHER) ) {%> + +
Lesson: <%=lesson.getLessonName()%>
Lesson: <%=lesson.getLessonName()%>
Class: <%=courseClass.getName()%>: + <% Vector classRoleNames = course.getRoleNames(); + if ( classRoleNames.contains(Role.STAFF) || classRoleNames.contains(Role.TEACHER) ) {%> + +
Lesson: <%=lesson.getLessonName()%>
Lesson: <%=lesson.getLessonName()%>
+
+ @@ -135,12 +157,9 @@ \nAll rights reserved. \n\nLAMS is a trademark of LAMS Foundation. \nDistribution of this software is prohibited.');" - class="lightNoteLink">© 2002-2004 LAMS Foundation. + class="lightNoteLink">© 2002-2006 LAMS Foundation. -
launch_page_graphic.jpg
- This copy of LAMS™ is authorised for use by the registered users only. - Version 1.1