Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.12.2.6 -r1.12.2.7
--- lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties 4 Dec 2016 01:21:35 -0000 1.12.2.6
+++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties 19 Apr 2017 11:56:04 -0000 1.12.2.7
@@ -116,6 +116,6 @@
label.refresh =Refresh
label.spreadsheet.options =Options
label.activity.completion =End of activity
+message.spreadsheet.marked =You cannot change the spreadsheet as it has been marked.
-
#======= End labels: Exported 110 labels for en AU =====
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java,v
diff -u -r1.5.2.4 -r1.5.2.5
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java 11 May 2016 07:37:37 -0000 1.5.2.4
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java 19 Apr 2017 11:56:04 -0000 1.5.2.5
@@ -86,6 +86,7 @@
public static final String ATTR_USER_UID = "userUid";
public static final String ATTR_USER_NAME = "userName";
public static final String ATTR_USER_MARK = "mark";
+ public static final String ATTR_USER_IS_MARKED = "userIsMarked";
public static final String ATTR_CODE = "code";
public static final String DEFUALT_PROTOCOL_REFIX = "http://";
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java,v
diff -u -r1.7.2.6 -r1.7.2.7
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java 18 Apr 2017 02:59:49 -0000 1.7.2.6
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java 19 Apr 2017 11:56:04 -0000 1.7.2.7
@@ -185,12 +185,16 @@
sessionMap.put(SpreadsheetConstants.ATTR_RESOURCE, spreadsheet);
if ((spreadsheetUser != null) && (spreadsheetUser.getUserModifiedSpreadsheet() != null)
- && (spreadsheetUser.getUserModifiedSpreadsheet().getMark() != null)
- && (spreadsheetUser.getUserModifiedSpreadsheet().getMark().getDateMarksReleased() != null)) {
+ && (spreadsheetUser.getUserModifiedSpreadsheet().getMark() != null)) {
+ request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, true);
+ if ( (spreadsheetUser.getUserModifiedSpreadsheet().getMark().getDateMarksReleased() != null)) {
request.setAttribute(SpreadsheetConstants.ATTR_USER_MARK,
- spreadsheetUser.getUserModifiedSpreadsheet().getMark());
+ spreadsheetUser.getUserModifiedSpreadsheet().getMark());
+ }
+ } else {
+ request.setAttribute(SpreadsheetConstants.ATTR_USER_IS_MARKED, false);
}
-
+
ActivityPositionDTO activityPosition = LearningWebUtil.putActivityPositionInRequestByToolSessionId(sessionId,
request, getServlet().getServletContext());
sessionMap.put(AttributeNames.ATTR_ACTIVITY_POSITION, activityPosition);
@@ -228,13 +232,16 @@
SpreadsheetUser spreadsheetUser = getCurrentUser(service, sessionId);
UserModifiedSpreadsheet userModifiedSpreadsheet = spreadsheetUser.getUserModifiedSpreadsheet();
- if ( userModifiedSpreadsheet == null ) {
- userModifiedSpreadsheet = new UserModifiedSpreadsheet();
- }
- String code = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_CODE);
- userModifiedSpreadsheet.setUserModifiedSpreadsheet(code);
- spreadsheetUser.setUserModifiedSpreadsheet(userModifiedSpreadsheet);
- service.saveOrUpdateUser(spreadsheetUser);
+
+ if ( spreadsheetUser.getUserModifiedSpreadsheet() == null || spreadsheetUser.getUserModifiedSpreadsheet().getMark() == null ) {
+ if ( userModifiedSpreadsheet == null ) {
+ userModifiedSpreadsheet = new UserModifiedSpreadsheet();
+ }
+ String code = WebUtil.readStrParam(request, SpreadsheetConstants.ATTR_CODE);
+ userModifiedSpreadsheet.setUserModifiedSpreadsheet(code);
+ spreadsheetUser.setUserModifiedSpreadsheet(userModifiedSpreadsheet);
+ service.saveOrUpdateUser(spreadsheetUser);
+ }
}
String typeOfAction = WebUtil.readStrParam(request, "typeOfAction");
Index: lams_tool_spreadsheet/web/pages/learning/learning.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/pages/learning/learning.jsp,v
diff -u -r1.9.2.9 -r1.9.2.10
--- lams_tool_spreadsheet/web/pages/learning/learning.jsp 27 Feb 2017 08:44:32 -0000 1.9.2.9
+++ lams_tool_spreadsheet/web/pages/learning/learning.jsp 19 Apr 2017 11:56:04 -0000 1.9.2.10
@@ -51,6 +51,12 @@
+
+
+
+
+
+
<%@ include file="/common/messages.jsp"%>
@@ -109,7 +115,7 @@
scrolling="no">
-
+