Index: lams_build/lib/lams/lams-contentrepository.jar =================================================================== diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -rc135649b64e98c9233da20bdcfb7689598116314 Binary files differ Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r4a144a22d63a90c971cbb07a7079e3b74cf144d2 -rc135649b64e98c9233da20bdcfb7689598116314 Binary files differ Fisheye: Tag c135649b64e98c9233da20bdcfb7689598116314 refers to a dead (removed) revision in file `lams_central/.settings/org.eclipse.core.resources.prefs'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java =================================================================== diff -u -r668a627903b72826f7dffa148a7e775139af8b5e -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision 668a627903b72826f7dffa148a7e775139af8b5e) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (.../ObjectExtractor.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -413,12 +413,6 @@ if (keyExists(table, WDDXTAGS.DATE_READ_ONLY)) { learningDesign.setDateReadOnly(WDDXProcessor.convertToDate(table, WDDXTAGS.DATE_READ_ONLY)); } - if (keyExists(table, WDDXTAGS.OFFLINE_INSTRUCTIONS)) { - learningDesign.setOfflineInstructions(WDDXProcessor.convertToString(table, WDDXTAGS.OFFLINE_INSTRUCTIONS)); - } - if (keyExists(table, WDDXTAGS.ONLINE_INSTRUCTIONS)) { - learningDesign.setOnlineInstructions(WDDXProcessor.convertToString(table, WDDXTAGS.ONLINE_INSTRUCTIONS)); - } if (keyExists(table, WDDXTAGS.HELP_TEXT)) { learningDesign.setHelpText(WDDXProcessor.convertToString(table, WDDXTAGS.HELP_TEXT)); } @@ -1736,10 +1730,6 @@ activity.setDescription((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.DESCRIPTION)); activity.setTitle((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.ACTIVITY_TITLE)); activity.setHelpText((String) JsonUtil.opt(activityDetails, AuthoringJsonTags.HELP_TEXT)); - - // to be removed soon - activity.setDefineLater(false); - activity.setRunOffline(false); activity.setXcoord(getCoord(activityDetails, AuthoringJsonTags.XCOORD)); activity.setYcoord(getCoord(activityDetails, AuthoringJsonTags.YCOORD)); @@ -1850,9 +1840,6 @@ if (keyExists(activityDetails, WDDXTAGS.ORDER_ID)) { activity.setOrderId(WDDXProcessor.convertToInteger(activityDetails, WDDXTAGS.ORDER_ID)); } - if (keyExists(activityDetails, WDDXTAGS.DEFINE_LATER)) { - activity.setDefineLater(WDDXProcessor.convertToBoolean(activityDetails, WDDXTAGS.DEFINE_LATER)); - } activity.setLearningDesign(learningDesign); @@ -1871,9 +1858,6 @@ activity.setCreateDateTime(modificationDate); } - if (keyExists(activityDetails, WDDXTAGS.RUN_OFFLINE)) { - activity.setRunOffline(WDDXProcessor.convertToBoolean(activityDetails, WDDXTAGS.RUN_OFFLINE)); - } if (keyExists(activityDetails, WDDXTAGS.ACTIVITY_CATEGORY_ID)) { activity.setActivityCategoryID(WDDXProcessor.convertToInteger(activityDetails, WDDXTAGS.ACTIVITY_CATEGORY_ID)); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r2b85a10098233e40a7d126e29a1b251669c91277 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 2b85a10098233e40a7d126e29a1b251669c91277) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -735,9 +735,7 @@ gate.setApplyGrouping(false); // not nullable so default to false gate.setGroupingSupportType(Activity.GROUPING_SUPPORT_OPTIONAL); gate.setOrderId(null); - gate.setDefineLater(Boolean.FALSE); gate.setCreateDateTime(new Date()); - gate.setRunOffline(Boolean.FALSE); gate.setReadOnly(Boolean.TRUE); gate.setLearningDesign(design); @@ -901,21 +899,7 @@ for (Iterator i = activities.iterator(); i.hasNext();) { Activity activity = (Activity) i.next(); - if (activity.isInitialised()) { - if (!activity.isActivityReadOnly() && activity.isToolActivity()) { - // Activity is initialised so it was set up previously. So - // its tool content will be okay - // but the run offline flags and define later flags might - // have been changed, so they need to be updated - // Content ID shouldn't change, but we update it in case it - // does change while we update the status flags. - ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(activity - .getActivityId()); - Long newContentId = lamsCoreToolService.notifyToolOfStatusFlags(toolActivity); - toolActivity.setToolContentId(newContentId); - } - - } else { + if (! activity.isInitialised()) { // this is a new activity - need to set up the content, do any // scheduling, etc // always have to copy the tool content, even though it may @@ -931,7 +915,7 @@ if (activity.isToolActivity()) { ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(activity .getActivityId()); - Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, true, null); + Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, null); toolActivity.setToolContentId(newContentId); // LDEV-2510 init tool sessions for support activities added during live edit @@ -1142,10 +1126,8 @@ String customCSV) { try { ToolActivity toolActivity = (ToolActivity) activity; - // copy the content, but don't set the define later flags if it is - // preview - Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, - ldCopyType != LearningDesign.COPY_TYPE_PREVIEW, customCSV); + // copy the content + Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, customCSV); toolActivity.setToolContentId(newContentId); // clear read only field @@ -1241,11 +1223,8 @@ && (newSequenceActivity.getBranchEntries().size() > 0)) { Activity parentActivity = newSequenceActivity.getParentActivity(); - if (parentActivity.isChosenBranchingActivity() - || (parentActivity.isGroupBranchingActivity() && (parentActivity.getDefineLater() != null) && parentActivity - .getDefineLater().booleanValue())) { - // Don't have any preset up entries for a teacher chosen - // or a define later group based branching. + if (parentActivity.isChosenBranchingActivity()) { + // Don't have any preset up entries for a teacher chosen. // Must be copying a design that was run previously. newSequenceActivity.getBranchEntries().clear(); @@ -2042,7 +2021,7 @@ LearningDesign learningDesign = new LearningDesign(null, null, null, learningDesignTitle, null, null, 1, false, false, null, null, null, new Date(), Configuration.get(ConfigurationKeys.SERVER_VERSION_NUMBER), user, - user, null, null, null, null, null, null, null, null, null, null, contentFolderID, false, null, 1); + user, null, null, null, null, null, null, null, null, contentFolderID, false, null, 1); WorkspaceFolder folder = null; Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java =================================================================== diff -u -rdfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (.../LamsAuthoringFinishAction.java) (revision dfe9ef3dde4b722b5d87c4964a66f19fd48ea2b0) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java (.../LamsAuthoringFinishAction.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -69,12 +69,8 @@ private static final String TOOL_SIGNATURE = "signature"; private static final String CONFIRM_ACTION = "confirm"; - private static final String CANCEL_ACTION = "cancel"; - private static final String RE_EDIT_URL = "reEditUrl"; - private static final String PARAM_DEFINE_LATER = "defineLater"; - /** * Action method, will handle save/cancel action. */ @@ -112,14 +108,7 @@ } response.sendRedirect(nextUrl); } - if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) { - String signature = request.getParameter(TOOL_SIGNATURE); - Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); - ToolContentManager contentManager = (ToolContentManager) findToolService(signature); - contentManager.setAsDefineLater(toolContentId, false); - } - return null; } Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java =================================================================== diff -u -rb0e43d3189749133af52bc2e225ce1533a33a11a -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java (.../PortraitSaveAction.java) (revision b0e43d3189749133af52bc2e225ce1533a33a11a) +++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java (.../PortraitSaveAction.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -112,8 +112,7 @@ if ((file != null) && !StringUtils.isEmpty(fileName)) { try { fileName = fileName.substring(0, fileName.indexOf('.')) + ".jpg"; - node = getCentralToolContentHandler().uploadFile(is, fileName, file.getContentType(), - IToolContentHandler.TYPE_ONLINE); + node = getCentralToolContentHandler().uploadFile(is, fileName, file.getContentType()); is.close(); } catch (Exception e) { request.setAttribute("errorMessage", e.getMessage()); @@ -162,7 +161,7 @@ // write to content repository String fileName = user.getFullName() + " portrait.jpg"; - NodeKey node = getCentralToolContentHandler().uploadFile(is, fileName, "image/jpeg", IToolContentHandler.TYPE_ONLINE); + NodeKey node = getCentralToolContentHandler().uploadFile(is, fileName, "image/jpeg"); is.close(); log.debug("saved file with uuid: " + node.getUuid() + " and version: " + node.getVersion()); Index: lams_common/.classpath =================================================================== diff -u -r1edbb81f16cedfcc1326e4eca6e520b5b48cbddc -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_common/.classpath (.../.classpath) (revision 1edbb81f16cedfcc1326e4eca6e520b5b48cbddc) +++ lams_common/.classpath (.../.classpath) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -5,7 +5,7 @@ - + Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== diff -u -r28827d671ccbd07e8f70eaaf3ca7d63047186bb3 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision 28827d671ccbd07e8f70eaaf3ca7d63047186bb3) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -51,18 +51,10 @@ @hibernate.property column="order_id" length="11" - - @hibernate.property column="define_later_flag" length="4" not-null="true" - - @hibernate.property column="create_date_time" length="19" not-null="true" - - @hibernate.property column="run_offline_flag" length="4" not-null="true" - - @hibernate.property column="parent_ui_id" length="11" Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml =================================================================== diff -u -r097c7143c4edf7a649e785d0f58a1bbf640edd3b -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (.../LearningDesign.hbm.xml) (revision 097c7143c4edf7a649e785d0f58a1bbf640edd3b) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (.../LearningDesign.hbm.xml) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -161,14 +161,6 @@ @hibernate.property column ="last_modified_date_time" - - @hibernate.property column="offline_instructions" length="65535" - - - - @hibernate.property column="online_instructions" length="65535" - - @hibernate.property column="content_folder_id" length="32" Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml =================================================================== diff -u -r920894ca746cba5e080023c5cc80167d64d1653d -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml (.../BasicToolVO.hbm.xml) (revision 920894ca746cba5e080023c5cc80167d64d1653d) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml (.../BasicToolVO.hbm.xml) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -77,23 +77,6 @@ length="65535" - - - - - - @hibernate.property - column="supports_run_offline_flag" - length="1" - not-null="true" - - - Index: lams_learning/web/css/main.css =================================================================== diff -u -r10b19e832ff61386b5cd9dac44ebcfe3c246aee3 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_learning/web/css/main.css (.../main.css) (revision 10b19e832ff61386b5cd9dac44ebcfe3c246aee3) +++ lams_learning/web/css/main.css (.../main.css) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -14,6 +14,12 @@ margin: auto; } +#progressBarDiv text, #progressBarDiv tspan, #progressBarDiv span, #progressBarDiv image, #progressBarDiv img{ +margin: 10px; +padding: 10px; +border: 10px solid blue; +} + #contentFrame { border: none; overflow: auto; Fisheye: Tag c135649b64e98c9233da20bdcfb7689598116314 refers to a dead (removed) revision in file `lams_learning/web/exportPortfolio/offline.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c135649b64e98c9233da20bdcfb7689598116314 refers to a dead (removed) revision in file `lams_learning/web/previewDefineLater.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java =================================================================== diff -u -r1af4378c901cea902392d4ef17f9d990f25e16f3 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java (.../ContributeDTOFactory.java) (revision 1af4378c901cea902392d4ef17f9d990f25e16f3) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java (.../ContributeDTOFactory.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -41,75 +41,77 @@ public class ContributeDTOFactory { - - /** Get the Contribute DTO for this activity. As a SimpleActivity - * it only returns a contribute DTO if there is a contribution entry. - * @throws LamsToolServiceException - */ - public static ContributeActivityDTO getContributeActivityDTO(Long lessonID, SimpleActivity activity, ILamsCoreToolService toolService) throws LamsToolServiceException - { - ContributeActivityDTO dto = null; - SimpleActivityStrategy strategy = activity.getSimpleActivityStrategy(); - if ( strategy != null ) { - dto = addContributionURLS(lessonID, activity, strategy, toolService); - } - return dto; + /** + * Get the Contribute DTO for this activity. As a SimpleActivity it only returns a contribute DTO if there is a + * contribution entry. + * + * @throws LamsToolServiceException + */ + public static ContributeActivityDTO getContributeActivityDTO(Long lessonID, SimpleActivity activity, + ILamsCoreToolService toolService) throws LamsToolServiceException { + ContributeActivityDTO dto = null; + SimpleActivityStrategy strategy = activity.getSimpleActivityStrategy(); + if (strategy != null) { + dto = addContributionURLS(lessonID, activity, strategy, toolService); } + return dto; + } - private static ContributeActivityDTO addContributionURLS(Long lessonID, Activity activity, IContributionTypeStrategy strategy, ILamsCoreToolService toolService) { - ContributeActivityDTO dto = null; - Integer[] contributionType = strategy.getContributionType(); - if ( contributionType.length > 0 ) { - dto = new ContributeActivityDTO(activity); - for(int i=0;i 0) { + dto = new ContributeActivityDTO(activity); + for (int i = 0; i < contributionType.length; i++) { + Integer contributionTypeEntry = contributionType[i]; + String url = getURL(lessonID, activity, contributionTypeEntry, toolService); + dto.addContribution(contributionTypeEntry, url); + } } + return dto; + } - private static String getURL(Long lessonID, Activity activity, Integer contributionTypeEntry, ILamsCoreToolService toolService) throws LamsToolServiceException { + private static String getURL(Long lessonID, Activity activity, Integer contributionTypeEntry, + ILamsCoreToolService toolService) throws LamsToolServiceException { - String url = null; - if ( activity.isToolActivity() ) { - ToolActivity toolActivity = (ToolActivity) activity; - if ( contributionTypeEntry.equals(ContributionTypes.MODERATION) ) { - url = toolService.getToolModerateURL(toolActivity); - } else if ( contributionTypeEntry.equals(ContributionTypes.DEFINE_LATER) ) { - url = toolService.getToolDefineLaterURL(toolActivity); - } - } - - if ( url == null ) { - /* PERMISSION_GAE || SYNC_GATE || SCHEDULE_GATE || CHOSEN_GROUPING || - CONTRIBUTION || CHOSEN_BRANCHING || - Unknown contribution type || (!ToolActivity && ( MODERATION || DEFINE_LATER)) */ - url = toolService.getToolContributionURL(lessonID, activity); - } - return url != null ? WebUtil.convertToFullURL(url) : null; + String url = null; + if (activity.isToolActivity()) { + ToolActivity toolActivity = (ToolActivity) activity; + if (contributionTypeEntry.equals(ContributionTypes.MODERATION)) { + url = toolService.getToolModerateURL(toolActivity); + } } - /** Get the Contribute DTO for this activity. As a complex activity it always returns - * a DTO - as it may be needed to enclose a child activity. - */ - public static ContributeActivityDTO getContributeActivityDTO(Long lessonID, ComplexActivity activity, - ILamsCoreToolService toolService, Vector childActivities) - { - ContributeActivityDTO dto = null; - ComplexActivityStrategy strategy = activity.getComplexActivityStrategy(); - if ( strategy != null ) { - dto = addContributionURLS(lessonID, activity, strategy, toolService); - if ( childActivities != null && childActivities.size() > 0 ) { - if ( dto == null ) { - dto = new ContributeActivityDTO(activity); - } - dto.setChildActivities(childActivities); - } + if (url == null) { + /* + * PERMISSION_GATE || SYNC_GATE || SCHEDULE_GATE || CHOSEN_GROUPING || CONTRIBUTION || CHOSEN_BRANCHING || + * Unknown contribution type || (!ToolActivity && MODERATION) + */ + url = toolService.getToolContributionURL(lessonID, activity); + } + return url != null ? WebUtil.convertToFullURL(url) : null; + } + + /** + * Get the Contribute DTO for this activity. As a complex activity it always returns a DTO - as it may be needed to + * enclose a child activity. + */ + public static ContributeActivityDTO getContributeActivityDTO(Long lessonID, ComplexActivity activity, + ILamsCoreToolService toolService, Vector childActivities) { + ContributeActivityDTO dto = null; + ComplexActivityStrategy strategy = activity.getComplexActivityStrategy(); + if (strategy != null) { + dto = addContributionURLS(lessonID, activity, strategy, toolService); + if (childActivities != null && childActivities.size() > 0) { + if (dto == null) { + dto = new ContributeActivityDTO(activity); } - return dto; - + dto.setChildActivities(childActivities); + } } + return dto; + } + } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java =================================================================== diff -u -rc26bfcb6f8502515eef2c55bba123cb39ce1ccb7 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java (.../ContributeActivityDTO.java) (revision c26bfcb6f8502515eef2c55bba123cb39ce1ccb7) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java (.../ContributeActivityDTO.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -131,8 +131,7 @@ public void setContributionType(Integer contributionType) { this.contributionType = contributionType; boolean isReq = contributionType != null - && (contributionType.equals(ContributionTypes.DEFINE_LATER) - || contributionType.equals(ContributionTypes.PERMISSION_GATE) + && (contributionType.equals(ContributionTypes.PERMISSION_GATE) || contributionType.equals(ContributionTypes.CHOSEN_GROUPING) || contributionType .equals(ContributionTypes.CHOSEN_BRANCHING)); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -rb4325ec051bf24b10f4c98560b8105e2e79229e7 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision b4325ec051bf24b10f4c98560b8105e2e79229e7) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -466,21 +466,6 @@ throws IOException, LamsToolServiceException; /** - * This method returns the define later url for the given activity. - * - * @param lessonID - * The lesson_id of the Lesson for which the information has to be fetched. - * @param activityID - * The activity_id of the Activity whose URL will be returned - * @param userID - * The user id of the user requesting the url. - * @return String the url - * @throws IOException - */ - public String getActivityDefineLaterURL(Long lessonID, Long activityID, Integer userID) throws IOException, - LamsToolServiceException; - - /** * This method returns the monitor url for the given activity * * @param lessonID @@ -710,7 +695,7 @@ /** * Match group(s) to a branch. Doesn't necessarily check if the group is already assigned to another branch. Use for - * Group Based Branching and define later. + * Group Based Branching. * * @param sequenceActivityID * Activity id of the sequenceActivity representing this branch Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rb4325ec051bf24b10f4c98560b8105e2e79229e7 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision b4325ec051bf24b10f4c98560b8105e2e79229e7) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -2067,30 +2067,6 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityDefineLaterURL(java.lang.Long) - */ - @Override - public String getActivityDefineLaterURL(Long lessonID, Long activityID, Integer userID) throws IOException, - LamsToolServiceException { - Lesson lesson = lessonDAO.getLesson(lessonID); - checkOwnerOrStaffMember(userID, lesson, "get activity define later url"); - - Activity activity = activityDAO.getActivityByActivityId(activityID); - if (activity == null) { - MonitoringService.log.error("getActivityMonitorURL activity missing. Activity ID " + activityID - + " activity " + activity); - - } else if (activity.isToolActivity()) { - ToolActivity toolActivity = (ToolActivity) activity; - return lamsCoreToolService.getToolDefineLaterURL(toolActivity); - - } - return null; - } - - /** - * (non-Javadoc) - * * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getActivityMonitorURL(java.lang.Long) */ @Override @@ -2887,7 +2863,7 @@ /** * Match group(s) to a branch. Doesn't necessarily check if the group is already assigned to another branch. Use for - * Group Based Branching and define later. + * Group Based Branching. * * @param sequenceActivityID * Activity id of the sequenceActivity representing this branch Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -rb4325ec051bf24b10f4c98560b8105e2e79229e7 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision b4325ec051bf24b10f4c98560b8105e2e79229e7) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -805,18 +805,6 @@ return redirectToURL(mapping, response, url); } - /** Calls the server to bring up the activity's define later page. Assumes destination is a new window */ - public ActionForward getActivityDefineLaterURL(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws IOException, LamsToolServiceException { - IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() - .getServletContext()); - Long activityID = new Long(WebUtil.readLongParam(request, "activityID")); - Long lessonID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID)); - - String url = monitoringService.getActivityDefineLaterURL(lessonID, activityID, getUserId()); - return redirectToURL(mapping, response, url); - } - public ActionForward moveLesson(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException { IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() @@ -846,7 +834,6 @@ HttpSession ss = SessionManager.getSession(); UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Locale userLocale = new Locale(user.getLocaleLanguage(), user.getLocaleCountry()); if ((lessonDTO.getCreateDateTime() != null) && (lessonDTO.getCreateDateTime() != WDDXTAGS.DATE_NULL_VALUE)) { DateFormat sfm = new SimpleDateFormat("yyyyMMdd_HHmmss"); lessonDTO.setCreateDateTimeStr(sfm.format(lessonDTO.getCreateDateTime())); @@ -866,11 +853,6 @@ .getContributeEntries()) { if (contributeEntry.getIsRequired()) { requiredContributeActivities.add(contributeActivity); - if (ContributionTypes.DEFINE_LATER.equals(contributeEntry.getContributionType())) { - String url = WebUtil.appendParameterToURL(contributeEntry.getURL(), - AttributeNames.PARAM_CONTENT_FOLDER_ID, lessonDTO.getContentFolderID()); - contributeEntry.setURL(url); - } } } } Index: lams_monitoring/web/branching/groupedSelection.jsp =================================================================== diff -u -r5822fa33a4644a07c816fa58c4a0e083e908c4a9 -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/web/branching/groupedSelection.jsp (.../groupedSelection.jsp) (revision 5822fa33a4644a07c816fa58c4a0e083e908c4a9) +++ lams_monitoring/web/branching/groupedSelection.jsp (.../groupedSelection.jsp) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -1,4 +1,4 @@ - <%-- +<%-- Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) License Information: http://lamsfoundation.org/licensing/lams/2.0/ Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r5b633ecc884b7d321a5164af26bfe268629a2d3f -rc135649b64e98c9233da20bdcfb7689598116314 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 5b633ecc884b7d321a5164af26bfe268629a2d3f) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision c135649b64e98c9233da20bdcfb7689598116314) @@ -287,9 +287,6 @@ - - -