Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -r68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 68f0d8c20848cfdce8fe3d16b7631d48dfa8c4a0) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -16,68 +16,74 @@ const ACTIVITY_ITEM_TEMPLATE = '
    • '; if (result.support) { let supportBarItems = $('.component-page-wrapper .offcanvas #offcanvas-support-bar') - .removeClass('d-none') + .removeClass('d-none') .find('#support-bar-items') .empty(); $.each(result.support, function (activityIndex, activityData) { let activityItem = $(ACTIVITY_ITEM_TEMPLATE) - .addClass('list-group-item list-group-item-action progress-bar-item-openable').appendTo(supportBarItems), + .addClass('list-group-item list-group-item-action progress-bar-item-openable').appendTo(supportBarItems), activityIcon = $('').attr({ - 'class': 'fa-solid fa-fw fa-lg fa-up-right-from-square progress-bar-icon', - 'title': LABEL_SUPPORT_ACTIVITY - }), - activityLink = $('').text(activityData.name).attr({ - 'target': '_blank', - 'href': activityData.url, - 'role': 'menuitem', - 'title': LABEL_CLICK_TO_OPEN - }); - $(".icon", activityItem).prepend(activityIcon); - $(".col", activityItem).append(activityLink); + 'class': 'fa-solid fa-fw fa-lg fa-up-right-from-square progress-bar-icon', + 'title': LABEL_SUPPORT_ACTIVITY + }), + activityLink = $('').text(activityData.name).attr({ + 'target': '_blank', + 'href': activityData.url, + 'role': 'menuitem', + 'title': LABEL_CLICK_TO_OPEN + }); + $(".icon", activityItem).prepend(activityIcon); + $(".col", activityItem).append(activityLink); }); } let progressBarItems = $('.component-page-wrapper .offcanvas #progress-bar-items').empty(), completedActivityCount = 0; $.each(result.activities, function (activityIndex, activityData) { let activityItem = $(ACTIVITY_ITEM_TEMPLATE) - .addClass('list-group-item list-group-item-action') - .appendTo(progressBarItems), + .addClass('list-group-item list-group-item-action') + .appendTo(progressBarItems), activityName = !activityData.name && activityData.type === 'g' ? 'Gate' : activityData.name, activityIcon = $(''); - $(".icon", activityItem).prepend(activityIcon); + $(".icon", activityItem).prepend(activityIcon); - //current + //current if (activityData.status === 0) { - activityItem.addClass('active'); - $(".col", activityItem).text(activityName); - activityIcon.addClass('fa-regular fa-pen-to-square') - .attr('title', LABEL_CURRENT_ACTIVITY); - - //completed - } else if (activityData.status === 1) { - completedActivityCount++; + activityItem.addClass('active'); + $(".col", activityItem).text(activityName); + activityIcon.addClass('fa-regular fa-pen-to-square') + .attr('title', LABEL_CURRENT_ACTIVITY); - activityItem.addClass('progress-bar-item-complete'); - activityIcon.addClass('fa-solid fa-square-check') - .attr('title', LABEL_COMPLETED_ACTIVITY); + } else { + let target = '_blank'; + + //completed + if (activityData.status === 1) { + completedActivityCount++; + + activityItem.addClass('progress-bar-item-complete'); + activityIcon.addClass('fa-solid fa-square-check') + .attr('title', LABEL_COMPLETED_ACTIVITY); + } else { + target = '_self'; + //not yet finished + activityItem.addClass('progress-bar-item-incomplete'); + activityIcon.addClass('fa-regular fa-square') + .attr('title', LABEL_NOT_STARTED_ACTIVITY); + } + if (activityData.url) { let activityLink = $('').text(activityName).attr({ - 'target': '_blank', + 'target': target, 'href': activityData.url, 'role': 'menuitem', 'title': LABEL_CLICK_TO_OPEN }); activityItem.addClass('progress-bar-item-openable'); $(".col", activityItem).append(activityLink); + } else { + $(".col", activityItem).text(activityName); } - - //not yet finished - } else { - activityItem.addClass('progress-bar-item-incomplete'); - $(".col", activityItem).text(activityName); - activityIcon.addClass('fa-regular fa-square') - .attr('title', LABEL_NOT_STARTED_ACTIVITY); } }); @@ -88,7 +94,6 @@ .attr('aria-valuenow', progressBarWidgetValue); $('#progress-bar-widget-value').text(progressBarWidgetValue + '%'); - initCommandWebsocket(result.lessonID); } }); @@ -152,7 +157,7 @@ progressBar = $('.component-page-wrapper .offcanvas'), topToggleButton = $('header #hamb', pageContent), isExpanded = forceClose || topToggleButton.attr('aria-expanded') == 'true'; - + topToggleButton.attr('aria-expanded', !isExpanded) .children('i').toggleClass(topToggleButton.data('closed-class')).toggleClass(topToggleButton.data('opened-class')); progressBar.toggleClass('active').attr('aria-expanded', !isExpanded); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,8 +23,28 @@ package org.lamsfoundation.lams.monitoring.service; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeSet; +import java.util.Vector; + +import javax.servlet.http.HttpSession; + import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -73,8 +93,6 @@ import org.lamsfoundation.lams.monitoring.quartz.job.FinishScheduleLessonJob; import org.lamsfoundation.lams.monitoring.quartz.job.OpenScheduleGateJob; import org.lamsfoundation.lams.monitoring.quartz.job.StartScheduleLessonJob; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria; import org.lamsfoundation.lams.security.ISecurityService; import org.lamsfoundation.lams.tool.ToolContent; @@ -107,27 +125,8 @@ import org.quartz.TriggerBuilder; import org.quartz.TriggerKey; -import javax.servlet.http.HttpSession; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Collection; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; -import java.util.SortedSet; -import java.util.TimeZone; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.Vector; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; /** *

    @@ -1168,10 +1167,6 @@ // remove lesson resources lessonDAO.deleteByProperty(LogEvent.class, "lessonId", lessonId); lessonDAO.deleteByProperty(ToolSession.class, "lesson.lessonId", lessonId); - Map notebookProperties = new TreeMap<>(); - notebookProperties.put("externalID", lessonId); - notebookProperties.put("externalIDType", CoreNotebookConstants.SCRATCH_PAD); - lessonDAO.deleteByProperties(NotebookEntry.class, notebookProperties); lessonDAO.deleteLesson(lesson); // remove each Tool activity content Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== diff -u -rff8c13adfeaacdee873b39fedc822e304e1f4cff -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision ff8c13adfeaacdee873b39fedc822e304e1f4cff) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -168,12 +168,6 @@ @Column(name = "attempt_completion_notify") private boolean notifyTeachersOnAttemptCompletion; - @Column(name = "reflect_on_activity") - private boolean reflectOnActivity; - - @Column(name = "reflect_instructions") - private String reflectInstructions; - @Column(name = "question_etherpad_enabled") private boolean questionEtherpadEnabled; @@ -756,22 +750,6 @@ this.notifyTeachersOnAttemptCompletion = notifyTeachersOnAttemptCompletion; } - public String getReflectInstructions() { - return reflectInstructions; - } - - public void setReflectInstructions(String reflectInstructions) { - this.reflectInstructions = reflectInstructions; - } - - public boolean isReflectOnActivity() { - return reflectOnActivity; - } - - public void setReflectOnActivity(boolean reflectOnActivity) { - this.reflectOnActivity = reflectOnActivity; - } - public boolean isQuestionEtherpadEnabled() { return questionEtherpadEnabled; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,10 +23,33 @@ package org.lamsfoundation.lams.tool.assessment.service; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.nio.charset.StandardCharsets; +import java.security.InvalidParameterException; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.UUID; +import java.util.function.Function; +import java.util.regex.Pattern; +import java.util.stream.Collectors; + import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang.StringUtils; @@ -50,9 +73,6 @@ import org.lamsfoundation.lams.logevent.LearnerInteractionEvent; import org.lamsfoundation.lams.logevent.service.ILearnerInteractionService; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.outcome.Outcome; import org.lamsfoundation.lams.outcome.OutcomeMapping; import org.lamsfoundation.lams.outcome.service.IOutcomeService; @@ -85,7 +105,6 @@ import org.lamsfoundation.lams.tool.assessment.dto.OptionDTO; import org.lamsfoundation.lams.tool.assessment.dto.QuestionDTO; import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary; -import org.lamsfoundation.lams.tool.assessment.dto.ReflectDTO; import org.lamsfoundation.lams.tool.assessment.dto.UserSummary; import org.lamsfoundation.lams.tool.assessment.dto.UserSummaryItem; import org.lamsfoundation.lams.tool.assessment.model.Assessment; @@ -123,32 +142,10 @@ import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager; import org.springframework.web.util.UriUtils; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.nio.charset.StandardCharsets; -import java.security.InvalidParameterException; -import java.sql.Timestamp; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; -import java.util.UUID; -import java.util.function.Function; -import java.util.regex.Pattern; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * @author Andrey Balan @@ -193,8 +190,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private IQbService qbService; @@ -1293,56 +1288,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer userId, String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - AssessmentConstants.TOOL_SIGNATURE, userId, "", entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer userId) { - List list = coreNotebookService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - AssessmentConstants.TOOL_SIGNATURE, userId); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override - public List getReflectList(Long contentId) { - List reflectList = new LinkedList<>(); - - List sessionList = assessmentSessionDao.getByContentId(contentId); - for (AssessmentSession session : sessionList) { - Long sessionId = session.getSessionId(); - // get all users in this session - List users = assessmentUserDao.getBySessionID(sessionId); - for (AssessmentUser user : users) { - - NotebookEntry entry = getEntry(sessionId, user.getUserId().intValue()); - if (entry != null) { - ReflectDTO ref = new ReflectDTO(user); - ref.setReflect(entry.getEntry()); - Date postedDate = (entry.getLastModified() != null) - ? entry.getLastModified() - : entry.getCreateDate(); - ref.setDate(postedDate); - reflectList.add(ref); - } - - } - } - - return reflectList; - } - - @Override public String finishToolSession(Long toolSessionId, Long userId) throws AssessmentApplicationException { //mark user as finished AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId, toolSessionId); @@ -3315,14 +3260,6 @@ return; } - for (AssessmentSession session : assessmentSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, AssessmentConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - assessmentDao.delete(assessment); } @@ -3362,16 +3299,10 @@ AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId.longValue(), session.getSessionId()); if (user != null) { - if (resetActivityCompletionOnly) { user.setSessionFinished(false); assessmentUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), userId); - if (entry != null) { - assessmentDao.removeObject(NotebookEntry.class, entry.getUid()); - } - if ((session.getGroupLeader() != null) && session.getGroupLeader().getUid().equals(user.getUid())) { session.setGroupLeader(null); } @@ -3746,14 +3677,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setLearnerService(ILearnerService learnerService) { this.learnerService = learnerService; } @@ -3857,9 +3780,6 @@ assessment.setInstructions(toolContentJSON.get(RestTags.INSTRUCTIONS).asText()); assessment.setCreated(new Date()); - assessment.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - assessment.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); assessment.setAllowGradesAfterAttempt( JsonUtil.optBoolean(toolContentJSON, "allowGradesAfterAttempt", Boolean.FALSE)); assessment.setAllowHistoryResponses( @@ -3886,9 +3806,6 @@ assessment.setNumbered(JsonUtil.optBoolean(toolContentJSON, "numbered", Boolean.TRUE)); assessment.setPassingMark(JsonUtil.optInt(toolContentJSON, "passingMark", 0)); assessment.setQuestionsPerPage(JsonUtil.optInt(toolContentJSON, "questionsPerPage", 0)); - assessment.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, "")); - assessment.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); assessment.setShuffled(JsonUtil.optBoolean(toolContentJSON, "shuffled", Boolean.FALSE)); assessment.setRelativeTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0)); assessment.setUseSelectLeaderToolOuput( Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java =================================================================== diff -u -r6cd828445d4549e4d114c5333628d812233f0f7a -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 6cd828445d4549e4d114c5333628d812233f0f7a) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java (.../LearningController.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -33,7 +33,6 @@ import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.logevent.LearnerInteractionEvent; import org.lamsfoundation.lams.logevent.service.ILearnerInteractionService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; @@ -56,11 +55,9 @@ import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession; import org.lamsfoundation.lams.tool.assessment.model.AssessmentUser; import org.lamsfoundation.lams.tool.assessment.model.QuestionReference; -import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException; import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService; import org.lamsfoundation.lams.tool.assessment.util.AssessmentSessionComparator; import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator; -import org.lamsfoundation.lams.tool.assessment.web.form.ReflectionForm; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -77,7 +74,6 @@ import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; @@ -302,14 +298,6 @@ //showResults if user has finished the last result boolean showResults = (lastResult != null) && (lastResult.getFinishDate() != null); - // get notebook entry - String entryText = new String(); - AssessmentUser notebookCreator = (groupLeader == null) ? user : groupLeader; - NotebookEntry notebookEntry = service.getEntry(toolSessionId, notebookCreator.getUserId().intValue()); - if (notebookEntry != null) { - entryText = notebookEntry.getEntry(); - } - // basic information sessionMap.put(AssessmentConstants.ATTR_TITLE, assessment.getTitle()); sessionMap.put(AssessmentConstants.ATTR_INSTRUCTIONS, assessment.getInstructions()); @@ -321,10 +309,6 @@ sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); sessionMap.put(AssessmentConstants.ATTR_USER, user); sessionMap.put(AttributeNames.ATTR_MODE, mode); - // reflection information - sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ON, assessment.isReflectOnActivity()); - sessionMap.put(AssessmentConstants.ATTR_REFLECTION_INSTRUCTION, assessment.getReflectInstructions()); - sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, entryText); Boolean isLastActivity = (Boolean) sessionMap.get(AttributeNames.ATTR_IS_LAST_ACTIVITY); if (isLastActivity == null) { @@ -759,59 +743,6 @@ return responseJSON.toString(); } - /** - * Display empty reflection form. - */ - @RequestMapping("/newReflection") - public String newReflection(@ModelAttribute("reflectionForm") ReflectionForm refForm, HttpServletRequest request) { - - // get session value - String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID); - HttpSession ss = SessionManager.getSession(); - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - - refForm.setUserID(user.getUserID()); - refForm.setSessionMapID(sessionMapID); - - // get the existing reflection entry - SessionMap sessionMap = getSessionMap(request); - Long toolSessionID = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - NotebookEntry entry = service.getEntry(toolSessionID, user.getUserID()); - - if (entry != null) { - refForm.setEntryText(entry.getEntry()); - } - - return "pages/learning/notebook"; - } - - /** - * Submit reflection form input database. - */ - @RequestMapping("/submitReflection") - public void submitReflection(@ModelAttribute("reflectionForm") ReflectionForm refForm, - HttpServletRequest request, HttpServletResponse response) throws IOException { - Integer userId = refForm.getUserID(); - - SessionMap sessionMap = getSessionMap(request); - Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - - // check for existing notebook entry - NotebookEntry entry = service.getEntry(sessionId, userId); - - if (entry == null) { - // create new entry - service.createNotebookEntry(sessionId, userId, refForm.getEntryText()); - } else { - // update existing entry - entry.setEntry(refForm.getEntryText()); - entry.setLastModified(new Date()); - service.updateEntry(entry); - } - - finish(request, response); - } - // ************************************************************************************* // Private method // ************************************************************************************* Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java =================================================================== diff -u -rff8c13adfeaacdee873b39fedc822e304e1f4cff -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision ff8c13adfeaacdee873b39fedc822e304e1f4cff) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -64,7 +64,6 @@ assessment.setShuffledAnswers(false); assessment.setNumbered(false); assessment.setDisplaySummary(false); - assessment.setReflectOnActivity(false); } public int getCurrentTab() { Index: lams_tool_assessment/web/pages/authoring/advance.jsp =================================================================== diff -u -rff8c13adfeaacdee873b39fedc822e304e1f4cff -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision ff8c13adfeaacdee873b39fedc822e304e1f4cff) +++ lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -485,34 +485,3 @@ - - - -

    - -
    - -
    - -
    - - - \ No newline at end of file Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp =================================================================== diff -u -rff8c13adfeaacdee873b39fedc822e304e1f4cff -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp (.../advanceoptions.jsp) (revision ff8c13adfeaacdee873b39fedc822e304e1f4cff) +++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp (.../advanceoptions.jsp) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -305,36 +305,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file Index: lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java (.../ChatService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -31,9 +31,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -99,8 +96,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private ChatOutputFactory chatOutputFactory; private Random generator = new Random(); @@ -278,14 +273,6 @@ return; } - for (ChatSession session : (Set) chat.getChatSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ChatConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - chatDAO.delete(chat); } @@ -320,12 +307,6 @@ session.getChatMessages().remove(message); } } - - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ChatConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - chatDAO.delete(entry); - } } user.setFinishedActivity(false); @@ -771,44 +752,12 @@ return chatMessageDAO.getCountByFromUser(sessionUID); } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - /** - * @param notebookEntry - */ - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - public ChatOutputFactory getChatOutputFactory() { return chatOutputFactory; } - public void setChatOutputFactory(ChatOutputFactory notebookOutputFactory) { - chatOutputFactory = notebookOutputFactory; + public void setChatOutputFactory(ChatOutputFactory chatOutputFactory) { + this.chatOutputFactory = chatOutputFactory; } @Override @@ -897,8 +846,6 @@ content.setContentInUse(false); content.setDefineLater(false); - content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); String filterKeywords = JsonUtil.optString(toolContentJSON, "filterKeywords"); Index: lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java (.../DacoServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -34,9 +34,6 @@ import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -105,8 +102,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private DacoOutputFactory dacoOutputFactory; @@ -134,13 +129,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override public void createToolSession(Long toolSessionId, String toolSessionName, Long toolContentId) throws ToolException { DacoSession session = new DacoSession(); session.setSessionId(toolSessionId); @@ -197,14 +185,12 @@ } @Override - public ToolSessionExportOutputData exportToolSession(List toolSessionIds) - throws DataMissingException, ToolException { + public ToolSessionExportOutputData exportToolSession(List toolSessionIds) throws DataMissingException, ToolException { return null; } @Override - public ToolSessionExportOutputData exportToolSession(Long toolSessionId) - throws DataMissingException, ToolException { + public ToolSessionExportOutputData exportToolSession(Long toolSessionId) throws DataMissingException, ToolException { return null; } @@ -302,21 +288,6 @@ } @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public void uploadDacoAnswerFile(DacoAnswer answer, MultipartFile file) throws UploadDacoFileException { try { InputStream is = file.getInputStream(); @@ -382,18 +353,15 @@ Daco daco = getDacoByContentId(contentId); for (DacoSession session : sessions) { // for each session a monitoring summary is created but don't include users as the paging fetches them - MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), - session.getSessionName()); + MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), session.getSessionName()); result.add(monitoringRecordList); } return result; } @Override - public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, - String searchString, boolean getNotebookEntries) { - return dacoUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, - coreNotebookService, userManagementService); + public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString) { + return dacoUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, userManagementService); } @Override @@ -409,8 +377,7 @@ @Override public MonitoringSummarySessionDTO getAnswersAsRecords(final Long sessionId, final Long userId, int sorting) { DacoSession session = dacoSessionDao.getSessionBySessionId(sessionId); - MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), - session.getSessionName()); + MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), session.getSessionName()); List monitoringUsers = new ArrayList<>(); if (userId == null) { @@ -428,8 +395,8 @@ // called by getAnswersAsRecords private MonitoringSummaryUserDTO getAnswersAsRecordsForUser(DacoUser user) { - MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(), - user.getUserId().intValue(), user.getFullName(), user.getLoginName()); + MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(), user.getUserId().intValue(), user.getFullName(), + user.getLoginName()); List> records = getDacoAnswersByUser(user); monitoringUser.setRecords(records); monitoringUser.setRecordCount(records.size()); @@ -443,13 +410,12 @@ Daco daco = getDacoByContentId(contentId); for (DacoSession session : sessions) { // for each session a monitoring summary is created - MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), - session.getSessionName()); + MonitoringSummarySessionDTO monitoringRecordList = new MonitoringSummarySessionDTO(session.getSessionId(), session.getSessionName()); List users = dacoUserDao.getBySessionId(session.getSessionId()); List monitoringUsers = new ArrayList<>(users.size()); for (DacoUser user : users) { - MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(), - user.getUserId().intValue(), user.getFullName(), user.getLoginName()); + MonitoringSummaryUserDTO monitoringUser = new MonitoringSummaryUserDTO(user.getUid(), user.getUserId().intValue(), user.getFullName(), + user.getLoginName()); List> records = getDacoAnswersByUser(user); /* * If the user provided as "userUid" matches current user UID, the summary is filled with additional @@ -458,11 +424,6 @@ */ if ((userUid == null) || userUid.equals(user.getUid())) { monitoringUser.setRecords(records); - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - DacoConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - monitoringUser.setReflectionEntry(entry.getEntry()); - } } else { monitoringUser.setRecordCount(records.size()); } @@ -503,8 +464,7 @@ QuestionSummaryDTO summary = new QuestionSummaryDTO(); summary.setQuestionUid(question.getUid()); for (int answerOption = 0; answerOption < answerOptionCount; answerOption++) { - QuestionSummarySingleAnswerDTO singleAnswer = new QuestionSummarySingleAnswerDTO( - String.valueOf(answerOption + 1), null, "0%", "0"); + QuestionSummarySingleAnswerDTO singleAnswer = new QuestionSummarySingleAnswerDTO(String.valueOf(answerOption + 1), null, "0%", "0"); summary.addUserSummarySingleAnswer(answerOption, singleAnswer); singleAnswer = (QuestionSummarySingleAnswerDTO) singleAnswer.clone(); summary.addGroupSummarySingleAnswer(answerOption, singleAnswer); @@ -581,8 +541,7 @@ } @Override - public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) - throws ToolException { + public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) throws ToolException { Daco daco = getDacoByContentId(toolContentId); if (daco == null) { try { @@ -634,18 +593,15 @@ * ===============Methods implemented from ToolContentImport102Manager =============== */ @Override - public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, - String toVersion) throws ToolException { + public void importToolContent(Long toolContentId, Integer newUserUid, String toolContentPath, String fromVersion, String toVersion) throws ToolException { try { // register version filter class exportContentService.registerImportVersionFilterClass(DacoImportContentVersionFilter.class); - Object toolPOJO = exportContentService.importToolContent(toolContentPath, dacoToolContentHandler, - fromVersion, toVersion); + Object toolPOJO = exportContentService.importToolContent(toolContentPath, dacoToolContentHandler, fromVersion, toVersion); if (!(toolPOJO instanceof Daco)) { - throw new ImportToolContentException( - "Import Share daco tool content failed. Deserialized object is " + toolPOJO); + throw new ImportToolContentException("Import Share daco tool content failed. Deserialized object is " + toolPOJO); } Daco toolContentObj = (Daco) toolPOJO; @@ -735,17 +691,13 @@ try { node = dacoToolContentHandler.uploadFile(file.getInputStream(), fileName, file.getContentType()); } catch (InvalidParameterException e) { - throw new UploadDacoFileException( - messageService.getMessage("error.msg.invaid.param.upload") + " " + e.getMessage()); + throw new UploadDacoFileException(messageService.getMessage("error.msg.invaid.param.upload") + " " + e.getMessage()); } catch (FileNotFoundException e) { - throw new UploadDacoFileException( - messageService.getMessage("error.msg.file.not.found") + " " + e.getMessage()); + throw new UploadDacoFileException(messageService.getMessage("error.msg.file.not.found") + " " + e.getMessage()); } catch (RepositoryCheckedException e) { - throw new UploadDacoFileException( - messageService.getMessage("error.msg.repository") + " " + e.getMessage()); + throw new UploadDacoFileException(messageService.getMessage("error.msg.repository") + " " + e.getMessage()); } catch (IOException e) { - throw new UploadDacoFileException( - messageService.getMessage("error.msg.io.exception") + " " + e.getMessage()); + throw new UploadDacoFileException(messageService.getMessage("error.msg.io.exception") + " " + e.getMessage()); } } return node; @@ -786,14 +738,6 @@ return; } - for (DacoSession session : dacoSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, DacoConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - dacoDao.removeObject(Daco.class, daco.getUid()); } @@ -829,12 +773,6 @@ dacoAnswerDao.removeObject(DacoAnswer.class, answer.getUid()); } - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - DacoConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - dacoDao.removeObject(NotebookEntry.class, entry.getUid()); - } - dacoUserDao.removeObject(DacoUser.class, user.getUid()); } } @@ -878,18 +816,10 @@ // set methods for Spring Bean // ***************************************************************************** - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - public IUserManagementService getUserManagementService() { return userManagementService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setDacoDao(DacoDAO dacoDao) { this.dacoDao = dacoDao; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java (.../DokumaranService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,9 +23,21 @@ package org.lamsfoundation.lams.tool.dokumaran.service; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; -import net.gjerull.etherpad.client.EPLiteClient; +import java.security.InvalidParameterException; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.function.Function; +import java.util.stream.Collectors; + +import javax.servlet.http.HttpServletResponse; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -43,9 +55,6 @@ import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria; @@ -63,7 +72,6 @@ import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranDAO; import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranSessionDAO; import org.lamsfoundation.lams.tool.dokumaran.dao.DokumaranUserDAO; -import org.lamsfoundation.lams.tool.dokumaran.dto.ReflectDTO; import org.lamsfoundation.lams.tool.dokumaran.dto.SessionDTO; import org.lamsfoundation.lams.tool.dokumaran.model.Dokumaran; import org.lamsfoundation.lams.tool.dokumaran.model.DokumaranSession; @@ -80,21 +88,11 @@ import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.hibernate.HibernateSessionManager; -import javax.servlet.http.HttpServletResponse; -import java.security.InvalidParameterException; -import java.time.LocalDateTime; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.function.Function; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import net.gjerull.etherpad.client.EPLiteClient; + /** * @author Dapeng.Ni */ @@ -126,8 +124,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEtherpadService etherpadService; private DokumaranOutputFactory dokumaranOutputFactory; @@ -561,58 +557,6 @@ } @Override - public List getReflectList(Long contentId) { - List reflections = new LinkedList<>(); - - List sessionList = dokumaranSessionDao.getByContentId(contentId); - for (DokumaranSession session : sessionList) { - Long sessionId = session.getSessionId(); - // get all users in this session - List users = dokumaranUserDao.getBySessionID(sessionId); - for (DokumaranUser user : users) { - - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - DokumaranConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ReflectDTO ref = new ReflectDTO(user); - ref.setReflect(entry.getEntry()); - Date postedDate = (entry.getLastModified() != null) - ? entry.getLastModified() - : entry.getCreateDate(); - ref.setDate(postedDate); - reflections.add(ref); - } - - } - - } - - return reflections; - } - - @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public DokumaranUser getUser(Long uid) { return (DokumaranUser) dokumaranUserDao.getObject(DokumaranUser.class, uid); } @@ -972,13 +916,6 @@ return; } - for (DokumaranSession session : dokumaranSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, DokumaranConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } dokumaranDao.delete(dokumaran); } @@ -1011,12 +948,6 @@ user.setSessionFinished(false); dokumaranUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - DokumaranConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - dokumaranDao.removeObject(NotebookEntry.class, entry.getUid()); - } - dokumaranUserDao.removeObject(DokumaranUser.class, user.getUid()); } } @@ -1304,10 +1235,6 @@ this.ratingService = ratingService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setEtherpadService(IEtherpadService etherpadService) { this.etherpadService = etherpadService; } @@ -1345,9 +1272,6 @@ dokumaran.setShowLineNumbers(JsonUtil.optBoolean(toolContentJSON, "showLineNumbers", Boolean.FALSE)); dokumaran.setSharedPadId(JsonUtil.optString(toolContentJSON, "sharedPadId")); dokumaran.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); - dokumaran.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - dokumaran.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); dokumaran.setUseSelectLeaderToolOuput( JsonUtil.optBoolean(toolContentJSON, "useSelectLeaderToolOuput", Boolean.FALSE)); dokumaran.setAllowMultipleLeaders(JsonUtil.optBoolean(toolContentJSON, "allowMultipleLeaders", Boolean.FALSE)); Index: lams_tool_doku/web/pages/monitoring/summary5.jsp =================================================================== diff -u -r37b363449af76aa235b431c3746514f8fd8193f5 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_doku/web/pages/monitoring/summary5.jsp (.../summary5.jsp) (revision 37b363449af76aa235b431c3746514f8fd8193f5) +++ lams_tool_doku/web/pages/monitoring/summary5.jsp (.../summary5.jsp) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -645,14 +645,6 @@ -
    -
    - - <%@ include file="reflections.jsp"%> - -
    -
    -
    Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java (.../ForumService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -41,9 +41,6 @@ import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; @@ -144,8 +141,6 @@ private IUserManagementService userManagementService; - private ICoreNotebookService coreNotebookService; - private ForumOutputFactory forumOutputFactory; private IEventNotificationService eventNotificationService; @@ -524,9 +519,8 @@ @Override public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, - String searchString, boolean getNotebookEntries) { - return forumUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, - coreNotebookService, userManagementService); + String searchString) { + return forumUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, userManagementService); } @Override @@ -775,32 +769,9 @@ } return defaultForum; - } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } @@ -893,13 +864,6 @@ return; } - for (ForumToolSession session : (List) forumToolSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ForumConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } forumDao.delete(forum); } @@ -948,12 +912,6 @@ } } - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ForumConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - // hopefully it understands NotebookEntries - activityDAO.delete(entry); - } toolService.removeActivityMark(userId, session.getSessionId()); } @@ -1354,14 +1312,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - @Override public IEventNotificationService getEventNotificationService() { return eventNotificationService; @@ -1543,8 +1493,6 @@ JsonUtil.optBoolean(toolContentJSON, "notifyLearnersOnMarkRelease", Boolean.FALSE)); forum.setNotifyTeachersOnForumPosting( JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnForumPosting", Boolean.FALSE)); - forum.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - forum.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); // submissionDeadline is set in monitoring // *******************************Handle user******************* Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,6 +23,26 @@ package org.lamsfoundation.lams.tool.imageGallery.service; +import java.awt.image.BufferedImage; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeSet; + +import javax.imageio.ImageIO; +import javax.servlet.http.HttpServletRequest; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -35,9 +55,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; import org.lamsfoundation.lams.rating.model.RatingCriteria; @@ -59,7 +76,6 @@ import org.lamsfoundation.lams.tool.imageGallery.dao.ImageGalleryUserDAO; import org.lamsfoundation.lams.tool.imageGallery.dao.ImageVoteDAO; import org.lamsfoundation.lams.tool.imageGallery.dto.ImageGalleryAttachment; -import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO; import org.lamsfoundation.lams.tool.imageGallery.dto.Summary; import org.lamsfoundation.lams.tool.imageGallery.dto.UserImageContributionDTO; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallery; @@ -70,35 +86,13 @@ import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; import org.lamsfoundation.lams.tool.imageGallery.model.ImageVote; import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryItemComparator; -import org.lamsfoundation.lams.tool.imageGallery.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.imgscalr.ResizePictureUtil; -import javax.imageio.ImageIO; -import javax.servlet.http.HttpServletRequest; -import java.awt.image.BufferedImage; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeSet; - /** * @author Andrey Balan */ @@ -141,8 +135,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IRatingService ratingService; private IEventNotificationService eventNotificationService; @@ -322,28 +314,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public ItemRatingDTO getRatingCriteriaDtos(Long contentId, Long toolSessionId, Long imageUid, Long userId) { LinkedList itemIds = new LinkedList<>(); @@ -515,37 +485,6 @@ } @Override - public Map> getReflectList(Long contentId, boolean setEntry) { - Map> map = new HashMap<>(); - - List sessionList = imageGallerySessionDao.getByContentId(contentId); - for (ImageGallerySession session : sessionList) { - Long sessionId = session.getSessionId(); - boolean hasRefection = session.getImageGallery().isReflectOnActivity(); - Set list = new TreeSet<>(new ReflectDTOComparator()); - // get all users in this session - List users = imageGalleryUserDao.getBySessionID(sessionId); - for (ImageGalleryUser user : users) { - ReflectDTO ref = new ReflectDTO(user); - - if (setEntry) { - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - ImageGalleryConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ref.setReflect(entry.getEntry()); - } - } - - ref.setHasRefection(hasRefection); - list.add(ref); - } - map.put(sessionId, list); - } - - return map; - } - - @Override public void uploadImageGalleryItemFile(ImageGalleryItem image, File file) throws UploadImageGalleryFileException { ImageGalleryConfigItem mediumImageDimensionsKey = getConfigItem( @@ -938,14 +877,6 @@ return; } - for (ImageGallerySession session : imageGallerySessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ImageGalleryConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - imageGalleryDao.delete(imageGallery); } @@ -1007,12 +938,6 @@ user.setSessionFinished(false); imageGalleryUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(user.getSession().getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ImageGalleryConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - imageGalleryDao.removeObject(NotebookEntry.class, entry.getUid()); - } - imageGalleryUserDao.removeObject(ImageGalleryUser.class, user.getUid()); } } @@ -1152,14 +1077,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setRatingService(IRatingService ratingService) { this.ratingService = ratingService; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java (.../CommonCartridgeServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,6 +23,20 @@ package org.lamsfoundation.lams.tool.commonCartridge.service; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; @@ -34,9 +48,6 @@ import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.lesson.service.ILessonService; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -50,7 +61,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeItemVisitDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeSessionDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeUserDAO; -import org.lamsfoundation.lams.tool.commonCartridge.dto.ReflectDTO; import org.lamsfoundation.lams.tool.commonCartridge.dto.Summary; import org.lamsfoundation.lams.tool.commonCartridge.ims.SimpleCommonCartridgeConverter; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; @@ -59,7 +69,6 @@ import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeItemVisitLog; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeSession; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridgeUser; -import org.lamsfoundation.lams.tool.commonCartridge.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -71,22 +80,6 @@ import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; import org.springframework.web.multipart.MultipartFile; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeMap; -import java.util.TreeSet; - /** * @author Andrey Balan */ @@ -120,8 +113,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private ILessonService lessonService; @@ -342,37 +333,6 @@ } @Override - public Map> getReflectList(Long contentId, boolean setEntry) { - Map> map = new HashMap<>(); - - List sessionList = commonCartridgeSessionDao.getByContentId(contentId); - for (CommonCartridgeSession session : sessionList) { - Long sessionId = session.getSessionId(); - boolean hasRefection = session.getCommonCartridge().getReflectOnActivity(); - Set list = new TreeSet<>(new ReflectDTOComparator()); - // get all users in this session - List users = commonCartridgeUserDao.getBySessionID(sessionId); - for (CommonCartridgeUser user : users) { - ReflectDTO ref = new ReflectDTO(user); - - if (setEntry) { - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - CommonCartridgeConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ref.setReflect(entry.getEntry()); - } - } - - ref.setHasRefection(hasRefection); - list.add(ref); - } - map.put(sessionId, list); - } - - return map; - } - - @Override public List getUserListBySessionItem(Long sessionId, Long itemUid) { List logList = commonCartridgeItemVisitDao.getCommonCartridgeItemLogBySession( sessionId, itemUid); @@ -407,31 +367,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - /** - * @param notebookEntry - */ - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public CommonCartridgeUser getUser(Long uid) { return (CommonCartridgeUser) commonCartridgeUserDao.getObject(CommonCartridgeUser.class, uid); } @@ -727,13 +662,6 @@ return; } - for (CommonCartridgeSession session : commonCartridgeSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, CommonCartridgeConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } commonCartridgeDao.delete(commonCartridge); } @@ -791,12 +719,6 @@ user.setSessionFinished(false); commonCartridgeUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - CommonCartridgeConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - commonCartridgeDao.removeObject(NotebookEntry.class, entry.getUid()); - } - commonCartridgeUserDao.removeObject(CommonCartridgeUser.class, user.getUid()); } } @@ -934,10 +856,6 @@ this.userManagementService = userManagementService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - @Override public IEventNotificationService getEventNotificationService() { return eventNotificationService; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java (.../McService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -43,9 +43,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.qb.model.QbCollection; import org.lamsfoundation.lams.qb.model.QbOption; import org.lamsfoundation.lams.qb.model.QbQuestion; @@ -76,7 +73,6 @@ import org.lamsfoundation.lams.tool.mc.dto.McQuestionDTO; import org.lamsfoundation.lams.tool.mc.dto.McSessionMarkDTO; import org.lamsfoundation.lams.tool.mc.dto.McUserMarkDTO; -import org.lamsfoundation.lams.tool.mc.dto.ReflectionDTO; import org.lamsfoundation.lams.tool.mc.dto.SessionDTO; import org.lamsfoundation.lams.tool.mc.dto.ToolOutputDTO; import org.lamsfoundation.lams.tool.mc.model.McContent; @@ -148,7 +144,6 @@ private ILamsToolService toolService; private IToolContentHandler mcToolContentHandler = null; private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; private IQbService qbService; private MessageService messageService; @@ -1346,14 +1341,6 @@ return; } - for (McSession session : mcContent.getMcSessions()) { - List entries = coreNotebookService.getEntry(session.getMcSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, McAppConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - mcContentDAO.delete(mcContent); } @@ -1393,12 +1380,6 @@ } else { mcUsrAttemptDAO.removeAllUserAttempts(user.getUid()); - NotebookEntry entry = getEntry(session.getMcSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - McAppConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - mcContentDAO.delete(entry); - } - if ((session.getGroupLeader() != null) && session.getGroupLeader().getUid() .equals(user.getUid())) { session.setGroupLeader(null); @@ -1854,65 +1835,7 @@ this.mcOutputFactory = mcOutputFactory; } - @Override - public List getReflectionList(McContent mcContent, Long userID) { - List reflectionsContainerDTO = new LinkedList<>(); - for (McSession mcSession : mcContent.getMcSessions()) { - for (McQueUsr user : mcSession.getMcQueUsers()) { - // if all users mode or single user mode and found right user - if (userID == null || user.getQueUsrId().equals(userID)) { - NotebookEntry notebookEntry = this.getEntry(mcSession.getMcSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, McAppConstants.TOOL_SIGNATURE, - new Integer(user.getQueUsrId().toString())); - - if (notebookEntry != null) { - ReflectionDTO reflectionDTO = new ReflectionDTO(user, mcSession.getMcSessionId().toString(), - notebookEntry); - reflectionsContainerDTO.add(reflectionDTO); - } - } - } - } - return reflectionsContainerDTO; - } - - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - /** - * @return Returns the coreNotebookService. - */ - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - /** - * @param coreNotebookService - * The coreNotebookService to set. - */ - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - /** * @return Returns the logEventService. */ public ILogEventService getLogEventService() { @@ -2114,8 +2037,6 @@ mcq.setRetries(JsonUtil.optBoolean(toolContentJSON, "allowRetries", Boolean.FALSE)); mcq.setUseSelectLeaderToolOuput( JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE)); - mcq.setReflect(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - mcq.setReflectionSubject(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS, "")); mcq.setQuestionsSequenced(JsonUtil.optBoolean(toolContentJSON, "questionsSequenced", Boolean.FALSE)); mcq.setRandomize(JsonUtil.optBoolean(toolContentJSON, "randomize", Boolean.FALSE)); mcq.setShowReport(JsonUtil.optBoolean(toolContentJSON, "showReport", Boolean.FALSE)); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -36,9 +36,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.qb.model.QbQuestion; import org.lamsfoundation.lams.qb.service.IQbService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; @@ -114,7 +111,6 @@ private ILogEventService logEventService; private IExportToolContentService exportContentService; private QaOutputFactory qaOutputFactory; - private ICoreNotebookService coreNotebookService; private IRatingService ratingService; private IEventNotificationService eventNotificationService; private IQbService qbService; @@ -464,14 +460,6 @@ return; } - for (QaSession session : qaContent.getQaSessions()) { - List entries = coreNotebookService.getEntry(session.getQaSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, QaAppConstants.MY_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - qbService.removeAnswersByToolContentId(toolContentId); qaDAO.removeQa(toolContentId); @@ -508,26 +496,13 @@ } qaQueUsrDAO.deleteQaQueUsr(user); - - NotebookEntry entry = getEntry(session.getQaSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - QaAppConstants.MY_SIGNATURE, userId); - if (entry != null) { - qaDAO.delete(entry); - } } } } } } @Override - public List getUserReflectionsForTablesorter(Long toolSessionId, int page, int size, int sorting, - String searchString) { - return qaQueUsrDAO.getUserReflectionsForTablesorter(toolSessionId, page, size, sorting, searchString, - getCoreNotebookService()); - } - - @Override public int getCountUsersBySessionWithSearch(Long toolSessionId, String searchString) { return qaQueUsrDAO.getCountUsersBySessionWithSearch(toolSessionId, searchString); } @@ -966,22 +941,6 @@ } @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } @@ -1076,23 +1035,6 @@ this.qbService = qbService; } - // ========================================================================================= - - /** - * @return Returns the coreNotebookService. - */ - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - /** - * @param coreNotebookService - * The coreNotebookService to set. - */ - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setRatingService(IRatingService ratingService) { this.ratingService = ratingService; } @@ -1105,11 +1047,6 @@ this.messageService = messageService; } - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - public QaOutputFactory getQaOutputFactory() { return qaOutputFactory; } @@ -1255,8 +1192,6 @@ qa.setAllowRateAnswers(JsonUtil.optBoolean(toolContentJSON, "allowRateAnswers", Boolean.FALSE)); qa.setNotifyTeachersOnResponseSubmit( JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnResponseSubmit", Boolean.FALSE)); - qa.setReflect(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - qa.setReflectionSubject(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); qa.setQuestionsSequenced(JsonUtil.optBoolean(toolContentJSON, "questionsSequenced", Boolean.FALSE)); // submissionDeadline is set in monitoring Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java (.../ResourceServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,9 +23,25 @@ package org.lamsfoundation.lams.tool.rsrc.service; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.File; +import java.io.FileFilter; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeSet; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -38,9 +54,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.RatingException; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.model.LearnerItemRatingCriteria; @@ -63,7 +76,6 @@ import org.lamsfoundation.lams.tool.rsrc.dao.ResourceItemVisitDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceSessionDAO; import org.lamsfoundation.lams.tool.rsrc.dao.ResourceUserDAO; -import org.lamsfoundation.lams.tool.rsrc.dto.ReflectDTO; import org.lamsfoundation.lams.tool.rsrc.dto.ResourceItemDTO; import org.lamsfoundation.lams.tool.rsrc.dto.SessionDTO; import org.lamsfoundation.lams.tool.rsrc.dto.VisitLogDTO; @@ -84,25 +96,9 @@ import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; import org.lamsfoundation.lams.web.util.AttributeNames; -import java.io.File; -import java.io.FileFilter; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedHashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.SortedSet; -import java.util.TreeSet; +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * @author Dapeng.Ni @@ -135,8 +131,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private IRatingService ratingService; @@ -437,36 +431,6 @@ } @Override - public List getReflectList(Long contentId) { - List reflections = new LinkedList<>(); - - List sessionList = resourceSessionDao.getByContentId(contentId); - for (ResourceSession session : sessionList) { - Long sessionId = session.getSessionId(); - // get all users in this session - List users = resourceUserDao.getBySessionID(sessionId); - for (ResourceUser user : users) { - - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - ResourceConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ReflectDTO ref = new ReflectDTO(user); - ref.setReflect(entry.getEntry()); - Date postedDate = (entry.getLastModified() != null) - ? entry.getLastModified() - : entry.getCreateDate(); - ref.setDate(postedDate); - reflections.add(ref); - } - - } - - } - - return reflections; - } - - @Override public List getUserListBySessionItem(Long sessionId, Long itemUid) { List logList = resourceItemVisitDao.getResourceItemLogBySession(sessionId, itemUid); List userList = new ArrayList(logList.size()); @@ -526,28 +490,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public ResourceUser getUser(Long uid) { return (ResourceUser) resourceUserDao.getObject(ResourceUser.class, uid); } @@ -916,13 +858,6 @@ return; } - for (ResourceSession session : resourceSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ResourceConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } resourceDao.delete(resource); } @@ -978,12 +913,6 @@ user.setSessionFinished(false); resourceUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ResourceConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - resourceDao.removeObject(NotebookEntry.class, entry.getUid()); - } - resourceUserDao.removeObject(ResourceUser.class, user.getUid()); } } @@ -1158,14 +1087,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public IEventNotificationService getEventNotificationService() { return eventNotificationService; } @@ -1233,9 +1154,6 @@ resource.setMiniViewResourceNumber(JsonUtil.optInt(toolContentJSON, "minViewResourceNumber", 0)); resource.setNotifyTeachersOnAssigmentSumbit( JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnAssigmentSubmit", Boolean.FALSE)); - resource.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - resource.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); resource.setContentInUse(false); resource.setDefineLater(false); Index: lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java (.../LeaderselectionService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,16 +23,18 @@ package org.lamsfoundation.lams.tool.leaderselection.service; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.List; +import java.util.SortedMap; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -56,11 +58,7 @@ import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.JsonUtil; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.SortedMap; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * An implementation of the ILeaderselectionService interface. @@ -85,8 +83,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private LeaderselectionOutputFactory leaderselectionOutputFactory; /* ************ Methods from ToolSessionManager ************* */ @@ -204,13 +200,6 @@ logger.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); return; } - for (LeaderselectionSession session : content.getLeaderselectionSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, LeaderselectionConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } leaderselectionDAO.delete(content); } @@ -367,21 +356,6 @@ } @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long uid) { - return coreNotebookService.getEntry(uid); - } - - @Override - public void updateEntry(Long uid, String entry) { - coreNotebookService.updateEntry(uid, "", entry); - } - - @Override public Long getDefaultContentIdBySignature(String toolSignature) { long toolContentId = toolService.getToolDefaultContentIdBySignature(toolSignature); if (toolContentId == 0) { @@ -553,14 +527,6 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public LeaderselectionOutputFactory getLeaderselectionOutputFactory() { return leaderselectionOutputFactory; } Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java (.../MindmapService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,11 +23,18 @@ package org.lamsfoundation.lams.tool.mindmap.service; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; -import com.thoughtworks.xstream.XStream; -import com.thoughtworks.xstream.io.xml.StaxDriver; -import com.thoughtworks.xstream.security.AnyTypePermission; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; @@ -36,9 +43,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria; @@ -79,17 +83,11 @@ import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import java.io.IOException; -import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.function.Function; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; +import com.thoughtworks.xstream.XStream; +import com.thoughtworks.xstream.io.xml.StaxDriver; +import com.thoughtworks.xstream.security.AnyTypePermission; /** * An implementation of the IMindmapService interface. As a requirement, all LAMS tool's service bean must implement @@ -111,7 +109,6 @@ private IToolContentHandler mindmapToolContentHandler = null; private ILogEventService logEventService = null; private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; private ILearnerService learnerService; private IRatingService ratingService; private MindmapOutputFactory mindmapOutputFactory; @@ -425,14 +422,6 @@ return; } - for (MindmapSession session : mindmap.getMindmapSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, MindmapConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - mindmapDAO.delete(mindmap); } @@ -482,11 +471,6 @@ MindmapUser user = mindmapUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId()); if (user != null) { if (!resetActivityCompletionOnly) { - if (user.getEntryUID() != null) { - NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID()); - mindmapDAO.delete(entry); - } - user.setEntryUID(null); } user.setFinishedActivity(false); @@ -653,29 +637,7 @@ return false; } - /* IMindmapService Methods */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long uid) { - return coreNotebookService.getEntry(uid); - } - - @Override - public void updateEntry(Long uid, String entry) { - coreNotebookService.updateEntry(uid, "", entry); - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); @@ -861,14 +823,6 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public MindmapOutputFactory getMindmapOutputFactory() { return mindmapOutputFactory; } @@ -1051,8 +1005,6 @@ content.setInstructions(JsonUtil.optString(toolContentJSON, RestTags.INSTRUCTIONS)); content.setContentInUse(false); content.setDefineLater(false); - content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); content.setMultiUserMode(JsonUtil.optBoolean(toolContentJSON, "multiUserMode", Boolean.FALSE)); Index: lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java =================================================================== diff -u -r6cd828445d4549e4d114c5333628d812233f0f7a -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision 6cd828445d4549e4d114c5333628d812233f0f7a) +++ lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/controller/LearningController.java (.../LearningController.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -37,8 +37,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; @@ -151,7 +149,6 @@ MindmapDTO mindmapDTO = new MindmapDTO(mindmap); request.setAttribute("mindmapDTO", mindmapDTO); - request.setAttribute("reflectOnActivity", mindmap.isReflectOnActivity()); LearningController.storeMindmapCanvasParameters(mindmap, toolSessionID, mindmapUser, mode.toString(), !(mode.equals(ToolAccessMode.TEACHER) || (mindmap.isLockOnFinished() @@ -551,45 +548,6 @@ } /** - * Saving Mindmap nodes and proceed to reflection. - */ - @RequestMapping("/reflect") - public String reflect(@ModelAttribute LearningForm learningForm, HttpServletRequest request, - HttpServletResponse response) throws IOException { - - Long userId = WebUtil.readLongParam(request, "userUid", false); - Long toolContentId = WebUtil.readLongParam(request, "toolContentId", false); - - MindmapUser mindmapUser = mindmapService.getUserByUID(userId); - Mindmap mindmap = mindmapService.getMindmapByContentId(toolContentId); - MindmapSession mindmapSession = mindmapUser.getMindmapSession(); - - request.setAttribute("reflectTitle", mindmap.getTitle()); - request.setAttribute("reflectInstructions", mindmap.getReflectInstructions()); - - if (mindmap.isLockOnFinished() && mindmapUser.isFinishedActivity()) { - request.setAttribute("contentEditable", false); - } else { - request.setAttribute("contentEditable", true); - } - - // Saving Mindmap Nodes - if (!mindmap.isMultiUserMode() && !StringUtils.isBlank(learningForm.getMindmapContent())) { - saveMapJsJSON(mindmap, mindmapUser, learningForm.getMindmapContent(), mindmapSession); - } - - // Reflection - NotebookEntry entry = mindmapService.getEntry(mindmapUser.getEntryUID()); - if (entry != null) { - learningForm.setEntryText(entry.getEntry()); - } - - request.setAttribute(AttributeNames.ATTR_IS_LAST_ACTIVITY, - mindmapService.isLastActivity(mindmapSession.getSessionId())); - return "pages/learning/reflect"; - } - - /** * Finish Mindmap Activity and save reflection if appropriate. */ @RequestMapping("/finishActivity") @@ -611,31 +569,11 @@ if (mindmapUser != null) { if (!contentLocked) { - mindmapUser.setFinishedActivity(true); mindmapService.saveOrUpdateMindmapUser(mindmapUser); - // save the reflection entry and call the notebook. - if (mindmap.isReflectOnActivity()) { - // check for existing notebook entry - NotebookEntry entry = mindmapService.getEntry(mindmapUser.getEntryUID()); - if (entry == null) { - // create new entry - Long entryUID = mindmapService.createNotebookEntry(toolSessionID, - CoreNotebookConstants.NOTEBOOK_TOOL, MindmapConstants.TOOL_SIGNATURE, - mindmapUser.getUserId().intValue(), learningForm.getEntryText()); - mindmapUser.setEntryUID(entryUID); - mindmapService.saveOrUpdateMindmapUser(mindmapUser); - } else { - // update existing entry - entry.setEntry(learningForm.getEntryText()); - entry.setLastModified(new Date()); - mindmapService.updateEntry(entry); - } - } else { - if (!mindmap.isMultiUserMode() && !StringUtils.isBlank(learningForm.getMindmapContent())) { - saveMapJsJSON(mindmap, mindmapUser, learningForm.getMindmapContent(), mindmapSession); - } + if (!mindmap.isMultiUserMode() && !StringUtils.isBlank(learningForm.getMindmapContent())) { + saveMapJsJSON(mindmap, mindmapUser, learningForm.getMindmapContent(), mindmapSession); } } Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java (.../NoticeboardService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java (.../NoticeboardService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -32,9 +32,6 @@ import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -77,8 +74,6 @@ private ILamsToolService toolService; private IExportToolContentService exportContentService; private IToolContentHandler nbToolContentHandler; - private ICoreNotebookService coreNotebookService; - private INoticeboardContentDAO nbContentDAO; private INoticeboardSessionDAO nbSessionDAO; private INoticeboardUserDAO nbUserDAO; @@ -338,14 +333,6 @@ return; } - for (NoticeboardSession session : nbContent.getNbSessions()) { - List entries = coreNotebookService.getEntry(session.getNbSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, NoticeboardConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - removeNoticeboard(toolContentId); } @@ -374,12 +361,6 @@ user.setUserStatus(NoticeboardUser.INCOMPLETE); nbUserDAO.updateNbUser(user); } else { - NotebookEntry entry = getEntry(session.getNbSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - NoticeboardConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - nbContentDAO.delete(entry); - } - nbUserDAO.delete(user); } } @@ -604,37 +585,7 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - /* =============== Wrappers Methods for Notebook Service (Reflective Option) =============== */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return null; } @@ -662,9 +613,6 @@ noticeboard.setNbContentId(toolContentID); noticeboard.setTitle(JsonUtil.optString(toolContentJSON, RestTags.TITLE)); noticeboard.setContent(JsonUtil.optString(toolContentJSON, "content")); - noticeboard.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - noticeboard.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); noticeboard.setCreatorUserId(userID.longValue()); noticeboard.setDateCreated(updateDate); Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java (.../NotebookService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -32,9 +32,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -93,8 +90,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private IUserManagementService userManagementService; @@ -226,14 +221,6 @@ return; } - for (NotebookSession session : notebook.getNotebookSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, NotebookConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - notebookDAO.delete(notebook); } @@ -266,11 +253,6 @@ user.setFinishedActivity(false); saveOrUpdateNotebookUser(user); } else { - if (user.getEntryUID() != null) { - NotebookEntry entry = coreNotebookService.getEntry(user.getEntryUID()); - notebookDAO.delete(entry); - } - notebookUserDAO.delete(user); } } @@ -387,18 +369,9 @@ // learningForm.getContentEditable() will be null if the deadline has passed if (isContentEditable != null && isContentEditable) { - // TODO fix idType to use real value not 999 - if (notebookUser.getEntryUID() == null) { - Long entryUID = coreNotebookService.createNotebookEntry(toolSessionId, - CoreNotebookConstants.NOTEBOOK_TOOL, NotebookConstants.TOOL_SIGNATURE, - notebookUser.getUserId().intValue(), "", entryText); - notebookUser.setEntryUID(entryUID); - - } else { - // update existing entry. - coreNotebookService.updateEntry(notebookUser.getEntryUID(), "", entryText); - } - + // save the entry + notebookUser.setNotebookEntry(entryText); + notebookUser.setNotebookEntryModifiedDate(new Date()); notebookUser.setFinishedActivity(true); saveOrUpdateNotebookUser(notebookUser); } @@ -407,11 +380,6 @@ } @Override - public NotebookEntry getEntry(Long uid) { - return coreNotebookService.getEntry(uid); - } - - @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = toolService.getToolDefaultContentIdBySignature(toolSignature); if (toolContentId == null) { @@ -521,8 +489,7 @@ @Override public List getUsersEntriesDates(final Long sessionId, Integer page, Integer size, int sorting, String searchString) { - return notebookUserDAO.getUsersEntriesDates(sessionId, page, size, sorting, searchString, coreNotebookService, - userManagementService); + return notebookUserDAO.getUsersEntriesDates(sessionId, page, size, sorting, searchString, userManagementService); } @Override @@ -602,14 +569,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setEventNotificationService(IEventNotificationService eventNotificationService) { this.eventNotificationService = eventNotificationService; } Index: lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java (.../PixlrService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -30,9 +30,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -92,8 +89,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private PixlrOutputFactory pixlrOutputFactory; private IPixlrConfigItemDAO pixlrConfigItemDAO; @@ -273,14 +268,6 @@ return; } - for (PixlrSession session : pixlr.getPixlrSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, PixlrConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - pixlrDAO.delete(pixlr); } @@ -304,12 +291,6 @@ user.setFinishedActivity(false); pixlrUserDAO.saveOrUpdate(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - PixlrConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - pixlrDAO.delete(entry); - } - pixlrUserDAO.delete(user); } } @@ -471,31 +452,7 @@ } /* ********** IPixlrService Methods ********************************* */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - /** - * @param notebookEntry - */ - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public Long getDefaultContentIdBySignature(String toolSignature) { Long toolContentId = null; toolContentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); @@ -674,14 +631,6 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public PixlrOutputFactory getPixlrOutputFactory() { return pixlrOutputFactory; } Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java (.../PeerreviewServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,8 +23,29 @@ package org.lamsfoundation.lams.tool.peerreview.service; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.text.NumberFormat; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.SortedSet; +import java.util.TreeMap; +import java.util.TreeSet; +import java.util.function.Function; +import java.util.stream.Collectors; + +import javax.servlet.http.HttpServletRequest; + import org.apache.log4j.Logger; import org.hibernate.Hibernate; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -33,9 +54,6 @@ import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.dto.StyledCriteriaRatingDTO; import org.lamsfoundation.lams.rating.dto.StyledRatingDTO; @@ -46,7 +64,12 @@ import org.lamsfoundation.lams.rating.service.IRatingService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; -import org.lamsfoundation.lams.tool.*; +import org.lamsfoundation.lams.tool.ToolCompletionStatus; +import org.lamsfoundation.lams.tool.ToolContentManager; +import org.lamsfoundation.lams.tool.ToolOutput; +import org.lamsfoundation.lams.tool.ToolOutputDefinition; +import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; +import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants; @@ -71,11 +94,8 @@ import org.lamsfoundation.lams.web.util.SessionMap; import org.springframework.web.util.HtmlUtils; -import javax.servlet.http.HttpServletRequest; -import java.text.NumberFormat; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * @author Andrey Balan @@ -105,8 +125,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IRatingService ratingService; private IEventNotificationService eventNotificationService; @@ -252,28 +270,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public PeerreviewUser getUser(Long uid) { return peerreviewUserDao.find(PeerreviewUser.class, uid); } @@ -454,20 +450,6 @@ } @Override - public List getUserNotebookEntriesForTablesorter(Long toolSessionId, int page, int size, int sorting, - String searchString) { - List rawData = peerreviewUserDao.getUserNotebookEntriesForTablesorter(toolSessionId, page, size, - sorting, searchString, coreNotebookService, userManagementService); - - for (Object[] raw : rawData) { - StringBuilder description = new StringBuilder((String) raw[1]).append(" ").append((String) raw[2]); - raw[2] = HtmlUtils.htmlEscape(description.toString()); - } - - return rawData; - } - - @Override public List getPagedUsers(Long toolSessionId, Integer page, Integer size, int sorting, String searchString) { return peerreviewUserDao.getPagedUsers(toolSessionId, page, size, sorting, searchString); @@ -891,14 +873,6 @@ return; } - for (PeerreviewSession session : peerreviewSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, PeerreviewConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - peerreviewDao.delete(peerreview); } @@ -933,12 +907,6 @@ user.setSessionFinished(false); peerreviewUserDao.update(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - PeerreviewConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - peerreviewDao.deleteById(NotebookEntry.class, entry.getUid()); - } - peerreviewUserDao.delete(user); } } @@ -1157,10 +1125,6 @@ this.userManagementService = userManagementService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setRatingService(IRatingService ratingService) { this.ratingService = ratingService; } @@ -1203,9 +1167,6 @@ peerreview.setLockWhenFinished( JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); - peerreview.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - peerreview.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); peerreview.setContentInUse(false); peerreview.setDefineLater(false); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -39,9 +39,6 @@ import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.LogEvent; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -120,8 +117,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IUserManagementService userManagementService; private ILearnerService learnerService; @@ -153,28 +148,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (toContentId == null) { throw new ToolException("Failed to create the SubmitFiles tool seession"); @@ -210,14 +183,6 @@ return; } - for (SubmitFilesSession session : submitFilesSessionDAO.getSubmitFilesSessionByContentID(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionID(), - CoreNotebookConstants.NOTEBOOK_TOOL, SbmtConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - submitFilesContentDAO.delete(submitFilesContent); } @@ -248,12 +213,6 @@ user.setFinished(false); submitUserDAO.update(user); } else { - NotebookEntry entry = getEntry(session.getSessionID(), CoreNotebookConstants.NOTEBOOK_TOOL, - SbmtConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - submitFilesContentDAO.delete(entry); - } - toolService.removeActivityMark(user.getUserID(), session.getSessionID()); if (session.getGroupLeader() != null && session.getGroupLeader().getUid() == user.getUid()) { @@ -1140,9 +1099,8 @@ @Override public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, - String searchString, boolean getNotebookEntries) { - return submitUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, getNotebookEntries, - coreNotebookService, userManagementService); + String searchString) { + return submitUserDAO.getUsersForTablesorter(sessionId, page, size, sorting, searchString, userManagementService); } @Override @@ -1267,10 +1225,6 @@ this.exportContentService = exportContentService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setUserManagementService(IUserManagementService userManagementService) { this.userManagementService = userManagementService; } @@ -1365,8 +1319,6 @@ content.setDefineLater(false); content.setNotifyTeachersOnFileSubmit( JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnFileSubmit", Boolean.FALSE)); - content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); content.setLimitUpload(JsonUtil.optBoolean(toolContentJSON, "limitUpload", Boolean.FALSE)); content.setUseSelectLeaderToolOuput( Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -43,9 +43,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.outcome.Outcome; import org.lamsfoundation.lams.outcome.OutcomeMapping; import org.lamsfoundation.lams.outcome.service.IOutcomeService; @@ -79,7 +76,6 @@ import org.lamsfoundation.lams.tool.scratchie.dto.GroupSummary; import org.lamsfoundation.lams.tool.scratchie.dto.LeaderResultsDTO; import org.lamsfoundation.lams.tool.scratchie.dto.OptionDTO; -import org.lamsfoundation.lams.tool.scratchie.dto.ReflectDTO; import org.lamsfoundation.lams.tool.scratchie.dto.ScratchieItemDTO; import org.lamsfoundation.lams.tool.scratchie.model.Scratchie; import org.lamsfoundation.lams.tool.scratchie.model.ScratchieAnswerVisitLog; @@ -167,8 +163,6 @@ private ILogEventService logEventService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private IQbService qbService; @@ -1423,59 +1417,6 @@ } @Override - public List getReflectionList(Long contentId) { - ArrayList reflections = new ArrayList<>(); - - // get all available leaders associated with this content as only leaders have reflections - List sessionList = scratchieSessionDao.getByContentId(contentId); - for (ScratchieSession session : sessionList) { - - ScratchieUser leader = session.getGroupLeader(); - if (leader != null) { - NotebookEntry notebookEntry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ScratchieConstants.TOOL_SIGNATURE, leader.getUserId().intValue()); - if ((notebookEntry != null) && StringUtils.isNotBlank(notebookEntry.getEntry())) { - User user = new User(); - user.setLastName(leader.getLastName()); - user.setFirstName(leader.getFirstName()); - ReflectDTO reflectDTO = new ReflectDTO(user); - reflectDTO.setGroupName(session.getSessionName()); - String reflection = notebookEntry.getEntry(); - reflection = StringEscapeUtils.escapeJavaScript(reflection); - reflectDTO.setReflection(reflection); - reflectDTO.setIsGroupLeader(session.isUserGroupLeader(leader.getUid())); - - reflections.add(reflectDTO); - } - } - } - - return reflections; - } - - @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public ScratchieUser getUser(Long uid) { return (ScratchieUser) scratchieUserDao.getObject(ScratchieUser.class, uid); } @@ -2826,14 +2767,6 @@ return; } - for (ScratchieSession session : scratchieSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ScratchieConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - scratchieDao.delete(scratchie); } @@ -2864,13 +2797,6 @@ scratchieSessionDao.update(session); } } else { - - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ScratchieConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - scratchieDao.removeObject(NotebookEntry.class, entry.getUid()); - } - if ((session.getGroupLeader() != null) && session.getGroupLeader().getUid().equals(user.getUid())) { session.setGroupLeader(null); session.setScratchingFinished(false); @@ -3010,10 +2936,6 @@ this.userManagementService = userManagementService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - @Override public IEventNotificationService getEventNotificationService() { return eventNotificationService; @@ -3095,9 +3017,6 @@ scratchie.setDiscussionSentimentEnabled( JsonUtil.optBoolean(toolContentJSON, RestTags.ENABLE_DISCUSSION_SENTIMENT, false)); scratchie.setRelativeTimeLimit(JsonUtil.optInt(toolContentJSON, "timeLimit", 0)); - scratchie.setReflectOnActivity( - JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - scratchie.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); scratchie.setShowScrachiesInResults(JsonUtil.optBoolean(toolContentJSON, "showScrachiesInResults", true)); scratchie.setConfidenceLevelsActivityUiid( JsonUtil.optInt(toolContentJSON, RestTags.CONFIDENCE_LEVELS_ACTIVITY_UIID)); Index: lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java (.../ScribeService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -32,9 +32,6 @@ import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -94,8 +91,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - public ScribeService() { super(); } @@ -221,14 +216,6 @@ return; } - for (ScribeSession session : (Set) scribe.getScribeSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, ScribeConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - scribeDAO.delete(scribe); } @@ -285,13 +272,6 @@ } } } - if (!resetActivityCompletionOnly) { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - ScribeConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - scribeDAO.delete(entry); - } - } } } @@ -603,30 +583,6 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - // ========================================================================================= public void setScribeHeadingDAO(IScribeHeadingDAO scribeHeadingDAO) { @@ -681,8 +637,6 @@ scribe.setAutoSelectScribe(JsonUtil.optBoolean(toolContentJSON, "autoSelectScribe", Boolean.FALSE)); scribe.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); - scribe.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - scribe.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); scribe.setShowAggregatedReports(JsonUtil.optBoolean(toolContentJSON, "showAggregatedReports", Boolean.FALSE)); if (scribe.getScribeHeadings() == null) { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,15 +23,18 @@ package org.lamsfoundation.lams.tool.spreadsheet.service; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.SortedMap; +import java.util.TreeMap; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -45,30 +48,18 @@ import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetSessionDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetUserDAO; -import org.lamsfoundation.lams.tool.spreadsheet.dto.ReflectDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary; import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetMark; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet; -import org.lamsfoundation.lams.tool.spreadsheet.util.ReflectDTOComparator; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.TreeSet; - /** * @author Andrey Balan */ @@ -84,7 +75,6 @@ private ILamsToolService toolService; private IUserManagementService userManagementService; private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; // ******************************************************************************* // Service method @@ -200,10 +190,8 @@ } @Override - public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, - String searchString, boolean getNotebookEntries) { - return spreadsheetUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, - getNotebookEntries, coreNotebookService, userManagementService); + public List getUsersForTablesorter(final Long sessionId, int page, int size, int sorting, String searchString) { + return spreadsheetUserDao.getUsersForTablesorter(sessionId, page, size, sorting, searchString, userManagementService); } @Override @@ -239,59 +227,6 @@ } @Override - public Map> getReflectList(Long contentId, boolean setEntry) { - Map> map = new HashMap>(); - - List sessionList = spreadsheetSessionDao.getByContentId(contentId); - for (SpreadsheetSession session : sessionList) { - Long sessionId = session.getSessionId(); - boolean hasRefection = session.getSpreadsheet().isReflectOnActivity(); - Set list = new TreeSet(new ReflectDTOComparator()); - // get all users in this session - List users = spreadsheetUserDao.getBySessionID(sessionId); - for (SpreadsheetUser user : users) { - ReflectDTO ref = new ReflectDTO(user); - - if (setEntry) { - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - SpreadsheetConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ref.setReflect(entry.getEntry()); - } - } - - ref.setHasRefection(hasRefection); - list.add(ref); - } - map.put(sessionId, list); - } - - return map; - } - - @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public SpreadsheetUser getUser(Long uid) { return (SpreadsheetUser) spreadsheetUserDao.getObject(SpreadsheetUser.class, uid); } @@ -528,12 +463,6 @@ spreadsheetDao.removeObject(UserModifiedSpreadsheet.class, modified.getUid()); } } - - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, SpreadsheetConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } } spreadsheetDao.delete(spreadsheet); } @@ -564,12 +493,6 @@ user.getUserModifiedSpreadsheet().getUid()); } - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - SpreadsheetConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - spreadsheetDao.removeObject(NotebookEntry.class, entry.getUid()); - } - spreadsheetUserDao.removeObject(SpreadsheetUser.class, user.getUid()); } } @@ -676,14 +599,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - @Override public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) { return null; Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java (.../SurveyServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,18 +23,26 @@ package org.lamsfoundation.lams.tool.survey.service; -import com.fasterxml.jackson.databind.node.ArrayNode; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.SortedMap; +import java.util.TreeMap; + import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -53,7 +61,6 @@ import org.lamsfoundation.lams.tool.survey.dao.SurveySessionDAO; import org.lamsfoundation.lams.tool.survey.dao.SurveyUserDAO; import org.lamsfoundation.lams.tool.survey.dto.AnswerDTO; -import org.lamsfoundation.lams.tool.survey.dto.ReflectDTO; import org.lamsfoundation.lams.tool.survey.model.Survey; import org.lamsfoundation.lams.tool.survey.model.SurveyAnswer; import org.lamsfoundation.lams.tool.survey.model.SurveyCondition; @@ -62,7 +69,6 @@ import org.lamsfoundation.lams.tool.survey.model.SurveySession; import org.lamsfoundation.lams.tool.survey.model.SurveyUser; import org.lamsfoundation.lams.tool.survey.util.QuestionsComparator; -import org.lamsfoundation.lams.tool.survey.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.survey.util.SurveySessionComparator; import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils; import org.lamsfoundation.lams.usermanagement.User; @@ -71,19 +77,8 @@ import org.lamsfoundation.lams.util.JsonUtil; import org.lamsfoundation.lams.util.MessageService; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.TreeSet; +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.ObjectNode; /** * @author Dapeng.Ni @@ -115,8 +110,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private IEventNotificationService eventNotificationService; private SurveyOutputFactory surveyOutputFactory; @@ -221,66 +214,6 @@ } @Override - public Map> getReflectList(Long contentId, boolean setEntry) { - Map> map = new HashMap<>(); - - List sessionList = surveySessionDao.getByContentId(contentId); - for (SurveySession session : sessionList) { - Long sessionId = session.getSessionId(); - boolean hasRefection = session.getSurvey().isReflectOnActivity(); - Set list = new TreeSet<>(new ReflectDTOComparator()); - // get all users in this session - List users = surveyUserDao.getBySessionID(sessionId); - for (SurveyUser user : users) { - ReflectDTO ref = new ReflectDTO(user); - - if (setEntry) { - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - SurveyConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ref.setReflect(entry.getEntry()); - } - } - - ref.setHasRefection(hasRefection); - list.add(ref); - } - map.put(sessionId, list); - } - - return map; - } - - @Override - public List getUserReflectionsForTablesorter(final Long sessionId, int page, int size, int sorting, - String searchString) { - return surveyUserDao.getUserReflectionsForTablesorter(sessionId, page, size, sorting, searchString, - coreNotebookService, userManagementService); - } - - @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public SurveyUser getUser(Long uid) { return (SurveyUser) surveyUserDao.getObject(SurveyUser.class, uid); } @@ -765,13 +698,6 @@ return; } - for (SurveySession session : surveySessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, SurveyConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } surveyDao.delete(survey); } @@ -801,12 +727,6 @@ user.setSessionFinished(false); surveyUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - SurveyConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - surveyDao.removeObject(NotebookEntry.class, entry.getUid()); - } - surveyUserDao.removeObject(SurveyUser.class, user.getUid()); } } @@ -931,14 +851,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public void setSurveyAnswerDao(SurveyAnswerDAO surveyAnswerDao) { this.surveyAnswerDao = surveyAnswerDao; } @@ -1007,8 +919,6 @@ survey.setContentInUse(false); survey.setDefineLater(false); survey.setLockWhenFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.TRUE)); - survey.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - survey.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); survey.setNotifyTeachersOnAnswerSumbit( JsonUtil.optBoolean(toolContentJSON, "notifyTeachersOnAnswerSumbit", Boolean.FALSE)); survey.setShowOnePage(JsonUtil.optBoolean(toolContentJSON, "showOnePage", Boolean.TRUE)); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,6 +23,19 @@ package org.lamsfoundation.lams.tool.taskList.service; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.sql.Timestamp; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Set; +import java.util.SortedMap; + import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO; @@ -33,9 +46,6 @@ import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -51,7 +61,6 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO; -import org.lamsfoundation.lams.tool.taskList.dto.ReflectDTO; import org.lamsfoundation.lams.tool.taskList.dto.SessionDTO; import org.lamsfoundation.lams.tool.taskList.dto.TaskListUserDTO; import org.lamsfoundation.lams.tool.taskList.model.TaskList; @@ -67,20 +76,6 @@ import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Date; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.SortedMap; - /** * Class implements org.lamsfoundation.lams.tool.taskList.service.ITaskListService. * @@ -102,7 +97,6 @@ private ILamsToolService toolService; private IUserManagementService userManagementService; private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; // ******************************************************************************* // Methods implements ITaskListService. @@ -351,45 +345,6 @@ } @Override - public NotebookEntry getEntry(Long sessionId, Integer userId) { - List list = coreNotebookService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - TaskListConstants.TOOL_SIGNATURE, userId); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public List getReflectList(Long contentId) { - List reflectList = new LinkedList<>(); - - List sessionList = taskListSessionDao.getByContentId(contentId); - for (TaskListSession session : sessionList) { - Long sessionId = session.getSessionId(); - // get all users in this session - List users = taskListUserDao.getBySessionID(sessionId); - for (TaskListUser user : users) { - - NotebookEntry entry = getEntry(sessionId, user.getUserId().intValue()); - if (entry != null) { - ReflectDTO ref = new ReflectDTO(user); - ref.setReflect(entry.getEntry()); - Date postedDate = (entry.getLastModified() != null) - ? entry.getLastModified() - : entry.getCreateDate(); - ref.setDate(postedDate); - reflectList.add(ref); - } - - } - } - - return reflectList; - } - - @Override public int getNumTasksCompletedByUser(Long toolSessionId, Long userId) { return getTaskListItemVisitDao().getCountCompletedTasksByUser(toolSessionId, userId); } @@ -449,28 +404,6 @@ } @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public boolean isGroupedActivity(long toolContentID) { return toolService.isGroupedActivity(toolContentID); } @@ -556,14 +489,6 @@ this.userManagementService = userManagementService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - @Override public MessageService getMessageService() { return messageService; @@ -725,14 +650,6 @@ return; } - for (TaskListSession session : taskListSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, TaskListConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - taskListDao.delete(taskList); } @@ -804,12 +721,6 @@ user.setSessionFinished(false); taskListUserDao.saveObject(user); } else { - NotebookEntry entry = getEntry(user.getSession().getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, TaskListConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - taskListDao.removeObject(NotebookEntry.class, entry.getUid()); - } - taskListUserDao.removeObject(TaskListUser.class, user.getUid()); } } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -36,9 +36,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.logevent.service.ILogEventService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.SimpleURL; @@ -59,7 +56,6 @@ import org.lamsfoundation.lams.tool.vote.dao.IVoteUserDAO; import org.lamsfoundation.lams.tool.vote.dao.IVoteUsrAttemptDAO; import org.lamsfoundation.lams.tool.vote.dto.OpenTextAnswerDTO; -import org.lamsfoundation.lams.tool.vote.dto.ReflectionDTO; import org.lamsfoundation.lams.tool.vote.dto.SessionDTO; import org.lamsfoundation.lams.tool.vote.dto.SessionNominationDTO; import org.lamsfoundation.lams.tool.vote.dto.SummarySessionDTO; @@ -126,7 +122,6 @@ private ILogEventService logEventService; private ILamsToolService toolService; private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; private IToolContentHandler voteToolContentHandler = null; private VoteOutputFactory voteOutputFactory; private IDataFlowDAO dataFlowDAO; @@ -711,63 +706,6 @@ } @Override - public List getReflectionData(VoteContent voteContent, Long userID) { - List reflectionsContainerDTO = new LinkedList<>(); - - if (userID == null) { - for (Iterator sessionIter = voteContent.getVoteSessions() - .iterator(); sessionIter.hasNext(); ) { - VoteSession voteSession = sessionIter.next(); - - for (Iterator userIter = voteSession.getVoteQueUsers().iterator(); userIter.hasNext(); ) { - VoteQueUsr user = userIter.next(); - - NotebookEntry notebookEntry = this.getEntry(voteSession.getVoteSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, VoteAppConstants.MY_SIGNATURE, - new Integer(user.getQueUsrId().toString())); - - if (notebookEntry != null) { - ReflectionDTO reflectionDTO = new ReflectionDTO(); - reflectionDTO.setUserId(user.getQueUsrId().toString()); - reflectionDTO.setSessionId(voteSession.getVoteSessionId().toString()); - reflectionDTO.setUserName(user.getFullname()); - reflectionDTO.setReflectionUid(notebookEntry.getUid().toString()); - // String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry()); - reflectionDTO.setEntry(notebookEntry.getEntry()); - reflectionsContainerDTO.add(reflectionDTO); - } - } - } - } else { - for (Iterator sessionIter = voteContent.getVoteSessions() - .iterator(); sessionIter.hasNext(); ) { - VoteSession voteSession = sessionIter.next(); - for (Iterator userIter = voteSession.getVoteQueUsers().iterator(); userIter.hasNext(); ) { - VoteQueUsr user = userIter.next(); - if (user.getQueUsrId().equals(userID)) { - NotebookEntry notebookEntry = this.getEntry(voteSession.getVoteSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, VoteAppConstants.MY_SIGNATURE, - new Integer(user.getQueUsrId().toString())); - - if (notebookEntry != null) { - ReflectionDTO reflectionDTO = new ReflectionDTO(); - reflectionDTO.setUserId(user.getQueUsrId().toString()); - reflectionDTO.setSessionId(voteSession.getVoteSessionId().toString()); - reflectionDTO.setUserName(user.getFullname()); - reflectionDTO.setReflectionUid(notebookEntry.getUid().toString()); - // String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry()); - reflectionDTO.setEntry(notebookEntry.getEntry()); - reflectionsContainerDTO.add(reflectionDTO); - } - } - } - } - } - - return reflectionsContainerDTO; - } - - @Override public VoteContent getVoteContent(Long toolContentID) { return voteContentDAO.getVoteContentByContentId(toolContentID); } @@ -1369,14 +1307,6 @@ return; } - for (VoteSession session : voteContent.getVoteSessions()) { - List entries = coreNotebookService.getEntry(session.getVoteSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, VoteAppConstants.MY_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - voteContentDAO.delete(voteContent); } @@ -1407,12 +1337,6 @@ } else { voteUsrAttemptDAO.removeAttemptsForUserandSession(user.getUid(), session.getUid()); - NotebookEntry entry = getEntry(session.getVoteSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - VoteAppConstants.MY_SIGNATURE, userId); - if (entry != null) { - voteContentDAO.delete(entry); - } - voteUserDAO.removeVoteUser(user); } } @@ -1710,33 +1634,10 @@ // we need to make sure specified user has the same scratches as a leader copyAnswersFromLeader(voteUser, groupLeader); } - } - } @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - @Override - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - - List list = coreNotebookService.getEntry(id, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public List getAllQuestionsSorted(final long voteContentId) { return voteQueContentDAO.getAllQuestionsSorted(voteContentId); } @@ -1762,13 +1663,6 @@ } @Override - public List getUserReflectionsForTablesorter(Long sessionUid, int page, int size, int sorting, - String searchString) { - return voteUsrAttemptDAO.getUserReflectionsForTablesorter(sessionUid, page, size, sorting, searchString, - getCoreNotebookService(), userManagementService); - } - - @Override public List getStatisticsBySession(Long toolContentId) { List stats = voteUsrAttemptDAO.getStatisticsBySession(toolContentId); @@ -1932,21 +1826,6 @@ this.exportContentService = exportContentService; } - /** - * @return Returns the coreNotebookService. - */ - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - /** - * @param coreNotebookService - * The coreNotebookService to set. - */ - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public VoteOutputFactory getVoteOutputFactory() { return voteOutputFactory; } @@ -2074,8 +1953,6 @@ vote.setLockOnFinish(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); vote.setMaxNominationCount(JsonUtil.optString(toolContentJSON, "maxNominations", "1")); vote.setMinNominationCount(JsonUtil.optString(toolContentJSON, "minNominations", "1")); - vote.setReflect(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); - vote.setReflectionSubject(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); vote.setShowResults(JsonUtil.optBoolean(toolContentJSON, "showResults", Boolean.TRUE)); vote.setUseSelectLeaderToolOuput( JsonUtil.optBoolean(toolContentJSON, RestTags.USE_SELECT_LEADER_TOOL_OUTPUT, Boolean.FALSE)); Index: lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java (.../WhiteboardService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -23,8 +23,24 @@ package org.lamsfoundation.lams.tool.whiteboard.service; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStreamWriter; +import java.io.StringWriter; +import java.io.UnsupportedEncodingException; +import java.net.HttpURLConnection; +import java.net.URLEncoder; +import java.nio.charset.Charset; +import java.security.InvalidParameterException; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; +import java.util.function.Function; +import java.util.stream.Collectors; + import org.apache.commons.io.IOUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -39,14 +55,16 @@ import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.service.ILessonService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rating.dto.ItemRatingDTO; import org.lamsfoundation.lams.rating.model.RatingCriteria; import org.lamsfoundation.lams.rating.model.ToolActivityRatingCriteria; import org.lamsfoundation.lams.rating.service.IRatingService; -import org.lamsfoundation.lams.tool.*; +import org.lamsfoundation.lams.tool.ToolCompletionStatus; +import org.lamsfoundation.lams.tool.ToolContentManager; +import org.lamsfoundation.lams.tool.ToolOutput; +import org.lamsfoundation.lams.tool.ToolOutputDefinition; +import org.lamsfoundation.lams.tool.ToolSessionExportOutputData; +import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsToolService; @@ -55,7 +73,6 @@ import org.lamsfoundation.lams.tool.whiteboard.dao.WhiteboardDAO; import org.lamsfoundation.lams.tool.whiteboard.dao.WhiteboardSessionDAO; import org.lamsfoundation.lams.tool.whiteboard.dao.WhiteboardUserDAO; -import org.lamsfoundation.lams.tool.whiteboard.dto.ReflectDTO; import org.lamsfoundation.lams.tool.whiteboard.dto.SessionDTO; import org.lamsfoundation.lams.tool.whiteboard.model.Whiteboard; import org.lamsfoundation.lams.tool.whiteboard.model.WhiteboardConfigItem; @@ -65,17 +82,14 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; -import org.lamsfoundation.lams.util.*; +import org.lamsfoundation.lams.util.CommonConstants; +import org.lamsfoundation.lams.util.FileUtil; +import org.lamsfoundation.lams.util.HttpUrlConnectionUtil; +import org.lamsfoundation.lams.util.MessageService; +import org.lamsfoundation.lams.util.WebUtil; -import java.io.*; -import java.net.HttpURLConnection; -import java.net.URLEncoder; -import java.nio.charset.Charset; -import java.security.InvalidParameterException; -import java.time.LocalDateTime; -import java.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; public class WhiteboardService implements IWhiteboardService, ToolContentManager, ToolSessionManager { private static Logger log = Logger.getLogger(WhiteboardService.class.getName()); @@ -104,8 +118,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private WhiteboardOutputFactory whiteboardOutputFactory; // ******************************************************************************* @@ -388,58 +400,6 @@ } @Override - public List getReflectList(Long contentId) { - List reflections = new LinkedList<>(); - - List sessionList = whiteboardSessionDao.getByContentId(contentId); - for (WhiteboardSession session : sessionList) { - Long sessionId = session.getSessionId(); - // get all users in this session - List users = whiteboardUserDao.getBySessionID(sessionId); - for (WhiteboardUser user : users) { - - NotebookEntry entry = getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, - WhiteboardConstants.TOOL_SIGNATURE, user.getUserId().intValue()); - if (entry != null) { - ReflectDTO ref = new ReflectDTO(user); - ref.setReflect(entry.getEntry()); - Date postedDate = (entry.getLastModified() != null) - ? entry.getLastModified() - : entry.getCreateDate(); - ref.setDate(postedDate); - reflections.add(ref); - } - - } - - } - - return reflections; - } - - @Override - public Long createNotebookEntry(Long sessionId, Integer notebookToolType, String toolSignature, Integer userId, - String entryText) { - return coreNotebookService.createNotebookEntry(sessionId, notebookToolType, toolSignature, userId, "", - entryText); - } - - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public WhiteboardUser getUser(Long uid) { return whiteboardUserDao.find(WhiteboardUser.class, uid); } @@ -977,13 +937,6 @@ return; } - for (WhiteboardSession session : whiteboardSessionDao.getByContentId(toolContentId)) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, WhiteboardConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } whiteboardDao.delete(whiteboard); } @@ -1015,12 +968,6 @@ user.setSessionFinished(false); whiteboardUserDao.update(user); } else { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - WhiteboardConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - whiteboardDao.deleteById(NotebookEntry.class, entry.getUid()); - } - whiteboardUserDao.deleteById(WhiteboardUser.class, user.getUid()); } } @@ -1181,10 +1128,6 @@ this.ratingService = ratingService; } - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public WhiteboardOutputFactory getWhiteboardOutputFactory() { return whiteboardOutputFactory; } Index: lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java (.../WikiService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -33,9 +33,6 @@ import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; import org.lamsfoundation.lams.lesson.service.ILessonService; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.rest.RestTags; import org.lamsfoundation.lams.rest.ToolRestManager; import org.lamsfoundation.lams.tool.ToolCompletionStatus; @@ -102,8 +99,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private WikiOutputFactory wikiOutputFactory; private IEventNotificationService eventNotificationService; @@ -315,14 +310,6 @@ return; } - for (WikiSession session : wiki.getWikiSessions()) { - List entries = coreNotebookService.getEntry(session.getSessionId(), - CoreNotebookConstants.NOTEBOOK_TOOL, WikiConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - wikiDAO.delete(wiki); } @@ -357,13 +344,6 @@ WikiUser user = wikiUserDAO.getByUserIdAndSessionId(userId.longValue(), session.getSessionId()); if (user != null) { - if (!resetActivityCompletionOnly) { - NotebookEntry entry = getEntry(session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, - WikiConstants.TOOL_SIGNATURE, userId); - if (entry != null) { - wikiDAO.delete(entry); - } - } user.setFinishedActivity(false); // user.setWikiEdits(0); wikiUserDAO.update(user); @@ -449,42 +429,6 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.wiki.service.IWikiService#createNotebookEntry(java.lang.Long, - * java.lang.Integer, java.lang.String, java.lang.Integer, java.lang.String) - */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.wiki.service.IWikiService#getEntry(org.lamsfoundation.lams.notebook.model.NotebookEntry) - */ - @Override - public NotebookEntry getEntry(Long sessionId, Integer idType, String signature, Integer userID) { - List list = coreNotebookService.getEntry(sessionId, idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - /** - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.tool.wiki.service.IWikiService#updateEntry(org.lamsfoundation.lams.notebook.model.NotebookEntry) - */ - @Override - public void updateEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - /** - * (non-Javadoc) - * * @see org.lamsfoundation.lams.tool.wiki.service.IWikiService#comparePages(String,String) */ @Override @@ -973,14 +917,6 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - public WikiOutputFactory getWikiOutputFactory() { return wikiOutputFactory; } @@ -1050,8 +986,8 @@ /** * Used by the Rest calls to create content. * - * Mandatory fields in toolContentJSON: title, instructions, pages. Optional fields reflectInstructions, - * reflectOnActivity, lockWhenFinished (default False), allowLearnerAttachImages (default True), + * Mandatory fields in toolContentJSON: title, instructions, pages. Optional fields lockWhenFinished (default + * False), allowLearnerAttachImages (default True), * allowLearnerCreatePages (default True), allowLearnerInsertLinks (default True) notifyUpdates (default False), * minimumEdits and maximumEdits (default 0, no min/max) * @@ -1074,8 +1010,6 @@ content.setContentInUse(false); content.setDefineLater(false); - content.setReflectInstructions(JsonUtil.optString(toolContentJSON, RestTags.REFLECT_INSTRUCTIONS)); - content.setReflectOnActivity(JsonUtil.optBoolean(toolContentJSON, RestTags.REFLECT_ON_ACTIVITY, Boolean.FALSE)); content.setLockOnFinished(JsonUtil.optBoolean(toolContentJSON, RestTags.LOCK_WHEN_FINISHED, Boolean.FALSE)); content.setAllowLearnerAttachImages( Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java =================================================================== diff -u -rd7bfc30e7d7a056b984f35c292a7abed4635c754 -r1a4b15de76d371c44eb4c84eb971862eac5fca66 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision d7bfc30e7d7a056b984f35c292a7abed4635c754) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 1a4b15de76d371c44eb4c84eb971862eac5fca66) @@ -35,9 +35,6 @@ import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException; -import org.lamsfoundation.lams.notebook.model.NotebookEntry; -import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; -import org.lamsfoundation.lams.notebook.service.ICoreNotebookService; import org.lamsfoundation.lams.tool.ToolCompletionStatus; import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolOutput; @@ -92,8 +89,6 @@ private IExportToolContentService exportContentService; - private ICoreNotebookService coreNotebookService; - private static String TOKEN_CACHE = null; private static long TOKEN_CACHE_EXPIRE = 0; @@ -210,14 +205,6 @@ return; } - for (ZoomSession session : zoom.getZoomSessions()) { - java.util.List entries = coreNotebookService.getEntry( - session.getSessionId(), CoreNotebookConstants.NOTEBOOK_TOOL, ZoomConstants.TOOL_SIGNATURE); - for (NotebookEntry entry : entries) { - coreNotebookService.deleteEntry(entry); - } - } - zoomDAO.delete(zoom); } @@ -242,11 +229,6 @@ for (ZoomSession session : zoom.getZoomSessions()) { for (ZoomUser user : session.getZoomUsers()) { if (user.getUserId().equals(userId)) { - if (!resetActivityCompletionOnly && user.getNotebookEntryUID() != null) { - NotebookEntry entry = coreNotebookService.getEntry(user.getNotebookEntryUID()); - zoomDAO.delete(entry); - user.setNotebookEntryUID(null); - } user.setFinishedActivity(false); zoomDAO.update(user); } @@ -352,7 +334,7 @@ Zoom content = getZoomByContentId(toolContentId); for (ZoomSession session : content.getZoomSessions()) { for (ZoomUser user : session.getZoomUsers()) { - if (user.getNotebookEntryUID() != null) { + if (user.isFinishedActivity()) { // we don't remove users in removeLearnerContent() // we just set their notebook entry to NULL return true; @@ -368,39 +350,7 @@ return ZoomConstants.TOOL_CONTRIBUTE_URL + toolContentId; } - /* IZoomService Methods */ - @Override - public Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry) { - return coreNotebookService.createNotebookEntry(id, idType, signature, userID, "", entry); - } - - public NotebookEntry getEntry(Long id, Integer idType, String signature, Integer userID) { - java.util.List list = coreNotebookService.getEntry(id, - idType, signature, userID); - if ((list == null) || list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - public NotebookEntry getNotebookEntry(Long uid) { - return coreNotebookService.getEntry(uid); - } - - @Override - public void updateNotebookEntry(Long uid, String entry) { - coreNotebookService.updateEntry(uid, "", entry); - } - - @Override - public void updateNotebookEntry(NotebookEntry notebookEntry) { - coreNotebookService.updateEntry(notebookEntry); - } - - @Override public Long getDefaultContentIdBySignature(String toolSignature) { return toolService.getToolDefaultContentIdBySignature(toolSignature); } @@ -533,9 +483,6 @@ "Unable to set reflective data titled " + title + " on activity toolContentId " + toolContentId + " as the tool content does not exist."); } - - zoom.setReflectOnActivity(Boolean.TRUE); - zoom.setReflectInstructions(description); } // ========================================================================================= @@ -581,14 +528,6 @@ this.exportContentService = exportContentService; } - public ICoreNotebookService getCoreNotebookService() { - return coreNotebookService; - } - - public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { - this.coreNotebookService = coreNotebookService; - } - @Override public ToolCompletionStatus getCompletionStatus(Long learnerId, Long toolSessionId) { ZoomUser learner = getUserByUserIdAndSessionId(learnerId.intValue(), toolSessionId);