Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.9 -r1.10 --- lams_central/conf/language/lams/ApplicationResources.properties 18 Oct 2007 06:42:09 -0000 1.9 +++ lams_central/conf/language/lams/ApplicationResources.properties 14 Nov 2007 03:24:47 -0000 1.10 @@ -184,6 +184,7 @@ msg.no.lessons =No lessons label.return.to.myprofile =Return to My Profile label.help =Help? +label.completed = Completed! #======= End labels: Exported 178 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.9 -r1.10 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 18 Oct 2007 06:42:09 -0000 1.9 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 14 Nov 2007 03:24:47 -0000 1.10 @@ -184,6 +184,7 @@ msg.no.lessons =No lessons label.return.to.myprofile =Return to My Profile label.help =Help? +label.completed = Completed! #======= End labels: Exported 178 labels for en AU ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v diff -u -r1.5 -r1.6 --- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 12 Nov 2007 23:30:46 -0000 1.5 +++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java 14 Nov 2007 03:24:47 -0000 1.6 @@ -308,8 +308,10 @@ // get lesson beans where user is learner (if isStaff=true, gets lessons where user is staff) private Map getLessonsByOrgAndUser(Integer userId, Integer orgId, boolean isStaff) throws SQLException, NamingException { - String learnerQuery = "select l.lesson_id, l.name, l.description, l.lesson_state_id " - + " from lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi" + // TODO refactor using hibernate named query + String learnerQuery = "select l.lesson_id, l.name, l.description, l.lesson_state_id, lp.lesson_completed_flag " + + " from (lams_lesson l, lams_learning_design ld, lams_group g, lams_user_group ug, lams_grouping gi)" + + " left join lams_learner_progress lp on lp.user_id=ug.user_id and lp.lesson_id=l.lesson_id" + " where l.learning_design_id=ld.learning_design_id" + " and ld.copy_type_id!=" + LearningDesign.COPY_TYPE_PREVIEW + " and l.organisation_id=?" @@ -339,8 +341,9 @@ String name = rs.getString(2); String description = rs.getString(3); int state = rs.getInt(4); + boolean lessonCompleted = rs.getBoolean(5); IndexLessonBean bean = new IndexLessonBean( - new Long(id), name, description, new Integer(state) + new Long(id), name, description, new Integer(state), lessonCompleted ); map.put(new Long(id), bean); } Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/Attic/IndexLessonBean.java,v diff -u -r1.8 -r1.9 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java 25 Oct 2007 07:19:49 -0000 1.8 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexLessonBean.java 14 Nov 2007 03:24:47 -0000 1.9 @@ -41,26 +41,29 @@ private String description; private String url; private Integer state; + private boolean completed; private List links; public IndexLessonBean(String name, String url) { this.name = name; this.url = url; } - public IndexLessonBean(Long id, String name, String description, Integer state) { + public IndexLessonBean(Long id, String name, String description, Integer state, boolean completed) { this.id = id; this.name = name; this.description = description; this.state = state; + this.completed = completed; } - public IndexLessonBean(Long id, String name, String description, String url, Integer state, List links) { + public IndexLessonBean(Long id, String name, String description, String url, Integer state, boolean completed, List links) { this.id = id; this.name = name; this.description = description; this.url = url; this.state = state; + this.completed = completed; this.links = links; } /** @@ -114,4 +117,10 @@ public void setState(Integer state) { this.state = state; } + public boolean getCompleted() { + return completed; + } + public void setCompleted(boolean completed) { + this.completed = completed; + } } Index: lams_central/web/groupContents.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/groupContents.jsp,v diff -u -r1.1 -r1.2 --- lams_central/web/groupContents.jsp 12 Nov 2007 23:30:45 -0000 1.1 +++ lams_central/web/groupContents.jsp 14 Nov 2007 03:24:47 -0000 1.2 @@ -10,12 +10,13 @@

" class="j-single-lesson"> " class="disabled-sequence-name-link"> -  () -  () " href="" class="sequence-name-link"> + " > + " > + " > @@ -48,12 +49,13 @@

" class="j-single-subgroup-lesson"> " class="disabled-sequence-name-link"> -  () -  () " href="" class="sequence-name-link"> + " > + " > + " > Index: lams_central/web/css/defaultHTML.css =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/css/defaultHTML.css,v diff -u -r1.25 -r1.26 --- lams_central/web/css/defaultHTML.css 7 Nov 2007 03:28:37 -0000 1.25 +++ lams_central/web/css/defaultHTML.css 14 Nov 2007 03:24:47 -0000 1.26 @@ -1198,10 +1198,18 @@ .mycourses-addlesson-img {background: url('../images/css/mycourses_addlesson.jpg') no-repeat 0 3px; margin-right:5px; padding:5px 0px 5px 25px; } +/* + TODO replace background images for stop and completed with different symbols +*/ +.mycourses-stop-img {background: url('../images/css/mycourses_monitor.jpg') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; +} +.mycourses-completed-img {background: url('../images/css/mycourses_monitor.jpg') no-repeat 0 3px; margin-left:20px; margin-right:5px; padding:5px 0px 5px 25px; +} + /*IE style workarounds */ * html #header { /*layout of the header */