";
+ starString += "
";
+ starString += "
";
+ starString += "
";
+ String msg = service.getLocalisedMessage("label.average.rating",
+ new Object[] { averageRating, numberOfVotes });
+ starString += msg;
+ starString += "
";
+ rawRow.put("rating", starString);
+ rawRow.put("email", generatePreviewButton(toolSessionId, JsonUtil.optLong(rawRow, "itemId"),
+ emailResultsText));
+ } else {
+ rawRow.put("rating", averageRating);
+ rawRow.put("email", generatePreviewButton(toolSessionId, JsonUtil.optLong(rawRow, "itemId"),
+ emailResultsText));
+ }
+ }
+ ObjectNode row = JsonNodeFactory.instance.objectNode();
+ row.put("id", "" + rawRow.get("itemId"));
+ row.set("cell", rawRow);
+ rows.add(row);
+ }
+ }
+ responseData.set("rows", rows);
+
+ res.setContentType("application/json;charset=utf-8");
+ return responseData.toString();
+ }
+
+ private String generatePreviewButton(Object toolSessionId, Object userId, String emailResultsText) {
+ return new StringBuilder("
").toString();
+ }
+
+ @RequestMapping("/getSubgridData")
+ @ResponseBody
+ public String getSubgridData(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+
+ Long itemId = WebUtil.readLongParam(request, "itemId");
+ Long toolContentId = WebUtil.readLongParam(request, "toolContentId");
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+ Long criteriaId = WebUtil.readLongParam(request, "criteriaId");
+
+ // ratings left by others for this user
+ List
ratings = service.getDetailedRatingsComments(toolContentId, toolSessionId, criteriaId, itemId);
+ RatingCriteria criteria = service.getCriteriaByCriteriaId(criteriaId);
+ String title = HtmlUtils.htmlEscape(criteria.getTitle());
+
+ // processed data from db is userId, comment, rating, first_name, escaped( firstname + last_name)
+ // if no rating or comment, then the entries will be null and not an empty string
+ ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+ int i = 0;
+
+ for (Object[] ratingDetails : ratings) {
+ if (ratingDetails[2] != null) {
+ ArrayNode userData = JsonNodeFactory.instance.arrayNode();
+ userData.add(i);
+ userData.add(JsonUtil.readObject(ratingDetails[4]));
+ userData.add(JsonUtil.readObject(ratingDetails[2]));
+ userData.add(title);
+
+ ObjectNode userRow = JsonNodeFactory.instance.objectNode();
+ userRow.put("id", i++);
+ userRow.set("cell", userData);
+
+ rows.add(userRow);
+ }
+ }
+
+ if (criteria.isCommentsEnabled()) {
+ for (Object[] ratingDetails : ratings) {
+
+ // Show comment if comment has been left by user. Exclude the special case where it is a hedging rating
+ // and the rating is not null - otherwise we end up putting the justification comment against entries that were not rated.
+ String comment = (String) ratingDetails[1];
+ if (comment != null && (!criteria.isHedgeStyleRating()
+ || (criteria.isHedgeStyleRating() && ratingDetails[2] != null))) {
+ ArrayNode userData = JsonNodeFactory.instance.arrayNode();
+ userData.add(i);
+ userData.add(JsonUtil.readObject(ratingDetails[4]));
+ String commentText = HtmlUtils.htmlEscape(comment);
+ commentText = StringUtils.replace(commentText, "<BR>", "
");
+ userData.add(commentText);
+ userData.add("Comments");
+
+ ObjectNode userRow = JsonNodeFactory.instance.objectNode();
+ userRow.put("id", i++);
+ userRow.set("cell", userData);
+
+ rows.add(userRow);
+ }
+ }
+ }
+
+ ObjectNode responseJSON = JsonNodeFactory.instance.objectNode();
+ responseJSON.put("total", 1);
+ responseJSON.put("page", 1);
+ responseJSON.put("records", rows.size());
+ responseJSON.set("rows", rows);
+
+ response.setContentType("application/json;charset=utf-8");
+ return responseJSON.toString();
+ }
+
+ @RequestMapping("/statistic")
+ public String statistic(HttpServletRequest request,
+ HttpServletResponse response) {
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ Long toolContentId = WebUtil.readLongParam(request, PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+ request.setAttribute("summaryList", service.getStatistics(toolContentId));
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMapID);
+ return STATISTICS_PATH;
+ }
+
+ @RequestMapping("/reflections")
+ @SuppressWarnings("unchecked")
+ public String reflections(HttpServletRequest request,
+ HttpServletResponse response) {
+
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ SessionMap sessionMap = (SessionMap) request.getSession()
+ .getAttribute(sessionMapID);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+ sessionMap.remove("emailPreviewDTO"); // clear any old cached emails
+
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+ request.setAttribute("toolSessionId", toolSessionId);
+
+ return REFLECTIONS_PATH;
+ }
+
+ @RequestMapping("/getReflections")
+ @ResponseBody
+ @SuppressWarnings("unchecked")
+ public String getReflections(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ SessionMap sessionMap = (SessionMap) request.getSession()
+ .getAttribute(sessionMapID);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+ sessionMap.remove("emailPreviewDTO"); // clear any old cached emails
+
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+ // Getting the params passed in from the jqGrid
+ int page = WebUtil.readIntParam(request, PeerreviewConstants.PARAM_PAGE) - 1;
+ int size = WebUtil.readIntParam(request, PeerreviewConstants.PARAM_ROWS);
+ String sortOrder = WebUtil.readStrParam(request, PeerreviewConstants.PARAM_SORD);
+ String sortBy = WebUtil.readStrParam(request, PeerreviewConstants.PARAM_SIDX, true);
+
+ int sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+
+ if (sortBy != null && sortBy.equals(PeerreviewConstants.PARAM_SORT_NAME)) {
+ if (sortOrder != null && sortOrder.equals(PeerreviewConstants.SORT_DESC)) {
+ sorting = PeerreviewConstants.SORT_BY_USERNAME_DESC;
+ } else {
+ sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+ }
+ } else if (sortBy != null && sortBy.equals(PeerreviewConstants.PARAM_SORT_NOTEBOOK)) {
+ if (sortOrder != null && sortOrder.equals(PeerreviewConstants.SORT_DESC)) {
+ sorting = PeerreviewConstants.SORT_BY_NOTEBOOK_ENTRY_DESC;
+ } else {
+ sorting = PeerreviewConstants.SORT_BY_NOTEBOOK_ENTRY_ASC;
+ }
+ }
+
+ String searchString = WebUtil.readStrParam(request, "itemDescription", true);
+
+ // setting date format to ISO8601 for jquery.timeago
+ DateFormat dateFormatterTimeAgo = new SimpleDateFormat(DateUtil.ISO8601_FORMAT);
+ dateFormatterTimeAgo.setTimeZone(TimeZone.getTimeZone("GMT"));
+
+ int sessionUserCount = service.getCountUsersBySession(toolSessionId, -1L);
+
+ ObjectNode responcedata = JsonNodeFactory.instance.objectNode();
+ responcedata.put("page", page + 1);
+ responcedata.put("total", Math.ceil((float) sessionUserCount / size));
+ responcedata.put("records", sessionUserCount);
+
+ List nbEntryList = service.getUserNotebookEntriesForTablesorter(toolSessionId, page, size, sorting,
+ searchString);
+
+ // processed data from db is user.user_id, user.first_name, escaped( first_name + last_name), notebook entry, notebook date
+ // if no rating or comment, then the entries will be null and not an empty string
+ ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+ int i = 0;
+
+ for (Object[] nbEntry : nbEntryList) {
+ ArrayNode userData = JsonNodeFactory.instance.arrayNode();
+ userData.add(JsonUtil.readObject(nbEntry[0]));
+
+ Date entryTime = (Date) nbEntry[4];
+ if (entryTime == null) {
+ userData.add((String) nbEntry[2]);
+ } else {
+ StringBuilder nameField = new StringBuilder((String) nbEntry[2]).append("
")
+ .append("");
+ userData.add(nameField.toString());
+ }
+
+ userData.add(HtmlUtils.htmlEscape((String) nbEntry[3]));
+
+ ObjectNode userRow = JsonNodeFactory.instance.objectNode();
+ userRow.put("id", i++);
+ userRow.set("cell", userData);
+
+ rows.add(userRow);
+ }
+
+ responcedata.set("rows", rows);
+
+ response.setContentType("application/json;charset=utf-8");
+ return responcedata.toString();
+ }
+
+ @RequestMapping("/previewResultsToUser")
+ @SuppressWarnings("unchecked")
+ public String previewResultsToUser(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ SessionMap sessionMap = (SessionMap) request.getSession()
+ .getAttribute(sessionMapID);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+ sessionMap.remove("emailPreviewDTO"); // clear any old cached emails
+
+ Long contentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+ // only supports single user
+ Long userId = WebUtil.readLongParam(request, PeerreviewConstants.PARAM_USERID);
+ String emailHTML = service.generateEmailReportToUser(contentId, toolSessionId, userId);
+ EmailPreviewDTO dto = new EmailPreviewDTO(emailHTML, toolSessionId, userId);
+ sessionMap.put("emailPreviewDTO", dto);
+ return EMAIL_PREVIEW_PATH;
+ }
+
+ @RequestMapping("/sendPreviewedResultsToUser")
+ @ResponseBody
+ @SuppressWarnings("unchecked")
+ public String sendPreviewedResultsToUser(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+ // if we regenerate the results, it is more work for the server and the results may change. if we want to
+ // just send what the monitor already sees, get it back from the sessionMap, check that it should be the
+ // same email (ie check the parameters) and if all good then send.
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ SessionMap sessionMap = (SessionMap) request.getSession()
+ .getAttribute(sessionMapID);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+ EmailPreviewDTO previewDTO = (EmailPreviewDTO) sessionMap.get("emailPreviewDTO");
+ Long contentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+ Long dateTimeStamp = WebUtil.readLongParam(request, "dateTimeStamp");
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+ Long userId = WebUtil.readLongParam(request, "userID");
+
+ if (previewDTO == null || !dateTimeStamp.equals(previewDTO.getDateTimeStamp())
+ || !toolSessionId.equals(previewDTO.getToolSessionId())
+ || !userId.equals(previewDTO.getLearnerUserId())) {
+ log.error(
+ "Unable to send preview as requested parameters to not matched the catched parameters. Email text in session does not match the requested email. Cached preview: "
+ + previewDTO);
+ sessionMap.remove("emailPreviewDTO"); // Cached email removed so it can't be resent.
+ response.setContentType("text/html;charset=utf-8");
+ return service.getLocalisedMessage("label.email.send.failed.preview.wrong", new Object[] {});
+ }
+
+ // Use the details from the DTO, so that if somehow something has got stuff up (and the above check has not picked
+ // up the issue, make sure you use the user id originally associated with this email.
+ int numEmailsSent = service.emailReportToUser(contentId, previewDTO.getToolSessionId(),
+ previewDTO.getLearnerUserId(), previewDTO.getEmailHTML());
+ sessionMap.remove("emailPreviewDTO"); // Cached email removed so it can't be resent.
+ response.setContentType("text/html;charset=utf-8");
+ return service.getLocalisedMessage("msg.results.sent", new Object[] { numEmailsSent });
+ }
+
+ @RequestMapping("/sendResultsToSessionUsers")
+ @ResponseBody
+ @SuppressWarnings("unchecked")
+ public String sendResultsToSessionUsers(HttpServletRequest request,
+ HttpServletResponse response) throws IOException {
+
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ SessionMap sessionMap = (SessionMap) request.getSession()
+ .getAttribute(sessionMapID);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+ sessionMap.remove("emailPreviewDTO"); // clear any old cached emails
+
+ Long contentId = (Long) sessionMap.get(PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+ int numEmailsSent = service.emailReportToSessionUsers(contentId, toolSessionId);
+
+ response.setContentType("text/html;charset=utf-8");
+ return service.getLocalisedMessage("msg.results.sent", new Object[] { numEmailsSent });
+ }
+
+ /**
+ * Exports Team Report into Excel spreadsheet.
+ *
+ * @throws ServletException
+ * @throws IOException
+ */
+ @RequestMapping("/exportTeamReport")
+ @ResponseBody
+ public String exportTeamReport(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException {
+
+ Long toolContentId = WebUtil.readLongParam(request, PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+
+ Peerreview peerreview = service.getPeerreviewByContentId(toolContentId);
+ if (peerreview == null) {
+ log.warn("Did not find Peer Review with toolContentId: " + toolContentId + " export content");
+ return null;
+ }
+
+ String fileName = peerreview.getTitle().replaceAll(" ", "_") + ".xlsx";
+
+ try {
+ fileName = FileUtil.encodeFilenameForDownload(request, fileName);
+
+ if (log.isDebugEnabled()) {
+ log.debug("Exporting to a spreadsheet for toolContentId: " + toolContentId + "filename " + fileName);
+ }
+
+ response.setContentType("application/x-download");
+ response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+ ServletOutputStream out = response.getOutputStream();
+
+ LinkedHashMap dataToExport = service.exportTeamReportSpreadsheet(toolContentId);
+
+ // set cookie that will tell JS script that export has been finished
+ String downloadTokenValue = WebUtil.readStrParam(request, "downloadTokenValue");
+ Cookie fileDownloadTokenCookie = new Cookie("fileDownloadToken", downloadTokenValue);
+ fileDownloadTokenCookie.setPath("/");
+ response.addCookie(fileDownloadTokenCookie);
+
+ ExcelUtil.createExcel(out, dataToExport, "Exported on:", true);
+
+ } catch (IOException e) {
+ log.error("exportTeamReportExcelSpreadsheet i/o error occured: " + e.getMessage(), e);
+ throw new ServletException(e);
+ }
+
+ return null;
+ }
+
+ @RequestMapping("/manageUsers")
+ @SuppressWarnings("unchecked")
+ public String manageUsers(HttpServletRequest request,
+ HttpServletResponse response) throws ServletException {
+
+ String sessionMapID = request.getParameter(PeerreviewConstants.ATTR_SESSION_MAP_ID);
+ SessionMap sessionMap = (SessionMap) request.getSession()
+ .getAttribute(sessionMapID);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+ return MANAGE_USERS_PATH;
+ }
+
+ /**
+ * Gets a paged set of data for stars or comments. These are directly saved to the database, not through
+ * LearnerAction like Ranking and Hedging.
+ */
+ @RequestMapping("/getManagedUsers")
+ @ResponseBody
+ public String getManageUsers(HttpServletRequest request,
+ HttpServletResponse res) throws IOException, ServletException {
+
+ Long toolSessionId = WebUtil.readLongParam(request, "toolSessionId");
+
+ // Getting the params passed in from the jqGrid
+ int page = WebUtil.readIntParam(request, PeerreviewConstants.PARAM_PAGE) - 1;
+ int size = WebUtil.readIntParam(request, PeerreviewConstants.PARAM_ROWS);
+ String sortOrder = WebUtil.readStrParam(request, PeerreviewConstants.PARAM_SORD);
+ String sortBy = WebUtil.readStrParam(request, PeerreviewConstants.PARAM_SIDX, true);
+
+ int sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+ if (sortBy != null && sortBy.equals(PeerreviewConstants.PARAM_SORT_USER_NAME)) {
+ if (sortOrder != null && sortOrder.equals(PeerreviewConstants.SORT_DESC)) {
+ sorting = PeerreviewConstants.SORT_BY_USERNAME_DESC;
+ } else {
+ sorting = PeerreviewConstants.SORT_BY_USERNAME_ASC;
+ }
+ }
+ String searchString = WebUtil.readStrParam(request, "userName", true);
+
+ ObjectNode responcedata = JsonNodeFactory.instance.objectNode();
+
+ int numUsersInSession = service.getCountUsersBySession(toolSessionId);
+ responcedata.put("page", page + 1);
+ responcedata.put("total", Math.ceil((float) numUsersInSession / size));
+ responcedata.put("records", numUsersInSession);
+
+ // gets the user
+ List rawRows = service.getPagedUsers(toolSessionId, page, size, sorting, searchString);
+ ArrayNode rows = JsonNodeFactory.instance.arrayNode();
+ for (int i = 0; i < rawRows.size(); i++) {
+ Object[] rawRow = rawRows.get(i);
+ ObjectNode cell = JsonNodeFactory.instance.objectNode();
+ cell.put("hidden", !(Boolean) rawRow[1]);
+ cell.put("userUid", (Integer) rawRow[0]);
+ cell.put("userName", (String) rawRow[2]);
+
+ ObjectNode row = JsonNodeFactory.instance.objectNode();
+ row.put("id", "" + rawRow[0]);
+ row.set("cell", cell);
+ rows.add(row);
+ }
+ responcedata.set("rows", rows);
+
+ res.setContentType("application/json;charset=utf-8");
+ return responcedata.toString();
+ }
+
+ @RequestMapping("/setUserHidden")
+ @ResponseBody
+ public String setUserHidden(HttpServletRequest request,
+ HttpServletResponse response) {
+
+ Long toolContentId = WebUtil.readLongParam(request, PeerreviewConstants.ATTR_TOOL_CONTENT_ID);
+ Long userUid = WebUtil.readLongParam(request, "userUid");
+ boolean isHidden = !WebUtil.readBooleanParam(request, "hidden");
+
+ service.setUserHidden(toolContentId, userUid, isHidden);
+ return "";
+ }
+
+
+}
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java
===================================================================
diff -u
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java (revision 0)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/TblMonitoringController.java (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -0,0 +1,58 @@
+package org.lamsfoundation.lams.tool.peerreview.web.controller;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.lamsfoundation.lams.rating.model.RatingCriteria;
+import org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants;
+import org.lamsfoundation.lams.tool.peerreview.dto.GroupSummary;
+import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
+import org.lamsfoundation.lams.tool.peerreview.service.IPeerreviewService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.lamsfoundation.lams.web.util.SessionMap;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Controller
+@RequestMapping("/tblmonitoring")
+public class TblMonitoringController {
+
+ @Autowired
+ @Qualifier("peerreviewService")
+ private IPeerreviewService peerreviewService;
+
+ /**
+ * Shows tra page
+ */
+ @RequestMapping("/peerreview")
+ public String peerreview(HttpServletRequest request) {
+
+ // initial Session Map
+ SessionMap sessionMap = new SessionMap();
+ request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap);
+ request.setAttribute(PeerreviewConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID());
+
+ Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID);
+ List groupList = peerreviewService.getGroupSummaries(contentId);
+
+ Peerreview peerreview = peerreviewService.getPeerreviewByContentId(contentId);
+
+ // cache into sessionMap
+ sessionMap.put(PeerreviewConstants.ATTR_SUMMARY_LIST, groupList);
+ sessionMap.put(PeerreviewConstants.PAGE_EDITABLE, peerreview.isContentInUse());
+ sessionMap.put(PeerreviewConstants.ATTR_PEERREVIEW, peerreview);
+ sessionMap.put(PeerreviewConstants.ATTR_TOOL_CONTENT_ID, contentId);
+ sessionMap.put(PeerreviewConstants.ATTR_IS_GROUPED_ACTIVITY, peerreviewService.isGroupedActivity(contentId));
+ sessionMap.put("tblMonitoring", true);
+
+ List criterias = peerreviewService.getRatingCriterias(contentId);
+ request.setAttribute(PeerreviewConstants.ATTR_CRITERIAS, criterias);
+
+ return "/pages/monitoring/summary";
+ }
+
+}
\ No newline at end of file
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java (.../PeerreviewForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java (.../PeerreviewForm.java) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -23,12 +23,7 @@
package org.lamsfoundation.lams.tool.peerreview.web.form;
-import javax.servlet.http.HttpServletRequest;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionForm;
-import org.apache.struts.action.ActionMapping;
import org.lamsfoundation.lams.tool.peerreview.model.Peerreview;
/**
@@ -39,7 +34,7 @@
*
* User: Andrey Balan
*/
-public class PeerreviewForm extends ActionForm {
+public class PeerreviewForm {
private static final long serialVersionUID = 3599879328307492312L;
private static Logger logger = Logger.getLogger(PeerreviewForm.class.getName());
@@ -65,17 +60,18 @@
}
}
- @Override
- public void reset(ActionMapping mapping, HttpServletRequest request) {
- String param = mapping.getParameter();
- // if it is start page, all data read out from database or current session
- // so need not reset checkbox to refresh value!
- if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
- peerreview.setLockWhenFinished(false);
- peerreview.setDefineLater(false);
- peerreview.setReflectOnActivity(false);
- }
- }
+ // TODO is this used?
+// @Override
+// public void reset(ActionMapping mapping, HttpServletRequest request) {
+// String param = mapping.getParameter();
+// // if it is start page, all data read out from database or current session
+// // so need not reset checkbox to refresh value!
+// if (!StringUtils.equals(param, "start") && !StringUtils.equals(param, "initPage")) {
+// peerreview.setLockWhenFinished(false);
+// peerreview.setDefineLater(false);
+// peerreview.setReflectOnActivity(false);
+// }
+// }
public int getCurrentTab() {
return currentTab;
Index: lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/ReflectionForm.java
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/ReflectionForm.java (.../ReflectionForm.java) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -24,19 +24,15 @@
package org.lamsfoundation.lams.tool.peerreview.web.form;
-import org.apache.log4j.Logger;
-import org.apache.struts.validator.ValidatorForm;
-
/**
*
* Reflection Form.
*
*
*
*/
-public class ReflectionForm extends ValidatorForm {
+public class ReflectionForm {
private static final long serialVersionUID = -9054365604649146735L;
- private static Logger logger = Logger.getLogger(ReflectionForm.class.getName());
private Integer userID;
private String sessionMapID;
Index: lams_tool_preview/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/spring-servlet.xml (revision 0)
+++ lams_tool_preview/web/WEB-INF/spring-servlet.xml (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -32,7 +32,7 @@
<%@ tag body-content="scriptless" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ attribute name="formID" required="true" rtexprvalue="true" %>
@@ -123,11 +123,11 @@
}
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag (.../AuthoringRatingAllStyleCriteria.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag (.../AuthoringRatingAllStyleCriteria.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -8,7 +8,7 @@
<%@ tag body-content="scriptless" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-function" prefix="fn" %>
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -8,7 +8,7 @@
<%@ tag body-content="scriptless" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-function" prefix="fn" %>
@@ -284,42 +284,42 @@
-
-
+
+
-
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
-
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+
-
-
+
+
-
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
-
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+
-
-
+
+
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag (.../Page.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -4,6 +4,7 @@
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ attribute name="type" required="true" rtexprvalue="true"%>
+<%@ attribute name="formID" required="false" rtexprvalue="true"%>
<%@ attribute name="style" required="false" rtexprvalue="true"%>
<%@ attribute name="title" required="false" rtexprvalue="true"%>
<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
@@ -88,8 +89,8 @@
-
-
+
+
${toolForm.toolSessionID}
@@ -137,12 +138,12 @@
function restartLesson(){
if (confirm(restartLessonConfirmation)) {
- window.location.href = LEARNING_URL + 'learner.do?method=restartLesson&lessonID=' + lessonId;
+ window.location.href = LEARNING_URL + 'learner/restartLesson.do?lessonID=' + lessonId;
}
}
function viewNotebookEntries(){
- openPopUp(LEARNING_URL + "notebook.do?method=viewAll&lessonID=" + lessonId,
+ openPopUp(LEARNING_URL + "notebook/viewAll.do?lessonID=" + lessonId,
"Notebook",
648,1152,
"no");
@@ -244,9 +245,8 @@
if ( lessonId != "" || toolSessionId != "" ) {
$.ajax({
- url : LEARNING_URL + 'learner.do',
+ url : LEARNING_URL + 'learner/getLessonDetails.do',
data : {
- 'method' : 'getLessonDetails',
'lessonID' : lessonId,
'toolSessionID' : toolSessionId,
},
Index: lams_tool_preview/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -8,7 +8,7 @@
<%@ tag body-content="scriptless" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-function" prefix="fn" %>
Index: lams_tool_preview/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -8,7 +8,7 @@
<%@ tag body-content="scriptless" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
<%@ taglib uri="tags-lams" prefix="lams"%>
<%@ taglib uri="tags-function" prefix="fn" %>
Index: lams_tool_preview/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -34,7 +34,6 @@
<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
<%@ attribute name="page" required="false" rtexprvalue="true"%>
<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
Index: lams_tool_preview/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -30,7 +30,6 @@
%>
<%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-bean" prefix="bean"%>
Index: lams_tool_preview/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tags/TextSearch.tag (.../TextSearch.tag) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tags/TextSearch.tag (.../TextSearch.tag) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -32,12 +32,11 @@
<%@ tag body-content="scriptless" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
-<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
<%@ taglib uri="tags-lams" prefix="lams" %>
<%-- Required attributes --%>
<%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %>
-<%@ attribute name="wrapInFormTag" required="true" rtexprvalue="true" %>
<%-- Optional attributes --%>
<%@ attribute name="action" required="false" rtexprvalue="true" %>
@@ -53,10 +52,10 @@
<%-- Default value for message key --%>
-
+
-
+
@@ -85,52 +84,40 @@
-
-
-
-
-
-
- |
-
- |
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
- |
-
- |
-
-
- |
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+
+ |
+
+ |
+
+
+ |
+
+
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld (.../lams.tld) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -212,191 +212,6 @@
-
- STRUTS-textarea
- org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag
- empty
-
- accesskey
- false
- true
-
-
- alt
- false
- true
-
-
- altKey
- false
- true
-
-
- bundle
- false
- true
-
-
- cols
- false
- true
-
-
- disabled
- false
- true
-
-
- errorKey
- false
- true
-
-
- errorStyle
- false
- true
-
-
- errorStyleClass
- false
- true
-
-
- errorStyleId
- false
- true
-
-
- index
- false
- true
-
-
- indexed
- false
- true
-
-
- name
- false
- true
-
-
- onblur
- false
- true
-
-
- onchange
- false
- true
-
-
- onclick
- false
- true
-
-
- ondblclick
- false
- true
-
-
- onfocus
- false
- true
-
-
- onkeydown
- false
- true
-
-
- onkeypress
- false
- true
-
-
- onkeyup
- false
- true
-
-
- onmousedown
- false
- true
-
-
- onmousemove
- false
- true
-
-
- onmouseout
- false
- true
-
-
- onmouseover
- false
- true
-
-
- onmouseup
- false
- true
-
-
- property
- true
- true
-
-
- readonly
- false
- true
-
-
- rows
- false
- true
-
-
- style
- false
- true
-
-
- styleClass
- false
- true
-
-
- styleId
- false
- true
-
-
- tabindex
- false
- true
-
-
- title
- false
- true
-
-
- titleKey
- false
- true
-
-
- value
- false
- true
-
-
Small portrait of a user
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-bean-el.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-bean.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-html-el.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-html.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-logic-el.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-logic.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-nested.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-tiles-el.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tlds/struts/struts-tiles.tld'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 1042117ad93a6a9f93d8b1c8be7e718b7efd383f refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/validation.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/web.xml
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/WEB-INF/web.xml (.../web.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/WEB-INF/web.xml (.../web.xml) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -72,24 +72,10 @@
- action
- org.apache.struts.action.ActionServlet
-
- config
- /WEB-INF/struts-config.xml
-
-
- debug
- 999
-
-
- detail
- 2
-
-
- validate
- true
-
+ spring
+
+ org.springframework.web.servlet.DispatcherServlet
+
1
@@ -121,7 +107,7 @@
- action
+ spring
*.do
@@ -151,41 +137,6 @@
-
-
-
- tags-bean
- /WEB-INF/tlds/struts/struts-bean.tld
-
-
- tags-html
- /WEB-INF/tlds/struts/struts-html.tld
-
-
- tags-logic
- /WEB-INF/tlds/struts/struts-logic.tld
-
-
- tags-tiles
- /WEB-INF/tlds/struts/struts-tiles.tld
-
-
- tags-bean-el
- /WEB-INF/tlds/struts/struts-bean-el.tld
-
-
- tags-html-el
- /WEB-INF/tlds/struts/struts-html-el.tld
-
-
- tags-logic-el
- /WEB-INF/tlds/struts/struts-logic-el.tld
-
-
- tags-tiles-el
- /WEB-INF/tlds/struts/struts-tiles-el.tld
-
-
Index: lams_tool_preview/web/common/messages.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/common/messages.jsp (.../messages.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/common/messages.jsp (.../messages.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -1,8 +1,9 @@
<%-- Error Messages --%>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Index: lams_tool_preview/web/common/taglibs.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/common/taglibs.jsp (.../taglibs.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/common/taglibs.jsp (.../taglibs.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -1,11 +1,8 @@
<%@ page language="java" errorPage="/error.jsp" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %>
-<%@ taglib uri="tags-bean" prefix="bean" %>
-<%@ taglib uri="tags-html" prefix="html" %>
-<%@ taglib uri="tags-logic" prefix="logic" %>
<%@ taglib uri="tags-function" prefix="fn" %>
<%@ taglib uri="tags-core" prefix="c" %>
<%@ taglib uri="tags-fmt" prefix="fmt" %>
<%@ taglib uri="tags-xml" prefix="x" %>
<%@ taglib uri="tags-lams" prefix="lams" %>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %>
-
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -1,49 +1,48 @@
<%@ include file="/common/taglibs.jsp"%>
-
-
-
+
+
-
- 1
- 2
- 3
- 4
- 5
- 6
- 7
- 8
- 9
- 10
-
+
+ 1
+ 2
+ 3
+ 4
+ 5
+ 6
+ 7
+ 8
+ 9
+ 10
+
-
-
-
-
@@ -53,16 +52,16 @@
-
-
-
+
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/authoring/authoring.jsp (.../authoring.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -30,14 +30,13 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -68,16 +67,21 @@
cancelConfirmMsgKey="authoring.msg.cancel.save"
accessMode="author"
--%>
-
+
+
-
+
Index: lams_tool_preview/web/pages/authoring/basic.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/authoring/basic.jsp (.../basic.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -1,15 +1,15 @@
<%@ include file="/common/taglibs.jsp"%>
-
+
-
+
-
+
Index: lams_tool_preview/web/pages/authoring/start.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/authoring/start.jsp (.../start.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/authoring/start.jsp (.../start.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -4,13 +4,13 @@
<%@ include file="/common/taglibs.jsp" %>
-
-
-
-
+
+
+
+
Index: lams_tool_preview/web/pages/learning/hedging.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/learning/hedging.jsp (.../hedging.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/learning/hedging.jsp (.../hedging.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -77,7 +77,7 @@
}
-
" method="post" id="editForm">
+
" method="post" id="editForm">
Index: lams_tool_preview/web/pages/learning/learningHiddenUser.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/learning/learningHiddenUser.jsp (.../learningHiddenUser.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/learning/learningHiddenUser.jsp (.../learningHiddenUser.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -44,9 +44,9 @@
-
+
-
+
Index: lams_tool_preview/web/pages/learning/rankall.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r1042117ad93a6a9f93d8b1c8be7e718b7efd383f
--- lams_tool_preview/web/pages/learning/rankall.jsp (.../rankall.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_tool_preview/web/pages/learning/rankall.jsp (.../rankall.jsp) (revision 1042117ad93a6a9f93d8b1c8be7e718b7efd383f)
@@ -124,7 +124,7 @@
-