Index: lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
===================================================================
diff -u -r6377e7115e4539a81944421568f024ab1b970b55 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 6377e7115e4539a81944421568f024ab1b970b55)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java (.../ImportService.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -588,7 +588,6 @@
user.setDisabledFlag(false);
user.setCreateDate(new Date());
user.setTimeZone(timezoneService.getServerTimezone().getTimezoneId());
- user.setTutorialsDisabled(false);
user.setFirstLogin(true);
return (hasError ? null : user);
@@ -814,7 +813,7 @@
logEventService.logEvent(LogEvent.TYPE_USER_ORG_ADMIN, userDTO != null ? userDTO.getUserID() : null, null, null,
null, message);
}
-
+
// ---------------------------------------------------------------------
// Inversion of Control Methods - Method injection
// ---------------------------------------------------------------------
@@ -830,7 +829,7 @@
public void setLogEventService(ILogEventService logEventService) {
this.logEventService = logEventService;
}
-
+
public void setTimezoneService(ITimezoneService timezoneService) {
this.timezoneService = timezoneService;
}
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r04f70c56cf4d63d83a332402a572c9062f318bbf -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
+++ lams_admin/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -79,7 +79,6 @@
-
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r1fbfcb01e68515379fe29eaf76a474a5b1bbc1e1 -r7acb20e485013e119c7dfd90854f123c09f147cb
Binary files differ
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7b0401fe54636737b72030c60fd9292956e79487 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7b0401fe54636737b72030c60fd9292956e79487)
+++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -228,10 +228,7 @@
message.profile.partially.edited =Profile has only been partially updated due to server configuration.
message.partial.edit.only =Only contact fields are editable due to server configuration.
error.password.empty =New password cannot be empty.
-label.tutorial.enabled =Automatically open help assistants
label.portrait.create.new.portrait =Select an image to upload or use your computer's webcam to create your portrait.
-label.tutorial.disable.single =You have chosen not to show this video again. You can always play it using the video icon in the right upper corner of the page.
-label.tutorial.disable.all =Welcome to LAMS! As a new user, you might want to spend a few minutes looking at the new online assistant animations and videos to help you get the most out of LAMS. You can turn this option off if you are an experience LAMS user. If you are new to LAMS, we recommend that you leave this on to get contextual help. Do you want to to leave this option on?
message.preceding.lessons.not.finished.cannot.participate =Preceding lessons have not been finished. You cannot participate in the lesson until this condition is met.
index.conditions =Conditions
index.conditions.tooltip =Conditions to participate in this lesson
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -re59191f853aa9bdaf89c4e430fa9517541c073ed -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision e59191f853aa9bdaf89c4e430fa9517541c073ed)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -82,7 +82,7 @@
setHeaderLinks(request);
setAdminLinks(request);
- // check if this is user's first login; some action (like displaying a dialog for disabling tutorials) can be
+ // check if this is user's first login; some action (like displaying a tour) can be
// taken based on that parameter; immediatelly, the value in DB is updated
HttpSession ss = SessionManager.getSession();
UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER);
Fisheye: Tag 7acb20e485013e119c7dfd90854f123c09f147cb refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/TutorialAction.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
===================================================================
diff -u -r521f3087b376bc72feabd6f7cf81dab7f95739ab -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 521f3087b376bc72feabd6f7cf81dab7f95739ab)
+++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java (.../PedagogicalPlannerAction.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -91,7 +91,6 @@
import org.lamsfoundation.lams.learningdesign.ToolActivity;
import org.lamsfoundation.lams.learningdesign.Transition;
import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO;
-import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
import org.lamsfoundation.lams.learningdesign.service.ImportToolContentException;
@@ -214,9 +213,6 @@
private static final String FIELD_NAME_FULL_DESCRIPTION = "fullDescription";
private static final String FIELD_NAME_ANCESTOR_UID = "ancestorUid";
- // Tutorial video page string for recognising which page the video was started from
- private static final String PAGE_STRING_START_PLANNER = "StPed";
-
// Parameters
public static final String PARAM_REQUEST_SRC = "requestSrc";
public static final String PARAM_FORBID_BUTTONS = "forbidButtons";
@@ -234,14 +230,6 @@
public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
HttpServletResponse response) throws Exception {
- // First we check if a tutorial video should be displayed
- HttpSession session = SessionManager.getSession();
- UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
- boolean doNotShowAgain = (userDto.getPagesWithDisabledTutorials() != null)
- && userDto.getPagesWithDisabledTutorials().contains(PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
- boolean showTutorial = !(userDto.getTutorialsDisabled() || doNotShowAgain);
- request.setAttribute(AttributeNames.ATTR_SHOW_TUTORIAL, showTutorial);
-
// process requestSrc and notifyCloseURL parameters (if any)
String requestSrc = request.getParameter(PedagogicalPlannerAction.PARAM_REQUEST_SRC);
if (StringUtils.isNotBlank(requestSrc)) {
@@ -795,14 +783,6 @@
dto.setTitlePath(titlePath);
request.setAttribute(CentralConstants.ATTR_NODE, dto);
- // Set doNotShowAgain parameter
- HttpSession session = SessionManager.getSession();
- UserDTO userDto = (UserDTO) session.getAttribute(AttributeNames.USER);
- boolean doNotShowAgain = (userDto.getPagesWithDisabledTutorials() != null)
- && userDto.getPagesWithDisabledTutorials().contains(PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
- request.setAttribute(AttributeNames.ATTR_DO_NOT_SHOW_AGAIN, doNotShowAgain);
- request.setAttribute(AttributeNames.ATTR_PAGE_STR, PedagogicalPlannerAction.PAGE_STRING_START_PLANNER);
-
if (edit) {
// If we are in edit mode, the node form is displayed, requiring additional parameters
PedagogicalPlannerSequenceNodeForm nodeForm = (PedagogicalPlannerSequenceNodeForm) form;
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_central/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8)
+++ lams_central/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -63,7 +63,6 @@
-
@@ -659,14 +658,6 @@
redirect="false"
/>
-
- null${activeOrgId};
$(document).ready(function(){
- <%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
+ <%-- If it's the user's first login, show tour --%>
-
-
-
- if (!confirm("")){
- $.get("${disableAllTutorialVideosUrl}");
- }
+ startTour();
Index: lams_central/web/profile/editprofile.jsp
===================================================================
diff -u -r74a2b3a59c65dff1bd5bf94988fa6fb9ae24160a -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_central/web/profile/editprofile.jsp (.../editprofile.jsp) (revision 74a2b3a59c65dff1bd5bf94988fa6fb9ae24160a)
+++ lams_central/web/profile/editprofile.jsp (.../editprofile.jsp) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -209,23 +209,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -386,24 +369,6 @@
${timeZone}
-
-
-
-
-
-
-
-
-
-
-
-
-
Fisheye: Tag 7acb20e485013e119c7dfd90854f123c09f147cb refers to a dead (removed) revision in file `lams_central/web/tutorialVideo.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml (.../User.hbm.xml) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -362,15 +362,6 @@
-
-
- @hibernate.property
- column="tutorials_disabled"
- length="1"
-
-
-
@@ -389,14 +380,6 @@
-
-
-
-
-
-
-
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180731.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180731.sql (revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180731.sql (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4639 Remove tutorials stub
+ALTER TABLE lams_user DROP COLUMN tutorials_disabled;
+DROP TABLE lams_user_disabled_tutorials;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 5cf9e6a0f2d86fd8371a466a07b8c0cbf3f81cb8)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java (.../User.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -161,12 +161,6 @@
/** persistent field */
private Boolean changePassword;
- /** persistent field */
- private Boolean tutorialsDisabled;
-
- /** persistent field */
- private Set pagesWithDisabledTutorials = new HashSet();
-
/** persistent field - latch */
private Boolean firstLogin;
@@ -508,13 +502,9 @@
TimeZone timeZone = TimeZone.getTimeZone(getTimeZone());
- Set tutorialPages = (pagesWithDisabledTutorials == null) || pagesWithDisabledTutorials.isEmpty() ? null
- : pagesWithDisabledTutorials;
-
return new UserDTO(userId, firstName, lastName, login, languageIsoCode, countryIsoCode, direction, email,
theme != null ? new ThemeDTO(theme) : null, timeZone, authenticationMethod.getAuthenticationMethodId(),
- fckLanguageMapping, (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not set
- tutorialPages, (firstLogin == null ? true : false), // assume no firstLogin value means they haven't logged in
+ fckLanguageMapping, (firstLogin == null || firstLogin ? true : false), // assume no firstLogin value means they haven't logged in
lastVisitedOrganisationId, portraitUuid);
}
@@ -610,22 +600,6 @@
this.timeZone = timeZone;
}
- public Boolean getTutorialsDisabled() {
- return tutorialsDisabled;
- }
-
- public void setTutorialsDisabled(Boolean tutorialsDisabled) {
- this.tutorialsDisabled = tutorialsDisabled;
- }
-
- public Set getPagesWithDisabledTutorials() {
- return pagesWithDisabledTutorials;
- }
-
- public void setPagesWithDisabledTutorials(Set pagesWithDisabledTutorials) {
- this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
- }
-
public Boolean isFirstLogin() {
return firstLogin;
}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
===================================================================
diff -u -r376e99b362b0ea18df73f848d310201270b26239 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision 376e99b362b0ea18df73f848d310201270b26239)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java (.../UserDAO.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -92,7 +92,7 @@
Long portraitUuid = element[5] != null ? ((Number) element[5]).longValue() : null;
UserDTO userDto = new UserDTO(userId, firstName, lastName, login, null, null, null, email, null, null, null,
- null, true, null, false, null, portraitUuid);
+ null, false, null, portraitUuid);
userDtos.add(userDto);
}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java (.../UserDTO.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -24,7 +24,6 @@
package org.lamsfoundation.lams.usermanagement.dto;
import java.io.Serializable;
-import java.util.Set;
import java.util.TimeZone;
import org.apache.commons.lang.builder.ToStringBuilder;
@@ -49,17 +48,14 @@
private ThemeDTO theme;
private TimeZone timeZone;
private Integer authenticationMethodId;
- private Boolean tutorialsDisabled;
- private Set pagesWithDisabledTutorials;
private Boolean firstLogin;
private Integer lastVisitedOrganisationId;
private Long portraitUuid;
public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage,
String localeCountry, String direction, String email, ThemeDTO htmlTheme, TimeZone timezone,
- Integer authenticationMethodId, String fckLanguageMapping, Boolean tutorialsDisabled,
- Set pagesWithDisabledTutorials, Boolean firstLogin, Integer lastVisitedOrganisationId,
- Long portraitUuid) {
+ Integer authenticationMethodId, String fckLanguageMapping, Boolean firstLogin,
+ Integer lastVisitedOrganisationId, Long portraitUuid) {
this.userID = userID;
this.firstName = firstName;
this.lastName = lastName;
@@ -72,8 +68,6 @@
timeZone = timezone;
this.authenticationMethodId = authenticationMethodId;
this.fckLanguageMapping = fckLanguageMapping;
- this.tutorialsDisabled = tutorialsDisabled;
- this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
this.firstLogin = firstLogin;
this.lastVisitedOrganisationId = lastVisitedOrganisationId;
this.setPortraitUuid(portraitUuid);
@@ -170,30 +164,13 @@
.append("localeLanguage", getLocaleLanguage()).append("localeCountry", getLocaleCountry())
.append("direction", getDirection()).append("email", getEmail()).append("htmlTheme", getTheme())
.append("timeZone", getTimeZone()).append("authenticationMethodId", getAuthenticationMethodId())
- .append("fckLanguageMapping", getFckLanguageMapping())
- .append("tutorialsDisabled", "" + getTutorialsDisabled()).toString();
+ .append("fckLanguageMapping", getFckLanguageMapping()).toString();
}
public String getFckLanguageMapping() {
return fckLanguageMapping;
}
- public Boolean getTutorialsDisabled() {
- return tutorialsDisabled;
- }
-
- public void setTutorialsDisabled(Boolean tutorialsDisabled) {
- this.tutorialsDisabled = tutorialsDisabled;
- }
-
- public Set getPagesWithDisabledTutorials() {
- return pagesWithDisabledTutorials;
- }
-
- public void setPagesWithDisabledTutorials(Set pagesWithDisabledTutorials) {
- this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
- }
-
public Boolean isFirstLogin() {
return firstLogin;
}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java
===================================================================
diff -u -rd5b05f6e239a87908856f9f4251a487158ed9ca8 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java (.../LdapService.java) (revision d5b05f6e239a87908856f9f4251a487158ed9ca8)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/LdapService.java (.../LdapService.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -20,7 +20,6 @@
* ****************************************************************
*/
-
package org.lamsfoundation.lams.usermanagement.service;
import java.io.IOException;
@@ -68,7 +67,7 @@
private Logger log = Logger.getLogger(LdapService.class);
private IUserManagementService service;
-
+
private ITimezoneService timezoneService;
private static final int BULK_UPDATE_CREATED = 0;
@@ -155,10 +154,9 @@
user.setCreateDate(new Date());
user.setLocale(getLocale(map.get("locale")));
user.setTimeZone(timezoneService.getServerTimezone().getTimezoneId());
- user.setTutorialsDisabled(false);
user.setFirstLogin(true);
service.saveUser(user);
- service.logUserCreated(user, (User)null);
+ service.logUserCreated(user, (User) null);
return true;
} else {
log.error("===> Login name from LDAP is empty - user not created.");
@@ -617,15 +615,15 @@
}
return null;
}
-
+
// ---------------------------------------------------------------------
// Inversion of Control Methods - Method injection
// ---------------------------------------------------------------------
public void setService(IUserManagementService service) {
this.service = service;
}
-
+
public void setTimezoneService(ITimezoneService timezoneService) {
this.timezoneService = timezoneService;
}
Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
===================================================================
diff -u -r092ede3b8b3828ffa688c4db18c5d535e3364b98 -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 092ede3b8b3828ffa688c4db18c5d535e3364b98)
+++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -103,10 +103,5 @@
public static final String COMMAND_GET_EDITING_ADVICE = "getEditingAdvice";
public static final String COMMAND_CHECK_EDITING_ADVICE = "checkEditingAdvice";
public static final String PARAM_ACTIVITY_INDEX = "activityIndex";
-
- // for tutorial videos
- public static final String ATTR_PAGE_STR = "pageString";
- public static final String ATTR_DO_NOT_SHOW_AGAIN = "doNotShowAgain";
- public static final String ATTR_SHOW_TUTORIAL = "showTutorial";
public static final String PARAM_TOOL_CONTENT_HANDLER_NAME = "toolContentHandler";
}
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblUserDTO.java
===================================================================
diff -u -rd7ed1173946998f754a2efef09d68c9e3bfe307f -r7acb20e485013e119c7dfd90854f123c09f147cb
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblUserDTO.java (.../TblUserDTO.java) (revision d7ed1173946998f754a2efef09d68c9e3bfe307f)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/TblUserDTO.java (.../TblUserDTO.java) (revision 7acb20e485013e119c7dfd90854f123c09f147cb)
@@ -10,7 +10,7 @@
public TblUserDTO(UserDTO userDto) {
super(userDto.getUserID(), userDto.getFirstName(), userDto.getLastName(), userDto.getLocaleCountry(),
userDto.getLocaleLanguage(), userDto.getLocaleCountry(), userDto.getDirection(), userDto.getEmail(),
- userDto.getTheme(), userDto.getTimeZone(), null, null, null, null, null, null, userDto.getPortraitUuid());
+ userDto.getTheme(), userDto.getTimeZone(), null, null, null, null, userDto.getPortraitUuid());
}
public void setGroupLeader(boolean groupLeader) {