Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -reb06cf9300f02897c13bd577689deacb2cf4b5fc -r28360b21c9f90c01d1d615a9c77c5f651e789469 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java (.../ContributionTypes.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java (.../ContributionTypes.java) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -36,7 +36,7 @@ public static final Integer SYNC_GATE = new Integer(4); public static final Integer SCHEDULE_GATE = new Integer(5); public static final Integer CHOSEN_GROUPING = new Integer(6); - // public static final Integer CONTRIBUTION = new Integer(7); + public static final Integer CONTRIBUTION = new Integer(7); public static final Integer SYSTEM_GATE = new Integer(8); public static final Integer CHOSEN_BRANCHING = new Integer(9); public static final Integer CONDITION_GATE = new Integer(10); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java (.../ToolActivityStrategy.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java (.../ToolActivityStrategy.java) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -25,6 +25,7 @@ import java.util.ArrayList; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.ContributionTypes; import org.lamsfoundation.lams.learningdesign.ToolActivity; /** @@ -45,6 +46,7 @@ @Override protected void setUpContributionType(ArrayList contributionTypes) { + contributionTypes.add(ContributionTypes.CONTRIBUTION); } @Override Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java (.../ToolContentManager.java) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -131,4 +131,11 @@ * Can the activity be modified? */ public boolean isReadOnly(Long toolContentId); + + /** + * Get contribution URL to show in monitoring + */ + public default String getContributionURL(Long toolContentId) { + return null; + } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java =================================================================== diff -u -r5fa265642903b837423bc95259ba3cef309cdf12 -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 5fa265642903b837423bc95259ba3cef309cdf12) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -532,10 +532,10 @@ throw new ToolException(message, e); } } - + @Override public List getConfidenceLevelsByToolSession(ToolSession toolSession) { - + if (toolSession == null) { String error = "The toolSession is null. Unable to get confidence levels"; LamsCoreToolService.log.error(error); @@ -548,7 +548,7 @@ LamsCoreToolService.log.error(error); throw new DataMissingException(error); } - + try { ToolSessionManager sessionManager = (ToolSessionManager) findToolService(tool); return sessionManager.getConfidenceLevels(toolSession.getToolSessionId()); @@ -562,7 +562,7 @@ + " doesn't support the getToolOutput(name, toolSessionId, learnerId) method so no output definitions can be accessed."; LamsCoreToolService.log.error(message, e); throw new ToolException(message, e); - } + } } @Override @@ -668,13 +668,13 @@ @Override public Long getLessonMaxPossibleMark(Lesson lesson) { Set activities = getLearningDesignActivities(lesson.getLearningDesign()); - + // calculate lesson's MaxPossibleMark Long lessonMaxPossibleMark = 0L; //take into account whether learning design uses grade weight if (isWeightedMarks(activities)) { lessonMaxPossibleMark = 100L; - + } else { for (ToolActivity toolActivity : activities) { Long activityMaxPossibleMark = getActivityMaxPossibleMark(toolActivity); @@ -692,7 +692,7 @@ Set activities = getLearningDesignActivities(design); return isWeightedMarks(activities); } - + private boolean isWeightedMarks(Set activities) { for (ToolActivity toolActivity : activities) { ActivityEvaluation eval = toolActivity.getEvaluation(); @@ -843,6 +843,10 @@ if (sysTool != null) { return setupURLWithActivityLessonID(activity, lessonID, sysTool.getContributeUrl()); } + } else if (activity.isToolActivity()) { + ToolActivity toolActivity = (ToolActivity) activity; + ToolContentManager toolContentManager = (ToolContentManager) findToolService(toolActivity.getTool()); + return toolContentManager.getContributionURL(toolActivity.getToolContentId()); } return null; } Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -ra4002ee13a835e74c08e3d657494f1c97b531013 -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision a4002ee13a835e74c08e3d657494f1c97b531013) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -211,6 +211,7 @@ lesson.task.gate =Permission gate lesson.task.grouping =Choose grouping lesson.task.branching =Instructor chosen branching +lesson.task.tool =Tool contribution button.task.go =Go button.task.go.tooltip =Complete this task now lesson.monitors =Monitors Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java (.../ContributeActivityDTO.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java (.../ContributeActivityDTO.java) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -136,7 +136,8 @@ boolean isReq = (contributionType != null) && (contributionType.equals(ContributionTypes.PERMISSION_GATE) || contributionType.equals(ContributionTypes.CHOSEN_GROUPING) || contributionType.equals(ContributionTypes.CHOSEN_BRANCHING) - || contributionType.equals(ContributionTypes.CONTENT_EDITED)); + || contributionType.equals(ContributionTypes.CONTENT_EDITED) + || contributionType.equals(ContributionTypes.CONTRIBUTION)); this.isRequired = new Boolean(isReq); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java =================================================================== diff -u -r8c5a664ea597cbeacbafabf18d16e04a4d06a9a7 -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java (.../ContributeDTOFactory.java) (revision 8c5a664ea597cbeacbafabf18d16e04a4d06a9a7) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java (.../ContributeDTOFactory.java) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -21,7 +21,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.monitoring.service; import java.util.Collections; @@ -85,6 +84,9 @@ dto = new ContributeActivityDTO(activity); for (Integer contributionTypeEntry : contributionType) { String url = ContributeDTOFactory.getURL(lessonID, activity, contributionTypeEntry, toolService); + if (ContributionTypes.CONTRIBUTION.equals(contributionTypeEntry) && url == null) { + continue; + } ContributeEntry entry = dto.addContribution(contributionTypeEntry, url); // once a gate was opened, it does not require attention @@ -109,7 +111,7 @@ GroupingActivity groupingActivity = (GroupingActivity) activity; Grouping grouping = groupingActivity.getCreateGrouping(); if ((grouping != null) && (grouping.getGroups() != null)) { - for (Group group : (Set) grouping.getGroups()) { + for (Group group : grouping.getGroups()) { if (!group.mayBeDeleted()) { learners.removeAll(group.getUsers()); } Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -rd5a65c627bdbb1f30d76de7c553d6c7cf448a9fe -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision d5a65c627bdbb1f30d76de7c553d6c7cf448a9fe) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -606,6 +606,7 @@ switch(this.contributionType) { case 3 : entryContent = LABELS.CONTRIBUTE_GATE; break; case 6 : entryContent = LABELS.CONTRIBUTE_GROUPING; break; + case 7 : entryContent = LABELS.CONTRIBUTE_TOOL; break; case 9 : entryContent = LABELS.CONTRIBUTE_BRANCHING; break; case 11 : entryContent = LABELS.CONTRIBUTE_CONTENT_EDITED; break; } Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r312140979ac91708e16d2b57c98f53c13e99ab24 -r28360b21c9f90c01d1d615a9c77c5f651e789469 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 312140979ac91708e16d2b57c98f53c13e99ab24) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 28360b21c9f90c01d1d615a9c77c5f651e789469) @@ -168,6 +168,8 @@ CONTRIBUTE_BRANCHING : '', CONTRIBUTE_CONTENT_EDITED : '', + + CONTRIBUTE_TOOL : '', CONTRIBUTE_TOOLTIP : '',