Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java =================================================================== diff -u -r23988377bb0a1acee31a9908d19288fa2916546b -re65f05fe41e968ab4e1d94b9512bd2b948a91a7f --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 23988377bb0a1acee31a9908d19288fa2916546b) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision e65f05fe41e968ab4e1d94b9512bd2b948a91a7f) @@ -91,6 +91,7 @@ private List onlineFileList; private List offlineFileList; + private int numberTasksToComplete; /** * Default contructor. @@ -272,7 +273,6 @@ public Date getCreated() { return created; } - /** * Sets the object's creation date * @@ -291,7 +291,6 @@ public Date getUpdated() { return updated; } - /** * Sets the object's date of last update * @@ -314,7 +313,6 @@ public TaskListUser getCreatedBy() { return createdBy; } - /** * Sets id of a user created the taskList. * @@ -334,7 +332,6 @@ public Long getUid() { return uid; } - /** * Sets TaskList id. * @@ -356,7 +353,6 @@ public String getTitle() { return title; } - /** * Sets the tasklist title * @@ -377,7 +373,6 @@ public boolean getRunOffline() { return runOffline; } - /** * Sets if the tasklist should run offline. * @@ -399,7 +394,6 @@ public String getInstructions() { return instructions; } - /** * Sets tasklist instructions. Usually done by teacher. * @@ -421,7 +415,6 @@ public String getOnlineInstructions() { return onlineInstructions; } - /** * Sets tasklist instructions. Usually done by teacher. * @@ -443,7 +436,6 @@ public String getOfflineInstructions() { return offlineInstructions; } - /** * Sets tasklist offlineInstructions. Usually done by teacher. * @@ -469,7 +461,6 @@ public Set getAttachments() { return attachments; } - /** * Sets a set of Attachments belong to this tasklist * @@ -494,7 +485,6 @@ public Set getConditions() { return conditions; } - /** * Sets a set of Conditions belong to this tasklist * @@ -519,7 +509,6 @@ public Set getTaskListItems() { return taskListItems; } - /** * Sets set of TaskListItems. * @@ -539,7 +528,6 @@ public boolean isContentInUse() { return contentInUse; } - /** * Sets whether this tasklist in use or not. * @@ -559,7 +547,6 @@ public boolean isDefineLater() { return defineLater; } - /** * Sets whether this tasklist should be defined later or not. * @@ -579,7 +566,6 @@ public Long getContentId() { return contentId; } - /** * Sets ContentId. * @@ -600,7 +586,6 @@ public boolean getLockWhenFinished() { return lockWhenFinished; } - /** * Set if the tasklist should be locked after being finished or not. * @@ -620,7 +605,6 @@ public boolean isAllowContributeTasks() { return allowContributeTasks; } - /** * Sets whether learners are allowed to contribute tasks. * @@ -640,7 +624,6 @@ public boolean isMonitorVerificationRequired() { return monitorVerificationRequired; } - /** * Sets whether the learners should be verified by monitor before they can finish tasklist. * @@ -660,7 +643,6 @@ public boolean isSequentialOrder() { return sequentialOrder; } - /** * Sets if the tasks should be done in a sequential order. * @@ -670,7 +652,6 @@ this.sequentialOrder = sequentialOrder; } - /** * Returns the minimum number of tasks needed to be completed to finish this activity. * @@ -681,17 +662,38 @@ public int getMinimumNumberTasksComplete() { return minimumNumberTasksComplete; } - /** * Sets the minimum number of tasks needed to be completed to finish this activity. * - * @param sequentialOrder the minimum number of tasks needed to be completed to finish this activity + * @param numberTasksToComplete the minimum number of tasks needed to be completed to finish this activity */ public void setMinimumNumberTasksComplete(int minimumNumberTasksComplete) { this.minimumNumberTasksComplete = minimumNumberTasksComplete; } /** + * @hibernate.property column="reflect_instructions" + * @return + */ + public String getReflectInstructions() { + return reflectInstructions; + } + public void setReflectInstructions(String reflectInstructions) { + this.reflectInstructions = reflectInstructions; + } + + /** + * @hibernate.property column="reflect_on_activity" + * @return + */ + public boolean isReflectOnActivity() { + return reflectOnActivity; + } + public void setReflectOnActivity(boolean reflectOnActivity) { + this.reflectOnActivity = reflectOnActivity; + } + + /** * For display use * @return */ @@ -701,34 +703,34 @@ public void setOfflineFileList(List offlineFileList) { this.offlineFileList = offlineFileList; } + public List getOnlineFileList() { return onlineFileList; } public void setOnlineFileList(List onlineFileList) { this.onlineFileList = onlineFileList; } + public void setToolContentHandler(IToolContentHandler toolContentHandler) { this.toolContentHandler = toolContentHandler; } - + /** - * @hibernate.property column="reflect_instructions" - * @return - */ - public String getReflectInstructions() { - return reflectInstructions; + * Returns the number of tasks needed to be completed to finish this activity. + * + * @return the number of tasks needed to be completed to finish this activity + * + */ + public int getNumberTasksToComplete() { + return numberTasksToComplete; } - public void setReflectInstructions(String reflectInstructions) { - this.reflectInstructions = reflectInstructions; - } /** - * @hibernate.property column="reflect_on_activity" - * @return - */ - public boolean isReflectOnActivity() { - return reflectOnActivity; + * Sets the number of tasks needed to be completed to finish this activity. + * + * @param numberTasksToComplete the number of tasks needed to be completed to finish this activity + */ + public void setNumberTasksToComplete(int numberTasksToComplete) { + this.numberTasksToComplete = numberTasksToComplete; } - public void setReflectOnActivity(boolean reflectOnActivity) { - this.reflectOnActivity = reflectOnActivity; - } + } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r23988377bb0a1acee31a9908d19288fa2916546b -re65f05fe41e968ab4e1d94b9512bd2b948a91a7f --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 23988377bb0a1acee31a9908d19288fa2916546b) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision e65f05fe41e968ab4e1d94b9512bd2b948a91a7f) @@ -359,15 +359,15 @@ } public int checkMinimumNumberTasksComplete(Long toolSessionId, Long userUid) { - int miniView = taskListItemVisitDao.getTasksCompletedCountByUser(toolSessionId, userUid); + int completedItems = taskListItemVisitDao.getTasksCompletedCountByUser(toolSessionId, userUid); TaskListSession session = taskListSessionDao.getSessionBySessionId(toolSessionId); if(session == null){ log.error("Failed get session by ID [" + toolSessionId + "]"); return 0; } - int reqView = session.getTaskList().getMinimumNumberTasksComplete(); + int minimumNumberTasksComplete = session.getTaskList().getMinimumNumberTasksComplete(); - return (reqView - miniView); + return (minimumNumberTasksComplete - completedItems); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java =================================================================== diff -u -r23988377bb0a1acee31a9908d19288fa2916546b -re65f05fe41e968ab4e1d94b9512bd2b948a91a7f --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java (.../LearningAction.java) (revision 23988377bb0a1acee31a9908d19288fa2916546b) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java (.../LearningAction.java) (revision e65f05fe41e968ab4e1d94b9512bd2b948a91a7f) @@ -239,6 +239,10 @@ itemDTOs.add(itemDTO); } + + //construct taskList dto field + int numberTasksToComplete = service.checkMinimumNumberTasksComplete(sessionId, taskListUser.getUserId()); + taskList.setNumberTasksToComplete(numberTasksToComplete); //add define later support if(taskList.isDefineLater()){ Index: lams_tool_task/web/pages/learning/parts/itemlist.jsp =================================================================== diff -u -r23988377bb0a1acee31a9908d19288fa2916546b -re65f05fe41e968ab4e1d94b9512bd2b948a91a7f --- lams_tool_task/web/pages/learning/parts/itemlist.jsp (.../itemlist.jsp) (revision 23988377bb0a1acee31a9908d19288fa2916546b) +++ lams_tool_task/web/pages/learning/parts/itemlist.jsp (.../itemlist.jsp) (revision e65f05fe41e968ab4e1d94b9512bd2b948a91a7f) @@ -142,11 +142,11 @@ - + - ${taskList.minimumNumberTasksComplete} + ${taskList.numberTasksToComplete}