Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,913 +1,914 @@
-appName = lams_central 
-#language code: en 
-#locale code: AU 
-
- # Exported from the LAMS Community by Ernie Ghiglione on Fri Dec 28 00:41:13 CST 2018 
- 
-#=================== labels for LAMS Central =================# 
-
-label.username  =Username
-label.password  =Password
-error.authorisation  =You are not authorised to do this.
-heading.general.error  =Error
-error.general.1  =Sorry, there has been an error.
-error.general.2  =There is a problem processing this request. Close the browser window and try again.
-error.general.3  =If the problem persists please contact your system administrator.
-error.newpassword.mismatch  =Your new passwords do not match each other.
-error.oldpassword.mismatch  =Your old password is not correct.
-heading.password.change.screen  =Change password
-label.password.old.password  =Old password
-label.password.new.password  =New password
-label.password.confirm.new.password  =Confirm new password
-heading.password.changed.screen  =Password changed
-msg.password.changed  =Your password has been changed.
-error.login  =Sorry, that username or password is not known. Please try again.
-button.login  =Login
-label.user.guide  =[HELP]
-msg.loading  =Loading...
-msg.LAMS.version  =Version
-msg.LAMS.copyright.short  =2002 onwards LAMS Foundation.
-button.save  =Save
-button.cancel  =Cancel
-no.such.learningdesign.exist  =No Learning Design with learning_design_id of:{0} exists.
-no.such.user.exist  =No such User with a user_id of: {0} exists.
-no.such.workspace.exist  =No such WorkspaceFolder with workspace_folder_id of:{0} exists.
-delete.resource.error  =Cannot delete the resource: {0}
-delete.lesson.error  =LAMS does not support deleting a lesson via the workspace interface.
-delete.folder.error  =Cannot delete this folder as it is the Root folder.
-delete.learningdesign.error  =Cannot delete design with learning_design_id of : {0} as it is READ ONLY.
-folder.delete  =Folder deleted:{0}
-copy.resource.error  =Cannot copy the resource:{0}
-copy.resource.error.value.miss  =copyResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID
-copy.no.support  =LAMS does not support copying a file via the workspace interface.
-unable.copy  =Unable to copy learning design due to an error{0}.
-no.such.user  =No such user with a userID of {0} exists.
-no.such.workspace  =No such workspaceFolder with a workspace_folder_id of {0} exists.
-learningdesign.delete  =Learning design deleted:{0}
-learningdesign.readonly  =Cannot delete design with learning_design_id of:{0} as it is READ ONLY.
-move.resource.error  =Cannot move the resource:{0}
-unsupport.move  =LAMS does not support moving a file via the workspace interface.
-creating.workspace.folder.error  =Exception occured while creating workspaceFolderContent:{0}.
-resource.already.exist  =The resource {0} already exists in the repository: {1}.
-no.such.content  =No such content with versionID of {0} found in repository {1}.
-content.delete.success  =Content successfully deleted.
-rename.resource.error  =Cannot rename the resource: {0}
-rename.resource.unspport  =LAMS does not support renaming a file via the workspace interface.
-folder.already.exist  =A folder with given name ''{0}'' already exists.
-organisations  =Courses
-folders  =Folders
-title.lams  =LAMS
-title.login.window  =Login - LAMS :: Learning Activity Management System
-title.system.admin.window  =System Admin:: LAMS
-msg.loading.system.admin.window  =Loading
-title.admin.window  =Admin:: LAMS
-msg.loading.admin.window  =Loading Administration Environment.
-msg.loading.add.lesson.window  =Loading Add Lesson Wizard.
-title.monitor.lesson.window  =Monitor Lesson:: LAMS
-msg.loading.monitor.lesson.window  =Loading Lesson Monitoring Environment.
-title.learner.window  =Learner:: LAMS
-msg.loading.learner.window  =Loading Learner Environment.
-title.error.window  =LAMS :: Error
-authoring.msg.save.success  =Congratulations, your content saved successfully!
-label.authoring.close  =Close
-index.welcome  =Welcome
-index.logout  =Logout
-index.refresh  =Refresh
-index.myprofile  =Profile
-index.sysadmin  =Sys Admin
-index.courseman  =Course Mgt
-index.author  =Author
-index.classman  =Manage Subcourses
-index.addlesson  =Add Lesson
-index.monitor  =Monitor
-index.dummymonitor  =Dummy Monitor
-index.qb.collections =Question collections
-title.import.result  =Import tool content result
-title.import  =Import tool content
-title.import.instruction  =Please choose LAMS sequence to import.
-title.import.instruction.antivirus =An antivirus scan will be performed. It can take a while.
-title.export.loading  =Export tool content loading
-label.ld.zip.file  =Learning design import file
-msg.import.success  =Learning design and activities imported successfully.
-msg.import.ld.success  =Learning design imported successfully.
-msg.import.tool.error.prefix  =But there are some tool(s) imports that failed
-msg.import.failed  =Learning design import failed
-msg.export.loading  =Learning design download will start automatically in seconds, please wait...
-msg.export.success  =Learning design and activities export successfully.
-msg.export.ld.success  =Learning design export successfully.
-msg.export.tool.error.prefix  =But there are some tool(s) exported failed
-msg.export.failed  =Learning design export failed
-msg.reason.is  =The reason is
-button.close  =Close
-button.import  =Import
-msg.LAMS.copyright.statement.1  =LAMS\u2122 \u00a9 2002 onwards LAMS Foundation
-msg.LAMS.copyright.statement.2  =LAMS is a trademark of LAMS Foundation (http://lamsfoundation.org).
-msg.LAMS.copyright.statement.3  =This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.
-title.export  =Export tool content
-error.system.error  =An error has occurred. Please start again. Reason for error: {0}
-msg.hide.detail  =Hide detail
-msg.show.detail  =Show detail
-msg.no.more.detail  =No more detail
-404.title  =Page not found
-404.message  =The page you requested was not found.
-403.title  =Your current role does not allow you to view this page. Please contact your system administrator if you believe you should have access to this page.
-msg.import.failed.unknown.reason  =No error message available.
-msg.import.file.not.found  =Selected file has not been uploaded by your browser. Please try again.
-title.profile.edit.screen  =Edit profile
-label.name  =Name
-label.title  =Title
-label.first_name  =First name
-label.last_name  =Last name
-label.address_line_1  =Address 1
-label.address_line_2  =Address 2
-label.address_line_3  =Address 3
-label.city  =City
-label.state  =State
-label.country  =Country
-label.day_phone  =Work phone
-label.evening_phone  =Home phone
-label.mobile_phone  =Mobile
-label.fax  =Fax
-label.email  =Email
-label.language  =Language
-title.password.change.screen  =Change password
-msg.groups.empty  =No groups
-label.postcode  =Postcode
-label.portrait.current  =Current Portrait
-label.portrait.upload  =Upload
-msg.portrait.none  =No portrait uploaded
-title.portrait.change.screen  =Portrait
-title.change.portrait.window  =LAMS :: Change portrait
-error.portrait.not.image  =The file is not an image (PNG, GIF, JPG, WBMP and BMP formats allowed).
-msg.portrait.resized  =The image formats allowed are: PNG, GIF, JPG, WBMP and BMP.
-label.workspace.root_folder  =My workspace
-msg.design.not.saved  =Your design is not saved, any changes you have made since you last saved will be lost.
-error.firstname.required  =First name is required.
-error.lastname.required  =Last name is required.
-error.email.required  =Email address is required.
-error.valid.email.required  =Valid email address is required.
-message.lesson.not.started.cannot.participate  =This lesson has not been started. You cannot participate in the lesson until it is started.
-index.mycourses  =Courses
-title.export.choose.format  =Choose export content format
-msg.export.choose.format.instruction  =Please choose format which you want to export
-msg.export.choose.format.lams  =LAMS format
-button.export  =Export
-label.open.lesson  =Open Lesson
-label.msg.status  =Status: {0}
-msg.status.not.stated  =This lesson has not been started so you cannot access it.
-msg.status.disabled  =This lesson is disabled so you cannot access it.
-msg.status.finished  =This lesson has been finished or archived.
-msg.status.removed  =This lesson has been removed.
-msg.browser.compat  =Your browser does not support features required by LAMS. Please upgrade your browser.
-label.disabled  =Disabled
-label.archived  =Archived
-audit.user.password.change  =Password changed for: {0}
-title.author.window  =LAMS :: Author
-title.all.my.lessons  =All lessons
-msg.no.lessons  =No lessons
-label.return.to.myprofile  =Return to profile
-label.help  =Help?
-label.completed  =Completed!
-label.enable.lesson.sorting  =Enable lesson sorting
-label.lesson.sorting.enabled  =lesson sorting enabled
-label.show.groups  =Show Groups
-label.forgot.password  =Forgot your password?
-button.select.importfile  =Select file to import
-label.yes  =Yes
-label.no  =No
-label.ok  =OK
-title.forgot.password  =LAMS :: Forgot password
-forgot.password.email.subject  =LAMS server - Forgot password response
-forgot.password.email.body  =Click the link below and it will take you to a page where you can change your password.
-error.support.email.not.set  =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your system administrator.
-error.password.request.expired  =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request.
-label.forgot.password.instructions.1  =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.
-label.forgot.password.instructions.2  =If you do not know your email address in LAMS, please contact your system administrator.
-label.forgot.password.email  =By email
-label.forgot.password.username  =By username
-error.forgot.password.fields  =Both fields are required. Please try again.
-error.email.not.sent  =Server failed to send email to recipient. Please contact your system administrator.
-error.forgot.password.email  =Please enter an email address.
-error.forgot.password.username  =Please enter a username.
-button.select.another.importfile  =Select another file to import
-error.forgot.password.incorrect.key  =The request key is incorrect or has already been used. Please click the "Forgot your Password" link again to make a new request.
-lessonsearch.title  =Search learners in lesson
-lessonsearch.instuctions  =Please enter the login, first or last name of the learner.
-lessonsearch.results  =Lessons in which ''''{0}'''' has been found
-index.searchlesson  =Learner Search
-index.searchlesson.tooltip  =Search learners across lessons
-lessonsearch.noresults  =No Lessons found
-error.multiple.emails  =There are multiple users in LAMS with the given email. Email could not be sent. Please try again using your username, or contact your system administrator.
-public.folder  =Public Folder
-index.coursegradebook  =Course Gradebook
-index.coursegradebook.tooltip  =Open course-wide Gradebook monitoring page
-index.coursegradebook.learner  =Gradebook
-index.coursegradebookmonitor  =Mark
-index.moreActions  =More Options
-label.required  =Required
-label.timezone.title  =Time zone
-email.to  =To
-email.subject  =Subject
-email.send  =Send
-email.compose.mail  =Compose email
-index.coursegradebook.subgroup  =Subcourse Gradebook
-error.finish.date.passed  =The time allocated for this lesson has expired. You cannot access it anymore. Contact the instructor for assistance.
-index.emailnotifications  =Notifications
-index.emailnotifications.tooltip  =Email notifications
-label.portrait.please.wait  =Please wait
-label.portrait.take.snapshot.from.webcamera  =Webcam
-label.portrait.configure  =Configure
-label.portrait.take.snapshot  =Take pic
-label.portrait.do.you.like.results  =Is this good?
-label.portrait.yes.set.it.as.portrait  =Set as portrait
-label.portrait.no.take.another.one  =Take another one
-error.edit.disabled  =Profile editing is disabled.
-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.portrait.create.new.portrait  =Select an image to upload or use your computer's webcam to create your portrait.
-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.conditions.flag.tooltip  =Participation in the lesson is conditional
-label.conditions.box.title  =Lesson "{0}" will only be available after these lesson(s) are completed:
-label.conditions.box.no.dependency  =There are no dependencies for this lesson.
-label.conditions.box.add.dependency  =Select lesson that will need to be completed first:
-label.conditions.box.remove.dependency  =Remove lesson dependency
-label.conditions.box.finish.global.date  =Lesson finishes for everyone after {0} days from its start {1}
-label.conditions.box.finish.individual.date  =Lesson finishes after {0} days after user started participating
-label.conditions.box.finish.no.date  =Lesson does not have a fixed number days to finish
-label.set  =Set
-error.conditions.box.finish.date  =Error while setting lesson finish date: {0}
-advanced.tab.form.time.limits.label  =Time limits
-advanced.tab.form.enter.number.days.label  =Enter number days
-advanced.tab.form.individual.not.entire.group.label  =Individual and not for the entire group
-label.start.lesson  =Start lesson
-success.msg.1  =You have successfully registered an account with LAMS.
-success.login  =Login now
-success.errors  =Had trouble sending email. Error was
-login.username  =Username
-login.password  =Password
-login.course.key  =Course key
-login.submit  =Submit
-signup.username  =Username
-signup.password  =Password
-signup.confirm.password  =Confirm password
-signup.first.name  =First name
-signup.last.name  =Last name
-signup.email  =Email
-signup.confirm.email  =Confirm email
-signup.course.key  =Course key
-signup.submit  =Submit
-title.lams.signup  =LAMS Signup
-error.username.blank  =Username cannot be blank
-error.username.exists  =Username is taken
-error.first.name.blank  =First name cannot be blank
-error.last.name.blank  =Last name cannot be blank
-error.password.blank  =Password cannot be blank
-error.passwords.unequal  =Passwords did not match
-error.email.blank  =Email cannot be blank
-error.emails.unequal  =Email addresses did not match
-error.email.invalid.format  =Email format is invalid
-error.course.key.invalid  =This course key is incorrect. Please try again or contact your course administrator for the correct key
-error.login.or.password.incorrect  =Login or password is incorrect. If you have not previously signed up for LAMS, please sign up {0}here{1}.
-register.if.you.want.to.signup  =If you want to sign up to LAMS as a new user, please select "Sign up" tab. If you already have an account, please select "Login" one.
-register.signup.to.lams  =Sign up
-register.login  =Login
-index.remove.lesson  =Remove
-index.remove.lesson.tooltip  =Permanently remove this lesson
-label.edit  =Edit
-label.lesson.name  =Lesson name
-label.instructions  =Lesson instructions
-label.cancel  =Cancel
-label.display.lesson.design  =Display learning design image?
-index.remove.lesson.confirm1  =You are about to remove this lesson. Are you sure?
-index.remove.lesson.confirm2  =Once you remove this lesson you CANNOT bring it back. Are you positive that you want to remove this lesson?
-label.questions.choice.type.mc  =Multiple Choice
-label.questions.choice.type.tf  =True-False
-label.questions.choice.type.mt  =Matching
-label.questions.choice.type.mr  =Multiple response
-label.questions.choice.type.fb  =Fill-in-Blank
-label.questions.choice.type.es  =Essay
-label.questions.choice.type.unknown  =Unknown
-error.lesson.not.accessible.for.learners  =Sorry, this lesson is now disabled/archived. Contact your instructor for further details.
-button.add.now  =Add now
-label.tab.lesson  =Lesson
-label.tab.class  =Class
-label.tab.advanced  =Advanced
-label.tab.conditions  =Conditions
-label.tab.lesson.title  =Select the sequence to add a lesson, and click on Add now
-label.tab.class.title  =Use drag n' drop to select or unselect monitors and learners
-label.tab.lesson.name  =Lesson name:
-label.tab.lesson.size.full  =(show full size)
-label.tab.lesson.size.fit  =(fit to window)
-label.tab.lesson.sequence.folder  =Run sequences
-error.tab.lesson.sequence  =A valid sequence must be selected
-label.tab.class.monitors.unselected  =Monitors unselected
-label.tab.class.monitors.selected  =Monitors selected
-label.tab.class.learners.unselected  =Learners unselected
-label.tab.class.learners.selected  =Learners selected
-error.tab.class.learners  =There must be at least 1 learner selected
-error.tab.class.monitors  =There must be at least 1 monitor selected
-label.tab.advanced.details  =Details
-label.tab.advanced.intro.enable  =Enable lesson intro
-label.tab.advanced.intro.description  =Description:
-label.tab.advanced.intro.image  =Display design image
-label.tab.advanced.section.advanced  =Advanced options
-label.tab.advanced.field.monitor  =Start in Monitor
-label.tab.advanced.field.liveedit  =Enable Live Edit
-label.tab.advanced.field.notification  =Enable lesson notifications
-label.tab.advanced.field.presence  =Allow learners to see who is online
-label.tab.advanced.field.im  =Enable Instant Messaging
-label.tab.advanced.field.split  =Split learners into separate copies of this lesson
-label.tab.advanced.field.split.number  =No. learners per lesson
-label.tab.advanced.field.scheduling  =Enable scheduling
-label.tab.advanced.split.desc  =[0] instances of this lesson will be created and approximately [1] will be allocated to each lesson
-label.tab.conditions.dependencies  =Dependencies
-label.tab.conditions.dependencies.desc  =Select a lesson that learners will need to complete before they can see the lesson you are about to create.
-label.tab.conditions.timelimit  =Time limitations
-label.tab.conditions.timelimit.desc  =Set the number of days the lesson will be available to learners. After this period the lesson will no longer be shown. If the time should count from the moment the learner starts the lesson, select the option for individual time limit. <b>If you are scheduling the lesson end on the Advanced tab then you can only set an individual time limit.</b>
-label.tab.conditions.timelimit.days  =Number days:
-label.tab.conditions.timelimit.individual  =Is this time limit for each individual?
-label.tab.conditions.enable  =Enable
-label.questions.file.title  =Choose IMS QTI file
-label.questions.file.missing  =Please select a ZIP or XML file with questions in IMS QTIformat.
-label.questions.choice.title  =Choose questions
-label.questions.choice.select.all  =Select all
-label.questions.choice.missing  =Please check at least one question.
-index.single.activity.lesson.title  =Add single activity lesson
-index.single.activity.lesson.desc  =or one-click activity:
-label.disable.lesson.sorting  =Disable lesson sorting
-index.gradebook.course.title  =Gradebook Course Monitor
-index.gradebook.lesson.title  =Gradebook Lesson Monitor
-index.gradebook.learner.title  =Course Gradebook Learner
-index.conditions.title  =Conditions to participate in this lesson
-index.search.lesson.title  =Search learners across lessons
-index.orggroup  =Course groupings
-index.course.groups.title  =Course groupings
-label.course.groups.grouping.title  =Groupings
-label.course.groups.grouping.create  =Create new
-label.course.groups.grouping.remove.confirm  =Are you sure you want to delete this grouping?
-label.course.groups.name  =Grouping name:
-label.course.groups.name.blank  =Grouping name can not be blank.
-label.course.groups.edit.title  =Please use drag n' drop to move learners between groups.
-label.course.groups.viewonly.title  =Course group view
-label.course.groups.prefix  =Group
-label.course.groups.remove.confirm  =Are you sure you want to delete this group?
-label.course.groups.remove.empty.confirm  =Some groups are new and empty. They will not be saved. Click OK to continue.
-label.course.groups.add  =Add a new group
-label.course.groups.unassigned  =Unassigned learners
-label.course.groups.sort.tooltip  =Sort learners
-label.course.groups.remove.tooltip  =Remove
-label.course.groups.back  =Groupings
-label.course.groups.grouping.count.tooltip  =Number of groups in this grouping
-label.course.groups.grouping.use.confirm  =Are you sure you want to use grouping "[0]"? Groups will be created for this lesson and learners assigned to them.
-label.course.groups.locked  =Some users in this group already used the grouping. The group is now locked: you can not remove it or move users to another group.
-label.course.groups.locked.transfer  =Are you sure you want to move these users to a locked group? You will not be allowed to move them to another group later.
-label.tab.advanced.field.restart  =Learners always start from the first activity
-error.firstname.invalid.characters  =First name contains invalid characters
-error.lastname.invalid.characters  =Last name contains invalid characters
-error.username.invalid.characters  =Username can only contain alphanumeric characters and no spaces.
-error.lessonname.invalid.characters  =Lesson name contains invalid characters
-audit.admin.loginas  =Sysadmin {0} has logged in as {1}
-index.monitoring.title  =Monitoring
-heading.comments  =Comments
-label.hidden  =Comment hidden
-label.reply  =Reply
-label.hide  =Hide
-label.show  =Show
-label.post  =Post
-label.refresh  =Refresh comments
-error.cannot.redisplay.please.refresh  =Your changes have been saved but cannot be redisplayed. Please select refresh to reload the comments.
-error.please.refresh  =An error has occurred. Your post may not have been saved. Please select refresh to start again
-label.showhide.prompt  =Show/Hide replies
-message.complete.or.cancel.reply  =Please complete or cancel the current reply before starting a new reply.
-message.complete.or.cancel.edit  =Please complete or cancel the current edit before starting a new reply.
-label.show.more.messages  =More comments
-label.likes  =Likes
-label.comment.body.validation  =The comment must be between 1 and 5000 character
-label.edited  =Edited
-label.like  =Like
-label.dislike  =Dislike
-label.no.comments  =No comments
-label.newest.first  =Newest first
-label.top.comments  =Top comments
-label.add.sticky  =Stick to top
-label.remove.sticky  =Remove sticky
-label.private.notifications.title  =Notifications
-label.private.notifications.messages  =Messages
-label.private.notifications.read  =Read
-label.private.notifications.read.hint  =Mark notification as read
-label.private.notifications.read.all.hint  =Mark all notifications as read
-label.select.groups  =Select groups
-authoring.fla.course.groups.to.branches.match.dialog.title  =Match Course Groups to Branching Groups
-authoring.fla.branch.mapping.course.groups.header  =Course groups
-authoring.fla.branch.mapping.branching.groups.header  =Branching groups
-authoring.fla.branch.mapping.ordered.asc =Start with branches mapped to highest ordered answers
-label.tab.advanced.field.force.restart  =Learners always start from the first activity
-label.tab.advanced.field.allow.restart  =Learners can restart the lesson
-label.verification.code  =Verification code
-error.verification.code  =Sorry, entered verification code is incorrect. Please try again.
-label.your.new.shared.secret  =Your new shared secret: {0}
-label.2FA.shared.secret  =Two-factor authentication shared secret
-label.2FA.login.panel  =Two-factor authentication required
-label.remove.org.favorite  =Remove organisation from favorite ones
-label.mark.org.favorite  =Mark organisation as favorite
-label.email.send.me.a.copy  =Send me a copy
-label.password.max.length  =must be less than 25 characters
-label.password.min.length  =must be at least {0} characters long
-label.password.old.must.entered  =Old password must be entered
-label.password.symbols.allowed  =Only these symbols are allowed
-label.password.restrictions  =Password must follow the restrictions shown above
-label.password.must.contain  =Password must contain
-label.password.must.ucase  =at least 1 upper case letter
-label.password.must.number  =at least 1 number
-label.password.must.symbol  =at least 1 symbol
-label.create.lesson  =Create new lesson
-label.organisations  =Select course with the lessons that needs to be export
-label.lesson.id  =Lesson ID
-label.display.design.image  =Display sequence image?
-label.select.sequence  =You must select a sequence before proceeding
-label.choose.sequence  =Choose sequence
-label.author.sequence  =Author new LAMS sequence
-label.open.monitor  =Open Monitor
-label.your.progress  =Your lesson progress
-label.you.completed.this.lesson  =You have completed this lesson.
-label.total.activities.depend.on.path  =Total activities depend on your learning path.
-label.lesson.not.completed  =Lesson is not yet completed.
-label.you.completed.activities  =You have completed {0} activities
-error.cannot.load.thumbnail  =Unable to load sequence thumbnail.
-label.lesson.introduction.updated  =Introduction updated
-no.such.signup.page.exist  =No such signup page exists
-error.lockedout  =Due to consecutive failed attempts, the account has been locked out temporarily.
-error.email.internal  =An internal error occured. Try again using your username or contact your system administrator. More information is provided in application logs.
-label.theme  =Theme
-authoring.fla.default.group.title  =Grouping
-authoring.fla.default.group.prefix  =Group
-authoring.fla.default.branching.title  =Branching
-authoring.fla.default.branch.prefix  =Branch
-authoring.fla.default.optional.activity.title  =Optional Activity
-authoring.fla.support.activity.title  =Support Activity
-authoring.fla.gate.activity.label  =STOP
-authoring.fla.branching.start.suffix  =start
-authoring.fla.branching.end.suffix  =end
-authoring.fla.activity.dialog.title.suffix  =Authoring
-authoring.fla.remove.activity.confirm  =Are you sure you want to remove the whole branching activity?
-authoring.fla.branching.create.confirm  =Transition from this activity already exists.\\nDo you want to create branching here?
-authoring.fla.transition.to.exists.error  =Transition to this activity already exists.
-authoring.fla.circular.sequence.error  =You are not allowed to have a circular sequence.
-authoring.fla.activity.in.container.error  =You can not add this type of activity to an optional/support activity.
-authoring.fla.default.annotation.label.title  =Label
-authoring.fla.region.fit.button.tooltip  =Fit
-authoring.fla.new.folder.button  =New
-authoring.fla.copy.button  =Copy
-authoring.fla.paste.button  =Paste
-authoring.fla.delete.button  =Delete
-authoring.fla.rename.button  =Rename
-authoring.fla.open.button  =Open
-authoring.fla.save.button  =Save
-authoring.fla.import.button  =Import
-authoring.fla.folder  =folder
-authoring.fla.sequence  =sequence
-authoring.fla.sequence.not.valid  =The sequence is not valid.<br />It needs to be corrected before it can be used in lessons.
-authoring.fla.sequence.validation.issues  =While saving the sequence there were following validation issues:
-authoring.fla.save.successful  =The design is valid and has been saved.
-authoring.fla.liveedit.save.successful  =Changes were successfully applied.
-authoring.fla.navigate.away.confirm  =Your design is not saved.\\nAny changes you made since you last saved will be lost.
-authoring.fla.delete.node.confirm  =Are you sure you want to delete this
-authoring.fla.sequence.overwrite.confirm  =Are you sure you want to overwrite the existing sequence?
-authoring.fla.new.folder.title.prompt  =Please enter the name for a new folder
-authoring.fla.rename.title.prompt  =Please enter the new name for
-authoring.fla.save.sequence.title.prompt  =Please enter a title for the sequence
-authoring.fla.import.part.choose.prompt  =Click on activities to choose them for import
-authoring.fla.folder.not.selected.error  =Please choose a folder
-authoring.fla.title.validation.error  =The title must not be blank and must not contain any of these characters < > ^ * @ % $
-authoring.fla.folder.exists.error  =A folder with this name already exists.
-authoring.fla.sequence.exists.error  =A sequence with this name already exists.
-authoring.fla.sequence.save.error  =Error while saving sequence
-authoring.fla.svg.save.error  =Error while saving sequence thumbnail
-authoring.fla.sequence.not.selected.error  =Please choose a sequence
-authoring.fla.sequence.load.error  =Error while loading the sequence
-authoring.fla.transition.from.exists.error  =Transition from this activity already exists
-authoring.fla.export.sequence.dialog.title  =Sequence export
-authoring.fla.activity.copy.title.prefix  =Copy [0] of
-authoring.fla.preview.lesson.default.title  =Preview
-authoring.fla.save.dialog.title  =Save sequence
-authoring.fla.open.dialog.title  =Open sequence
-authoring.fla.import.dialog.title  =Import Learning Design
-authoring.fla.import.part.dialog.title  =Import activities
-authoring.fla.run.sequences.folder  =Run sequences
-authoring.fla.arrange.confirm  =There are annotations on the canvas.\\n\ They will be not arranged automatically, you will have to adjust them manually later.\\n\ Do you want to continue?
-authoring.fla.clear.canvas.confirm  =You have got unsaved changes. They will be lost. Do you want to continue?
-authoring.fla.branching.start.place.prompt  =Place the branching point
-authoring.fla.branching.end.place.prompt  =Place the converge point
-authoring.fla.annotation.region.place.prompt  =Click and hold to start drawing an annotation region
-authoring.fla.annotation.label.place.prompt  =Click to add an annotation label
-authoring.fla.optional.activity.place.prompt  =Click to add an optional activity container.
-authoring.fla.support.activity.place.prompt  =Click to add a support activity container.
-authoring.fla.transition.place.prompt  =Click on an activity
-authoring.fla.paste.error  =Sorry, you can not paste this type of activity
-authoring.fla.preview.error  =Error while initialising lesson for preview
-authoring.fla.cross.branching.error  =Cross-branching transitions are not allowed
-authoring.fla.support.transition.error  =Support activities can not be connected to any other activity
-authoring.fla.end.match.error  =: a branch that ends in this branching does not start in it
-authoring.fla.ok.button  =OK
-authoring.fla.cancel.button  =Cancel
-authoring.fla.clear.all.button  =Clear all
-authoring.fla.refresh.button  =Refresh
-authoring.fla.remove.condition.button  =Remove
-authoring.fla.properties.dialog.title  =Properties
-authoring.fla.group.naming.dialog.title  =Group Naming
-authoring.fla.groups.to.branches.match.dialog_title  =Match Groups to Branches
-authoring.fla.branch.mapping.groups.header  =Groups
-authoring.fla.branch.mapping.group.header  =Group
-authoring.fla.conditions.dialog.title  =Select Output Conditions for Input
-authoring.fla.branch.mapping.conditions.header  =Conditions
-authoring.fla.branch.mapping.condition.header  =Condition
-authoring.fla.branch.mapping.gate.header  =Gate
-authoring.fla.branch.mapping.branches.header  =Branches
-authoring.fla.branch.mapping.branch.header  =Branch
-authoring.fla.gate.state.mapping.dialog.title  =Map gate conditions
-authoring.fla.branch.mapping.dialog.title  =Match conditions to branches
-authoring.fla.gate.state.open  =open
-authoring.fla.gate.state.closed  =closed
-authoring.fla.branch.mapping.default.branch.suffix  =(default)
-authoring.fla.complex.output.suffix  =(user defined)
-authoring.fla.range.output.suffix  =(range)
-authoring.fla.range.condition.description  =Range [0] to [1]
-authoring.fla.exact.condition.description  =Exact value of
-authoring.fla.less.condition.description  =Less than or eq
-authoring.fla.greater.condition.description  =Greater than or eq
-authoring.fla.default.range.condition.title.prefix  =Untitled
-authoring.fla.clear.all.confirm  =There are conditions linked to an existing branch.\\nDo you wish to remove them?
-authoring.fla.remove.condition.confirm  =This condition is linked to an existing branch.\\nDo you wish to remove it?
-authoring.fla.refresh.conditions.confirm  =You are about to update your conditions for the selected output definition.\\n\ This will clear all links to existing branches.\\nDo you wish to continue?
-authoring.fla.conditions.to.default.gate.state.confirm  =All remaining conditions will be mapped to the selected gate\\'s closed state
-authoring.fla.conditions.to.default.branch.confirm  =All remaining conditions will be mapped to the default branch
-authoring.fla.groups.to.default.branch.confirm  =All remaining groups will be mapped to the default branch
-authoring.fla.range.condition.add.start.error  =The start value can not be within the range of an existing condition
-authoring.fla.range.condition.add.end.error  =The end value can not be within the range of an existing condition
-authoring.fla.group.title.validation.erorr  =Group name must not be blank and must not contain any of these characters < > ^ * @ % $
-authoring.fla.page.title  =Authoring
-authoring.fla.page.menu.new  =New
-authoring.fla.page.menu.open  =Open
-authoring.fla.page.menu.import  =Import
-authoring.fla.page.menu.import.part  =Import part
-authoring.fla.page.menu.save  =Save
-authoring.fla.page.menu.saveas  =Save as
-authoring.fla.page.menu.export.lams  =Export
-authoring.fla.page.menu.copy  =Copy
-authoring.fla.page.menu.paste  =Paste
-authoring.fla.page.menu.transition  =Transition
-authoring.fla.page.menu.optional  =Optional
-authoring.fla.page.menu.optional.activity  =Activity
-authoring.fla.page.menu.optional.support  =Support
-authoring.fla.page.menu.flow  =Flow
-authoring.fla.page.menu.flow.gate  =Gate
-authoring.fla.page.menu.flow.branch  =Branch
-authoring.fla.page.menu.group  =Group
-authoring.fla.page.menu.annotate  =Annotate
-authoring.fla.page.menu.annotate.label  =Label
-authoring.fla.page.menu.annotate.region  =Region
-authoring.fla.page.menu.arrange  =Arrange
-authoring.fla.page.menu.preview  =Preview
-authoring.fla.page.ld.title  =Untitled
-authoring.fla.page.ld.description  =Description:
-authoring.fla.page.ld.license  =License:
-authoring.fla.page.ld.license.none  =No license currently selected. Please select one.
-authoring.fla.page.ld.license.info  =Additional license information:
-authoring.fla.page.dialog.access  =Recently used sequences
-authoring.fla.page.dialog.ld.title  =Title:
-authoring.fla.page.dialog.mappings  =Mappings
-authoring.fla.page.prop.title  =Title:
-authoring.fla.page.prop.default  =Default?
-authoring.fla.page.prop.grouping.type  =Grouping type:
-authoring.fla.page.prop.grouping.type.random  =Random
-authoring.fla.page.prop.grouping.type.monitor  =Choose in Monitor
-authoring.fla.page.prop.grouping.type.learner  =Learner's choice
-authoring.fla.page.prop.groups.number  =Number of groups:
-authoring.fla.page.prop.groups.learners  =Or learners per group:
-authoring.fla.page.prop.groups.equal  =Equal group sizes?
-authoring.fla.page.prop.groups.view.learners  =View learners before selection?
-authoring.fla.page.prop.groups.name  =Name Groups
-authoring.fla.page.prop.gradebook  =Gradebook output:
-authoring.fla.page.prop.description  =Description:
-authoring.fla.page.prop.gate.type  =Type:
-authoring.fla.page.prop.gate.type.condition  =Condition
-authoring.fla.page.prop.gate.type.sync  =Synchronise
-authoring.fla.page.prop.gate.type.schedule  =Schedule
-authoring.fla.page.prop.gate.type.permission  =Permission
-authoring.fla.page.prop.input  =Input (Tool):
-authoring.fla.page.prop.gate.delay  =Delay:
-authoring.fla.page.prop.days  =days
-authoring.fla.page.prop.hours  =hours
-authoring.fla.page.prop.minutes  =minutes
-authoring.fla.page.prop.gate.activity.finish.based  =Since learner finished previous activity?
-authoring.fla.page.prop.conditions.create  =Create conditions
-authoring.fla.page.prop.gate.conditions.map  =Map gate conditions
-authoring.fla.page.prop.branching.type  =Branching type:
-authoring.fla.page.prop.branching.type.chose  =Instructor's choice
-authoring.fla.page.prop.branching.type.group  =Group-based
-authoring.fla.page.prop.branching.type.tool  =Learner's output
-authoring.fla.page.prop.branching.type.optional  =Learner's choice
-authoring.fla.page.prop.grouping  =Grouping:
-authoring.fla.page.prop.branching.conditions.match  =Match conditions to branches
-authoring.fla.page.prop.branching.groups.match  =Match Groups to Branches
-authoring.fla.page.prop.branching.sequences.min  =Min sequences:
-authoring.fla.page.prop.branching.sequences.max  =Max sequences:
-authoring.fla.page.prop.optional.activities.min  =Min activities:
-authoring.fla.page.prop.optional.activities.max  =Max activities:
-authoring.fla.page.prop.color  =Color:
-authoring.fla.page.dialog.cond.output.choose  =[ Choose Output ]
-authoring.fla.page.dialog.cond.options.choose  =[ Options ]
-authoring.fla.page.dialog.cond.greater  =Greater than or equal to
-authoring.fla.page.dialog.cond.less  =Less than or equal to
-authoring.fla.page.dialog.cond.range  =Range
-authoring.fla.page.dialog.cond.range.from  =From:
-authoring.fla.page.dialog.cond.range.to  =To:
-authoring.fla.page.dialog.cond.add  =Add
-authoring.fla.page.dialog.cond.name  =Name:
-authoring.fla.page.dialog.cond.list.name  =Name
-authoring.fla.page.dialog.cond.list.condition  =Condition
-authoring.fla.page.download.image  =Click here to download the image.
-authoring.fla.page.download.wait  =Please wait for the download.
-authoring.fla.page.download.close  =Close the dialog when the download is finished.
-authoring.fla.page.svg.generator.title  =SVG Generator
-authoring.fla.tool.groups.all  =All
-authoring.fla.liveedit.cancel.confirm  =Do you want to cancel changes made in Live Edit?
-authoring.fla.liveedit.readonly.activity.error  =The activity can not be modified. It is read-only.
-authoring.fla.liveedit.readonly.move.parent.error  =The activity can not be moved outside its parent. It is read-only.
-authoring.fla.liveedit.readonly.remove.activity.error  =The activity can not be removed. It is read-only.
-authoring.fla.liveedit.readonly.remove.parent.error  =The activity can not be removed. Its parent activity is read-only.
-authoring.fla.liveedit.readonly.remove.child.error  =The activity can not be removed. It has read-only child activities.
-authoring.fla.liveedit.readonly.remove.transition.error  =The transition can not be removed. It is read-only.
-ckeditor.math.math  =Math
-ckeditor.math.functions  =Functions
-ckeditor.math.greek  =Greek
-ckeditor.math.matrix  =Matrix
-ckeditor.math.symbols  =Symbols
-ckeditor.math.arrows  =Arrows
-ckeditor.math.accents  =Accents
-ckeditor.math.formatting  =Formatting
-authoring.fla.cut.button  =Cut
-authoring.fla.modify.error  =You cannot modify this resource
-authoring.fla.folder.move.to.child.error  =Cannot move a folder into its child
-label.password.must.lcase  =at least 1 lower case letter
-label.timezone.warning  =The timezone set in your profile does not match timezone on your computer. The times shown will be for the timezone set in your profile.
-authoring.fla.folder.can.not.save.error  =You cannot save in this folder
-authoring.fla.boolean.output.suffix  =(boolean: 1 or 0)
-lessons  =Lessons
-label.tour  =Tour
-tour.intro.title  =LAMS Tour
-tour.intro.content  =This short tour will show you the features of the main LAMS screen. You can stop the tour at any time by clicking End Tour, and restart it again by clicking on the Tour button.
-tour.course.reveal.content  =Click here to reveal or hide your courses.
-tour.courses.content  =Click on a course to make it the current course.
-tour.favorites.content  =Your favourite courses will appear at the top of the list.
-tour.lessons.content  =Lessons will appear here for the current course.
-tour.notification.content  =Review the notifications that you have received about your lessons.
-tour.authoring.content  =Create or modify the learning designs used for lessons.
-tour.user.profile.content  =Update your personal settings.
-tour.course.name.title  =Course Name
-tour.course.name.content  =Current course name. Click on the star to add this course to your favourites in the course list.
-tour.add.lesson.content  =Create a new lesson for this course using this button, or a lesson to a course subgroup using the Add Lesson button next to the subgroup name.
-tour.add.single.activity.lesson.content  =Use the down arrow to select an activity and then create a lesson with just this single activity.
-tour.course.gradebook.content  =View your marks for this course.
-tour.more.actions.content  =General options for managing this course such as notifications, subgroups, gradebook. The contents of this menu will vary depending on your responsibilities.
-tour.lesson.monitoring.title  =Lesson Monitoring
-tour.lesson.monitoring.content  =The Monitoring screen shows you where the learners are in the lesson their contributions.
-tour.lesson.notifications.title  =Lesson Notifications
-tour.lesson.notifications.content  =Send email notifications to learners.
-tour.lesson.gradebook.title  =Lesson Gradebook
-tour.lesson.gradebook.content  =Review learners\' marks and the length of time taken in the lesson.
-tour.lesson.conditions.title  =Lesson Conditions
-tour.lesson.conditions.content  =Set up conditions for starting or ending the lesson.
-tour.lesson.remove.title  =Remove Lesson
-tour.lesson.remove.content  =Remove the lesson completely. This is permanent - it cannot be undone.
-tour.end.title  =End Of Tour
-tour.end.content  =Thank you for taking the tour. To restart the tour, click the Tour button again.
-errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
-error.attachment.executable  =Uploaded file is executable
-label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
-label.file  =File
-authoring.fla.page.prop.size  =Size:
-authoring.fla.conditions.mapping.broken  =Conditions in the activity were changed. Please review following activities as they referred the modified conditions:
-authoring.fla.activity.unnamed.description  =unnamed
-authoring.fla.activity.gate.description  =gate
-authoring.fla.activity.branching.description  =branching
-tour.prev  =Prev
-tour.next  =Next
-tour.end.tour  =End of tour
-label.search.for.courses  =Search for courses
-label.save.as.course.grouping  =Save as a Course Grouping
-label.enter.course.grouping.name  =Please enter name for the new course grouping
-label.course.groups.name.not.unique  =Course grouping with such name already exists. Please enter another one.
-label.save.as.course.grouping.hint  =You can save the groups as "Course groupings" so it can be used in other lessons as well. If the groups are just specifically for this lesson, you might not want to do this. Otherwise, click the button to give them a name and reuse them later.
-label.advanced.settings  =Advanced settings
-audit.delete.portrait  =Portrait for user {0} {1}({2}) deleted. Portrait Id was {3}.
-authoring.fla.weights.menu  =Weights
-authoring.fla.weights.title  =Weights on activity outputs
-authoring.fla.weights.activity  =Activity
-authoring.fla.weights.output  =Output
-authoring.fla.weights.weight  =Weight
-authoring.fla.weights.sum  =Sum
-authoring.fla.weights.sum.error  =Output weights do not sum up to 100%. Adjust them in Weights dialog.
-label.tab.advanced.field.gradebook.complete  =Display activity scores on completion
-index.kumalive  =Kumalive
-index.kumalive.tooltip  =Enter a live lesson
-index.kumalive.enter.learner  =Enter as a learner
-index.kumalive.report  =Reports
-index.kumalive.rubric  =Rubrics management
-label.import.groups.from.template  =Import groups from template
-label.import.groups.from.template.description  =Download the template spreadsheet to create your groups using all the present learners in this lesson/course. Once you upload the file, the groups will be automatically created according to the spreadsheet.
-label.download.template  =Download Template
-label.upload.group.spreadsheet  =Upload Finished Spreadsheet
-error.file.required  =Grouped Spreadsheet Required
-error.file.wrong.format  =Grouped Spreadsheet in the wrong format. Please upload a file based on the given template.
-label.import.successful  =Group Import successful. {0} learners allocated to groups, {1} learners skipped.
-label.import.warning.replace.groups  =Importing this file will replace the existing groups. Do you want to import this file?
-filename.create.grouping.template  =create-grouping-template
-spreadsheet.column.login  =Login
-spreadsheet.column.firstname  =First Name
-spreadsheet.column.lastname  =Last Name
-spreadsheet.column.groupname  =Group Name
-error.groups.upload.locked  =Cannot update groups as the groups are now in use.
-error.branching.upload.must.use.existing.groups  =Cannot update branching. Must use the existing names: {0}.
-label.print  =Print
-authoring.tbl.desc.peer.review  =These are the criteria for which the learners will rate each other using a 5 star rating. These fields are optional and no Peer Review will be created if they are left blank.
-authoring.section.peerreview  =Peer Review
-authoring.label.peerrevice.criteria.num  =Rating Criteria {0}
-authoring.label.peerrevice.allow.comments  =Allow learners to comment on other learners
-authoring.label.peerrevice.min.words.in.comments  =Minimum number of words in a comment
-authoring.create.criteria  =Create Criteria
-audit.design.created  =Learning design "{0}" ({1}) created by {2} ({3})
-authoring.fla.save.successful.check.grouping  =Your design is valid and has been saved.\\nIf this is a TBL sequence, you may want to make following activities grouped:
-authoring.fla.weights.none  =No activities with weightable gradebook output
-audit.live.edit.start  =Live Edit of Learning Design "{0}" ({1}) for Lesson ({2}) started by {3} ({4})
-audit.live.edit.end  =Live Edit of Learning Design "{0}" ({1}) for Lesson ({2}) completed by {3} ({4})
-label.post.anonomously  =Post anonymously
-label.anonymous  =Anonymous
-label.anonymous.tooltip  =Turn on "Post anonymously" to hide your name from other learners. Teachers will still be able to see your name.
-authoring.fla.page.ld.title.desc  =Click to display sequence details
-label.start  =Start:
-label.end  =End:
-error.lesson.with.scheduled.end.only.have.individual.limits  =Lessons with a scheduled end date can only have individual time limits, not a lesson time limit.
-error.lesson.end.date.must.be.after.start.date  =Scheduled end date must be after the start date.
-label.policies.title  =Policies
-label.agree.to.policies.before.proceeding  =Please agree to all the policies before proceeding
-label.consent.required  =Consent is required
-label.agree.to.policy  =I agree to the policy
-label.policy.name  =Policy name
-label.policy.type  =Policy type
-label.policy.type.site  =Site policy
-label.policy.type.privacy  =Privacy policy
-label.policy.type.third.party  =Third party policy
-label.policy.type.other  =Other policy
-label.summary  =Summary
-label.full.policy  =Full policy
-label.consent  =Consent
-label.policies.consents  =Policies and consents
-label.version  =Version
-label.consented  =Consented?
-label.consented.on  =Consented on
-label.policy.details  =Policy details
-authoring.fla.page.prop.gradebook.none  =No score
-label.select.country  =Select a country
-error.country.required  =Country is required
-error.cannot.login.as.with.not.allow.direct.access  =You cannot login as this user as they are an Integration Learner and 'Allow direct access to main LAMS page for Integration Learners' is turned off in the system configuration.
-signup.email.verify.body.1  =Hi there,
-signup.email.verify.body.2  =Please confirm your email address by clicking on the link below
-signup.email.verify.body.3  =Regards,
-signup.email.verify.body.4  =LAMS Signup System
-signup.email.welcome.body.1  =Hi there,
-signup.email.welcome.body.2  =You''ve successfully registered an account with username {0} on the LAMS server at {1}.
-signup.email.welcome.body.3  =If you ever forget your password, you can reset it via this URL
-signup.email.welcome.body.4  =Regards,
-signup.email.welcome.body.5  =LAMS Signup System
-authoring.fla.readonly.checkbox  =read-only
-authoring.fla.readonly.forbidden  =This sequence is read-only. If you want to modify it, you can create its copy.
-register.email.verify  =A confirmation email will be sent before you are able to log in.
-signup.email.verify.sent  =A confirmation email has been sent to {0}<br />Check your email and follow the instructions.
-authoring.enable.confidence.levels  =Enable confidence levels
-authoring.fla.page.menu.apply.changes  =Apply changes
-forgot.password.request.processed  =If the email/username that you have provided exists, an email would be sent to the registered email address.
-label.view  =View
-index.outcome.manage  =Outcomes
-index.outcome.manage.tooltip  =Manage learning outcomes and scales
-outcome.manage.remove  =Remove outcome
-outcome.manage.remove.confirm  =Are you sure you want to remove this outcome?
-outcome.manage.add  =Add outcome
-outcome.manage.edit  =Edit outcome
-outcome.manage.view  =View outcome
-outcome.manage.add.name  =Name
-outcome.manage.add.code  =Code
-outcome.manage.add.description  =Description
-outcome.manage.add.scale  =Scale
-outcome.manage.add.save  =Save
-outcome.manage.add.error  =Error while saving an outcome
-outcome.manage.add.error.name.blank  =Name can not be blank
-outcome.manage.add.error.code.blank  =Code can not be blank
-outcome.manage.add.error.scale.choose  =You have to choose a scale
-outcome.manage.remove.error.in.use =The outcome is mapped to some items. It can not be removed.
-scale.title  =Scales
-scale.manage  =Manage scales
-scale.manage.add  =Add scale
-scale.manage.edit  =Edit scale
-scale.manage.view  =View scale
-scale.manage.remove  =Remove scale
-scale.manage.remove.scale  =Error while removing a scale.
-scale.manage.remove.error.in.use =The scale is used in some outcomes. It can not be removed.
-scale.manage.remove.confirm  =Are you sure you want to remove this scale?
-scale.manage.add.value  =Values
-scale.manage.add.value.info  =Enter comma separated values in increasing order of value. For example, an A,B,C,D scale must be entered as D,C,B,A.
-scale.manage.add.value.error.blank  =A value must not be blank
-scale.manage.add.error  =Error while saving an outcome scale
-outcome.authoring.title  =Learning outcomes
-outcome.authoring.input  =Search and select by outcome name or code
-outcome.authoring.existing  =Added outcomes
-outcome.authoring.existing.none  =none
-outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
-outcome.export.date  =Exported on:
-outcome.export  =Export
-outcome.import  =Import
-outcome.import.error  =Error while importing outcomes or scales. Check logs.
-authoring.msg.close.cancel.save  =Do you want to close this window without saving?
-authoring.msg.list.cancel.save  =Do you want to return to the template list without saving?
-authoring.fla.page.menu.new.template  =Use Template
-authoring.template.list.introduction  =Select a template from the list to see more details about the design that will be created. You can the proceed to create the design or return back to this list.
-authoring.learning.design.templates  =Learning Design Templates
-authoring.template.successful  =Your design has been saved as {0}.
-authoring.label.sequence.title  =Name
-authoring.error.question.num  =RAT Questions: Question {0} may not be blank
-authoring.error.question.correct.num  =RAT Questions: One of the answers for Question {0} needs to be correct.
-authoring.description.application.exercise  =Application Exercise (These question(s) will be shown during the analysis phase in the sequence.)
-authoring.label.grouping  =Teams
-authoring.label.group.name  =Team_{0}
-authoring.label.grouping.learners.choice  =Learner's Choice
-authoring.label.grouping.teachers.choice  =Teacher's Choice
-authoring.label.grouping.random.allocation  =Random Allocation
-authoring.label.numgroups  =Number of teams:
-authoring.error.numgroups  =Number of teams must be 1 to 99.
-authoring.label.numlearners  =Number of learners:
-authoring.error.numlearners  =Number of learners must be 1 to 99.
-authoring.error.group.data  =Teams settings are not correct.
-authoring.section.lessondetails  =Lesson Details
-authoring.section.questions  =RAT Questions
-authoring.section.applicationexercise  =Application Exercises
-authoring.section.introduction  =Introduction
-authoring.create.question  =Add Question
-authoring.create.essay.question  =Add Essay Question
-authoring.create.mc.question  =Add Multiple Choice Question
-authoring.label.application.exercise.num  =Application Exercise {0}
-authoring.error.application.exercise.num  =Application Exercises: Application Exercise {0} may not be blank.
-authoring.label.question.num  =Question {0}
-authoring.label.option.num  =Option {0}
-authoring.error.option  =Option may not be blank
-authoring.label.correct.question  =Correct?
-authoring.create.option  =Add Option
-button.next  =Next
-button.previous  =Previous
-button.return.to.template.list  =Back to Templates
-authoring.error.content.id  =Content ID is missing
-authoring.error.question.must.have.answer.num  =RAT Questions: Question {0} must have at least one answer.
-authoring.error.application.exercise.question.must.not.be.blank.num =Application Exercises: {0} Question {1} may not be blank.
-authoring.error.application.exercise.must.have.answer.num  =Application Exercises: {0} Question {1} must have at least one answer.
-authoring.error.application.exercise.must.have.100.percent  =Application Exercises:  {0} Question {1} must have at least one answer worth 100%.
-authoring.error.application.exercise.not.blank.and.grade  =Application Exercises: {0} Question {1} may not be blank and must have a grade.
-authoring.error.application.exercise.needs.noticeboard.text  =Application Exercises:  {0} is missing the text for the noticeboard.
-authoring.error.rat.not.blank=RAT Questions:  There must be at least one question.
-authoring.label.grade  =Grade
-authoring.label.none  =None
-authoring.tbl.template.title  =Team Based Learning
-authoring.tbl.template.description  =Individual and Team Readiness Assessments followed by Application Exercises.
-authoring.tbl.desc.question  =Adding RAT questions.
-authoring.tbl.enable.confidence.tooltip =Asks students in the iRAT how confident they are with their choosen answer. Then the confidence level for each student is displayed in the tRAT to all members of their team.
-authoring.tbl.desc.ae  =Adding Application Exercises (AEs). You can create multiple AEs if needed.
-authoring.template.basic.import.qti  =Import IMS QTI
-authoring.tbl.use.noticeboard=Add Noticeboard after AE
-authoring.tbl.use.noticeboard.tooltip=After the AE, displays content to students as additional information or as a reflection on the AE topic
-authoring.create.application.exercise=Add New Application Exercise
-label.marks=Marks
-authoring.tbl.delete.appex.prompt=Do you want to delete the Application Exercise {0}?
-authoring.tbl.delete.mcq.prompt=Do you want to delete the RAT Question {0}?
-
-#QB questions#
-label.create.question  =Create question
-label.question.type.multiple.choice  =Multiple choice
-label.question.type.matching.pairs  =Matching pairs
-label.question.type.short.answer  =Short answer
-label.question.type.numerical  =Numerical
-label.question.type.true.false  =True/False
-label.question.type.essay  =Essay
-label.question.type.ordering  =Ordering
-label.question.type.mark.hedging  =Mark hedging
-label.search.question.bank  =Search question bank
-label.question.type  =Type:
-label.question.successfully.imported  =Question successfully imported
-label.import.qti  =Import questions in IMS QTI format
-label.export.qti  =Export questions in IMS QTI format
-label.import.xml  =Import questions in XML format
-label.export.xml  =Export questions in XML format
-msg.import.file.format  =The import file must be .xml file exported from assessment tool and not exceed size of {0}
-error.import.file.format  =The import file is not an .xml file.
-
-#======= End labels: Exported 872 labels for en AU =====
+appName = lams_central 
+#language code: en 
+#locale code: AU 
+
+ # Exported from the LAMS Community by Ernie Ghiglione on Fri Dec 28 00:41:13 CST 2018 
+ 
+#=================== labels for LAMS Central =================# 
+
+label.username  =Username
+label.password  =Password
+error.authorisation  =You are not authorised to do this.
+heading.general.error  =Error
+error.general.1  =Sorry, there has been an error.
+error.general.2  =There is a problem processing this request. Close the browser window and try again.
+error.general.3  =If the problem persists please contact your system administrator.
+error.newpassword.mismatch  =Your new passwords do not match each other.
+error.oldpassword.mismatch  =Your old password is not correct.
+heading.password.change.screen  =Change password
+label.password.old.password  =Old password
+label.password.new.password  =New password
+label.password.confirm.new.password  =Confirm new password
+heading.password.changed.screen  =Password changed
+msg.password.changed  =Your password has been changed.
+error.login  =Sorry, that username or password is not known. Please try again.
+button.login  =Login
+label.user.guide  =[HELP]
+msg.loading  =Loading...
+msg.LAMS.version  =Version
+msg.LAMS.copyright.short  =2002 onwards LAMS Foundation.
+button.save  =Save
+button.cancel  =Cancel
+no.such.learningdesign.exist  =No Learning Design with learning_design_id of:{0} exists.
+no.such.user.exist  =No such User with a user_id of: {0} exists.
+no.such.workspace.exist  =No such WorkspaceFolder with workspace_folder_id of:{0} exists.
+delete.resource.error  =Cannot delete the resource: {0}
+delete.lesson.error  =LAMS does not support deleting a lesson via the workspace interface.
+delete.folder.error  =Cannot delete this folder as it is the Root folder.
+delete.learningdesign.error  =Cannot delete design with learning_design_id of : {0} as it is READ ONLY.
+folder.delete  =Folder deleted:{0}
+copy.resource.error  =Cannot copy the resource:{0}
+copy.resource.error.value.miss  =copyResource(Long resourceID,Integer targetFolderID, String resourceType, Integer userID) requires a value for resourceID, targetFolderID, resourceType and userID
+copy.no.support  =LAMS does not support copying a file via the workspace interface.
+unable.copy  =Unable to copy learning design due to an error{0}.
+no.such.user  =No such user with a userID of {0} exists.
+no.such.workspace  =No such workspaceFolder with a workspace_folder_id of {0} exists.
+learningdesign.delete  =Learning design deleted:{0}
+learningdesign.readonly  =Cannot delete design with learning_design_id of:{0} as it is READ ONLY.
+move.resource.error  =Cannot move the resource:{0}
+unsupport.move  =LAMS does not support moving a file via the workspace interface.
+creating.workspace.folder.error  =Exception occured while creating workspaceFolderContent:{0}.
+resource.already.exist  =The resource {0} already exists in the repository: {1}.
+no.such.content  =No such content with versionID of {0} found in repository {1}.
+content.delete.success  =Content successfully deleted.
+rename.resource.error  =Cannot rename the resource: {0}
+rename.resource.unspport  =LAMS does not support renaming a file via the workspace interface.
+folder.already.exist  =A folder with given name ''{0}'' already exists.
+organisations  =Courses
+folders  =Folders
+title.lams  =LAMS
+title.login.window  =Login - LAMS :: Learning Activity Management System
+title.system.admin.window  =System Admin:: LAMS
+msg.loading.system.admin.window  =Loading
+title.admin.window  =Admin:: LAMS
+msg.loading.admin.window  =Loading Administration Environment.
+msg.loading.add.lesson.window  =Loading Add Lesson Wizard.
+title.monitor.lesson.window  =Monitor Lesson:: LAMS
+msg.loading.monitor.lesson.window  =Loading Lesson Monitoring Environment.
+title.learner.window  =Learner:: LAMS
+msg.loading.learner.window  =Loading Learner Environment.
+title.error.window  =LAMS :: Error
+authoring.msg.save.success  =Congratulations, your content saved successfully!
+label.authoring.close  =Close
+index.welcome  =Welcome
+index.logout  =Logout
+index.refresh  =Refresh
+index.myprofile  =Profile
+index.sysadmin  =Sys Admin
+index.courseman  =Course Mgt
+index.author  =Author
+index.classman  =Manage Subcourses
+index.addlesson  =Add Lesson
+index.monitor  =Monitor
+index.dummymonitor  =Dummy Monitor
+index.qb.collections =Question collections
+title.import.result  =Import tool content result
+title.import  =Import tool content
+title.import.instruction  =Please choose LAMS sequence to import.
+title.import.instruction.antivirus =An antivirus scan will be performed. It can take a while.
+title.export.loading  =Export tool content loading
+label.ld.zip.file  =Learning design import file
+msg.import.success  =Learning design and activities imported successfully.
+msg.import.ld.success  =Learning design imported successfully.
+msg.import.tool.error.prefix  =But there are some tool(s) imports that failed
+msg.import.failed  =Learning design import failed
+msg.export.loading  =Learning design download will start automatically in seconds, please wait...
+msg.export.success  =Learning design and activities export successfully.
+msg.export.ld.success  =Learning design export successfully.
+msg.export.tool.error.prefix  =But there are some tool(s) exported failed
+msg.export.failed  =Learning design export failed
+msg.reason.is  =The reason is
+button.close  =Close
+button.import  =Import
+msg.LAMS.copyright.statement.1  =LAMS\u2122 \u00a9 2002 onwards LAMS Foundation
+msg.LAMS.copyright.statement.2  =LAMS is a trademark of LAMS Foundation (http://lamsfoundation.org).
+msg.LAMS.copyright.statement.3  =This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 2 as published by the Free Software Foundation.
+title.export  =Export tool content
+error.system.error  =An error has occurred. Please start again. Reason for error: {0}
+msg.hide.detail  =Hide detail
+msg.show.detail  =Show detail
+msg.no.more.detail  =No more detail
+404.title  =Page not found
+404.message  =The page you requested was not found.
+403.title  =Your current role does not allow you to view this page. Please contact your system administrator if you believe you should have access to this page.
+msg.import.failed.unknown.reason  =No error message available.
+msg.import.file.not.found  =Selected file has not been uploaded by your browser. Please try again.
+title.profile.edit.screen  =Edit profile
+label.name  =Name
+label.title  =Title
+label.first_name  =First name
+label.last_name  =Last name
+label.address_line_1  =Address 1
+label.address_line_2  =Address 2
+label.address_line_3  =Address 3
+label.city  =City
+label.state  =State
+label.country  =Country
+label.day_phone  =Work phone
+label.evening_phone  =Home phone
+label.mobile_phone  =Mobile
+label.fax  =Fax
+label.email  =Email
+label.language  =Language
+title.password.change.screen  =Change password
+msg.groups.empty  =No groups
+label.postcode  =Postcode
+label.portrait.current  =Current Portrait
+label.portrait.upload  =Upload
+msg.portrait.none  =No portrait uploaded
+title.portrait.change.screen  =Portrait
+title.change.portrait.window  =LAMS :: Change portrait
+error.portrait.not.image  =The file is not an image (PNG, GIF, JPG, WBMP and BMP formats allowed).
+msg.portrait.resized  =The image formats allowed are: PNG, GIF, JPG, WBMP and BMP.
+label.workspace.root_folder  =My workspace
+msg.design.not.saved  =Your design is not saved, any changes you have made since you last saved will be lost.
+error.firstname.required  =First name is required.
+error.lastname.required  =Last name is required.
+error.email.required  =Email address is required.
+error.valid.email.required  =Valid email address is required.
+message.lesson.not.started.cannot.participate  =This lesson has not been started. You cannot participate in the lesson until it is started.
+index.mycourses  =Courses
+title.export.choose.format  =Choose export content format
+msg.export.choose.format.instruction  =Please choose format which you want to export
+msg.export.choose.format.lams  =LAMS format
+button.export  =Export
+label.open.lesson  =Open Lesson
+label.msg.status  =Status: {0}
+msg.status.not.stated  =This lesson has not been started so you cannot access it.
+msg.status.disabled  =This lesson is disabled so you cannot access it.
+msg.status.finished  =This lesson has been finished or archived.
+msg.status.removed  =This lesson has been removed.
+msg.browser.compat  =Your browser does not support features required by LAMS. Please upgrade your browser.
+label.disabled  =Disabled
+label.archived  =Archived
+audit.user.password.change  =Password changed for: {0}
+title.author.window  =LAMS :: Author
+title.all.my.lessons  =All lessons
+msg.no.lessons  =No lessons
+label.return.to.myprofile  =Return to profile
+label.help  =Help?
+label.completed  =Completed!
+label.enable.lesson.sorting  =Enable lesson sorting
+label.lesson.sorting.enabled  =lesson sorting enabled
+label.show.groups  =Show Groups
+label.forgot.password  =Forgot your password?
+button.select.importfile  =Select file to import
+label.yes  =Yes
+label.no  =No
+label.ok  =OK
+title.forgot.password  =LAMS :: Forgot password
+forgot.password.email.subject  =LAMS server - Forgot password response
+forgot.password.email.body  =Click the link below and it will take you to a page where you can change your password.
+error.support.email.not.set  =Email could not be sent. The LAMS server has not been configured to handle emails. Please contact your system administrator.
+error.password.request.expired  =This request for a new password has expired. Please click the "Forgot your Password" link again to make a new request.
+label.forgot.password.instructions.1  =Please enter your user name or email below. An email will be sent to you shortly with a link that will allow you to change your password. You only need to enter one value.
+label.forgot.password.instructions.2  =If you do not know your email address in LAMS, please contact your system administrator.
+label.forgot.password.email  =By email
+label.forgot.password.username  =By username
+error.forgot.password.fields  =Both fields are required. Please try again.
+error.email.not.sent  =Server failed to send email to recipient. Please contact your system administrator.
+error.forgot.password.email  =Please enter an email address.
+error.forgot.password.username  =Please enter a username.
+button.select.another.importfile  =Select another file to import
+error.forgot.password.incorrect.key  =The request key is incorrect or has already been used. Please click the "Forgot your Password" link again to make a new request.
+lessonsearch.title  =Search learners in lesson
+lessonsearch.instuctions  =Please enter the login, first or last name of the learner.
+lessonsearch.results  =Lessons in which ''''{0}'''' has been found
+index.searchlesson  =Learner Search
+index.searchlesson.tooltip  =Search learners across lessons
+lessonsearch.noresults  =No Lessons found
+error.multiple.emails  =There are multiple users in LAMS with the given email. Email could not be sent. Please try again using your username, or contact your system administrator.
+public.folder  =Public Folder
+index.coursegradebook  =Course Gradebook
+index.coursegradebook.tooltip  =Open course-wide Gradebook monitoring page
+index.coursegradebook.learner  =Gradebook
+index.coursegradebookmonitor  =Mark
+index.moreActions  =More Options
+label.required  =Required
+label.timezone.title  =Time zone
+email.to  =To
+email.subject  =Subject
+email.send  =Send
+email.compose.mail  =Compose email
+index.coursegradebook.subgroup  =Subcourse Gradebook
+error.finish.date.passed  =The time allocated for this lesson has expired. You cannot access it anymore. Contact the instructor for assistance.
+index.emailnotifications  =Notifications
+index.emailnotifications.tooltip  =Email notifications
+label.portrait.please.wait  =Please wait
+label.portrait.take.snapshot.from.webcamera  =Webcam
+label.portrait.configure  =Configure
+label.portrait.take.snapshot  =Take pic
+label.portrait.do.you.like.results  =Is this good?
+label.portrait.yes.set.it.as.portrait  =Set as portrait
+label.portrait.no.take.another.one  =Take another one
+error.edit.disabled  =Profile editing is disabled.
+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.portrait.create.new.portrait  =Select an image to upload or use your computer's webcam to create your portrait.
+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.conditions.flag.tooltip  =Participation in the lesson is conditional
+label.conditions.box.title  =Lesson "{0}" will only be available after these lesson(s) are completed:
+label.conditions.box.no.dependency  =There are no dependencies for this lesson.
+label.conditions.box.add.dependency  =Select lesson that will need to be completed first:
+label.conditions.box.remove.dependency  =Remove lesson dependency
+label.conditions.box.finish.global.date  =Lesson finishes for everyone after {0} days from its start {1}
+label.conditions.box.finish.individual.date  =Lesson finishes after {0} days after user started participating
+label.conditions.box.finish.no.date  =Lesson does not have a fixed number days to finish
+label.set  =Set
+error.conditions.box.finish.date  =Error while setting lesson finish date: {0}
+advanced.tab.form.time.limits.label  =Time limits
+advanced.tab.form.enter.number.days.label  =Enter number days
+advanced.tab.form.individual.not.entire.group.label  =Individual and not for the entire group
+label.start.lesson  =Start lesson
+success.msg.1  =You have successfully registered an account with LAMS.
+success.login  =Login now
+success.errors  =Had trouble sending email. Error was
+login.username  =Username
+login.password  =Password
+login.course.key  =Course key
+login.submit  =Submit
+signup.username  =Username
+signup.password  =Password
+signup.confirm.password  =Confirm password
+signup.first.name  =First name
+signup.last.name  =Last name
+signup.email  =Email
+signup.confirm.email  =Confirm email
+signup.course.key  =Course key
+signup.submit  =Submit
+title.lams.signup  =LAMS Signup
+error.username.blank  =Username cannot be blank
+error.username.exists  =Username is taken
+error.first.name.blank  =First name cannot be blank
+error.last.name.blank  =Last name cannot be blank
+error.password.blank  =Password cannot be blank
+error.passwords.unequal  =Passwords did not match
+error.email.blank  =Email cannot be blank
+error.emails.unequal  =Email addresses did not match
+error.email.invalid.format  =Email format is invalid
+error.course.key.invalid  =This course key is incorrect. Please try again or contact your course administrator for the correct key
+error.login.or.password.incorrect  =Login or password is incorrect. If you have not previously signed up for LAMS, please sign up {0}here{1}.
+register.if.you.want.to.signup  =If you want to sign up to LAMS as a new user, please select "Sign up" tab. If you already have an account, please select "Login" one.
+register.signup.to.lams  =Sign up
+register.login  =Login
+index.remove.lesson  =Remove
+index.remove.lesson.tooltip  =Permanently remove this lesson
+label.edit  =Edit
+label.lesson.name  =Lesson name
+label.instructions  =Lesson instructions
+label.cancel  =Cancel
+label.display.lesson.design  =Display learning design image?
+index.remove.lesson.confirm1  =You are about to remove this lesson. Are you sure?
+index.remove.lesson.confirm2  =Once you remove this lesson you CANNOT bring it back. Are you positive that you want to remove this lesson?
+label.questions.choice.type.mc  =Multiple Choice
+label.questions.choice.type.tf  =True-False
+label.questions.choice.type.mt  =Matching
+label.questions.choice.type.mr  =Multiple response
+label.questions.choice.type.fb  =Fill-in-Blank
+label.questions.choice.type.es  =Essay
+label.questions.choice.type.unknown  =Unknown
+error.lesson.not.accessible.for.learners  =Sorry, this lesson is now disabled/archived. Contact your instructor for further details.
+button.add.now  =Add now
+label.tab.lesson  =Lesson
+label.tab.class  =Class
+label.tab.advanced  =Advanced
+label.tab.conditions  =Conditions
+label.tab.lesson.title  =Select the sequence to add a lesson, and click on Add now
+label.tab.class.title  =Use drag n' drop to select or unselect monitors and learners
+label.tab.lesson.name  =Lesson name:
+label.tab.lesson.size.full  =(show full size)
+label.tab.lesson.size.fit  =(fit to window)
+label.tab.lesson.sequence.folder  =Run sequences
+error.tab.lesson.sequence  =A valid sequence must be selected
+label.tab.class.monitors.unselected  =Monitors unselected
+label.tab.class.monitors.selected  =Monitors selected
+label.tab.class.learners.unselected  =Learners unselected
+label.tab.class.learners.selected  =Learners selected
+error.tab.class.learners  =There must be at least 1 learner selected
+error.tab.class.monitors  =There must be at least 1 monitor selected
+label.tab.advanced.details  =Details
+label.tab.advanced.intro.enable  =Enable lesson intro
+label.tab.advanced.intro.description  =Description:
+label.tab.advanced.intro.image  =Display design image
+label.tab.advanced.section.advanced  =Advanced options
+label.tab.advanced.field.monitor  =Start in Monitor
+label.tab.advanced.field.liveedit  =Enable Live Edit
+label.tab.advanced.field.notification  =Enable lesson notifications
+label.tab.advanced.field.presence  =Allow learners to see who is online
+label.tab.advanced.field.im  =Enable Instant Messaging
+label.tab.advanced.field.split  =Split learners into separate copies of this lesson
+label.tab.advanced.field.split.number  =No. learners per lesson
+label.tab.advanced.field.scheduling  =Enable scheduling
+label.tab.advanced.split.desc  =[0] instances of this lesson will be created and approximately [1] will be allocated to each lesson
+label.tab.conditions.dependencies  =Dependencies
+label.tab.conditions.dependencies.desc  =Select a lesson that learners will need to complete before they can see the lesson you are about to create.
+label.tab.conditions.timelimit  =Time limitations
+label.tab.conditions.timelimit.desc  =Set the number of days the lesson will be available to learners. After this period the lesson will no longer be shown. If the time should count from the moment the learner starts the lesson, select the option for individual time limit. <b>If you are scheduling the lesson end on the Advanced tab then you can only set an individual time limit.</b>
+label.tab.conditions.timelimit.days  =Number days:
+label.tab.conditions.timelimit.individual  =Is this time limit for each individual?
+label.tab.conditions.enable  =Enable
+label.questions.file.title  =Choose IMS QTI file
+label.questions.file.missing  =Please select a ZIP or XML file with questions in IMS QTIformat.
+label.questions.choice.title  =Choose questions
+label.questions.choice.select.all  =Select all
+label.questions.choice.missing  =Please check at least one question.
+index.single.activity.lesson.title  =Add single activity lesson
+index.single.activity.lesson.desc  =or one-click activity:
+label.disable.lesson.sorting  =Disable lesson sorting
+index.gradebook.course.title  =Gradebook Course Monitor
+index.gradebook.lesson.title  =Gradebook Lesson Monitor
+index.gradebook.learner.title  =Course Gradebook Learner
+index.conditions.title  =Conditions to participate in this lesson
+index.search.lesson.title  =Search learners across lessons
+index.orggroup  =Course groupings
+index.course.groups.title  =Course groupings
+label.course.groups.grouping.title  =Groupings
+label.course.groups.grouping.create  =Create new
+label.course.groups.grouping.remove.confirm  =Are you sure you want to delete this grouping?
+label.course.groups.name  =Grouping name:
+label.course.groups.name.blank  =Grouping name can not be blank.
+label.course.groups.edit.title  =Please use drag n' drop to move learners between groups.
+label.course.groups.viewonly.title  =Course group view
+label.course.groups.prefix  =Group
+label.course.groups.remove.confirm  =Are you sure you want to delete this group?
+label.course.groups.remove.empty.confirm  =Some groups are new and empty. They will not be saved. Click OK to continue.
+label.course.groups.add  =Add a new group
+label.course.groups.unassigned  =Unassigned learners
+label.course.groups.sort.tooltip  =Sort learners
+label.course.groups.remove.tooltip  =Remove
+label.course.groups.back  =Groupings
+label.course.groups.grouping.count.tooltip  =Number of groups in this grouping
+label.course.groups.grouping.use.confirm  =Are you sure you want to use grouping "[0]"? Groups will be created for this lesson and learners assigned to them.
+label.course.groups.locked  =Some users in this group already used the grouping. The group is now locked: you can not remove it or move users to another group.
+label.course.groups.locked.transfer  =Are you sure you want to move these users to a locked group? You will not be allowed to move them to another group later.
+label.tab.advanced.field.restart  =Learners always start from the first activity
+error.firstname.invalid.characters  =First name contains invalid characters
+error.lastname.invalid.characters  =Last name contains invalid characters
+error.username.invalid.characters  =Username can only contain alphanumeric characters and no spaces.
+error.lessonname.invalid.characters  =Lesson name contains invalid characters
+audit.admin.loginas  =Sysadmin {0} has logged in as {1}
+index.monitoring.title  =Monitoring
+heading.comments  =Comments
+label.hidden  =Comment hidden
+label.reply  =Reply
+label.hide  =Hide
+label.show  =Show
+label.post  =Post
+label.refresh  =Refresh comments
+error.cannot.redisplay.please.refresh  =Your changes have been saved but cannot be redisplayed. Please select refresh to reload the comments.
+error.please.refresh  =An error has occurred. Your post may not have been saved. Please select refresh to start again
+label.showhide.prompt  =Show/Hide replies
+message.complete.or.cancel.reply  =Please complete or cancel the current reply before starting a new reply.
+message.complete.or.cancel.edit  =Please complete or cancel the current edit before starting a new reply.
+label.show.more.messages  =More comments
+label.likes  =Likes
+label.comment.body.validation  =The comment must be between 1 and 5000 character
+label.edited  =Edited
+label.like  =Like
+label.dislike  =Dislike
+label.no.comments  =No comments
+label.newest.first  =Newest first
+label.top.comments  =Top comments
+label.add.sticky  =Stick to top
+label.remove.sticky  =Remove sticky
+label.private.notifications.title  =Notifications
+label.private.notifications.messages  =Messages
+label.private.notifications.read  =Read
+label.private.notifications.read.hint  =Mark notification as read
+label.private.notifications.read.all.hint  =Mark all notifications as read
+label.select.groups  =Select groups
+authoring.fla.course.groups.to.branches.match.dialog.title  =Match Course Groups to Branching Groups
+authoring.fla.branch.mapping.course.groups.header  =Course groups
+authoring.fla.branch.mapping.branching.groups.header  =Branching groups
+authoring.fla.branch.mapping.ordered.asc =Start with branches mapped to highest ordered answers
+label.tab.advanced.field.force.restart  =Learners always start from the first activity
+label.tab.advanced.field.allow.restart  =Learners can restart the lesson
+label.verification.code  =Verification code
+error.verification.code  =Sorry, entered verification code is incorrect. Please try again.
+label.your.new.shared.secret  =Your new shared secret: {0}
+label.2FA.shared.secret  =Two-factor authentication shared secret
+label.2FA.login.panel  =Two-factor authentication required
+label.remove.org.favorite  =Remove organisation from favorite ones
+label.mark.org.favorite  =Mark organisation as favorite
+label.email.send.me.a.copy  =Send me a copy
+label.password.max.length  =must be less than 25 characters
+label.password.min.length  =must be at least {0} characters long
+label.password.old.must.entered  =Old password must be entered
+label.password.symbols.allowed  =Only these symbols are allowed
+label.password.restrictions  =Password must follow the restrictions shown above
+label.password.must.contain  =Password must contain
+label.password.must.ucase  =at least 1 upper case letter
+label.password.must.number  =at least 1 number
+label.password.must.symbol  =at least 1 symbol
+label.create.lesson  =Create new lesson
+label.organisations  =Select course with the lessons that needs to be export
+label.lesson.id  =Lesson ID
+label.display.design.image  =Display sequence image?
+label.select.sequence  =You must select a sequence before proceeding
+label.choose.sequence  =Choose sequence
+label.author.sequence  =Author new LAMS sequence
+label.open.monitor  =Open Monitor
+label.your.progress  =Your lesson progress
+label.you.completed.this.lesson  =You have completed this lesson.
+label.total.activities.depend.on.path  =Total activities depend on your learning path.
+label.lesson.not.completed  =Lesson is not yet completed.
+label.you.completed.activities  =You have completed {0} activities
+error.cannot.load.thumbnail  =Unable to load sequence thumbnail.
+label.lesson.introduction.updated  =Introduction updated
+no.such.signup.page.exist  =No such signup page exists
+error.lockedout  =Due to consecutive failed attempts, the account has been locked out temporarily.
+error.email.internal  =An internal error occured. Try again using your username or contact your system administrator. More information is provided in application logs.
+label.theme  =Theme
+authoring.fla.default.group.title  =Grouping
+authoring.fla.default.group.prefix  =Group
+authoring.fla.default.branching.title  =Branching
+authoring.fla.default.branch.prefix  =Branch
+authoring.fla.default.optional.activity.title  =Optional Activity
+authoring.fla.support.activity.title  =Support Activity
+authoring.fla.gate.activity.label  =STOP
+authoring.fla.branching.start.suffix  =start
+authoring.fla.branching.end.suffix  =end
+authoring.fla.activity.dialog.title.suffix  =Authoring
+authoring.fla.remove.activity.confirm  =Are you sure you want to remove the whole branching activity?
+authoring.fla.branching.create.confirm  =Transition from this activity already exists.\\nDo you want to create branching here?
+authoring.fla.transition.to.exists.error  =Transition to this activity already exists.
+authoring.fla.circular.sequence.error  =You are not allowed to have a circular sequence.
+authoring.fla.activity.in.container.error  =You can not add this type of activity to an optional/support activity.
+authoring.fla.default.annotation.label.title  =Label
+authoring.fla.region.fit.button.tooltip  =Fit
+authoring.fla.new.folder.button  =New
+authoring.fla.copy.button  =Copy
+authoring.fla.paste.button  =Paste
+authoring.fla.delete.button  =Delete
+authoring.fla.rename.button  =Rename
+authoring.fla.open.button  =Open
+authoring.fla.save.button  =Save
+authoring.fla.import.button  =Import
+authoring.fla.folder  =folder
+authoring.fla.sequence  =sequence
+authoring.fla.sequence.not.valid  =The sequence is not valid.<br />It needs to be corrected before it can be used in lessons.
+authoring.fla.sequence.validation.issues  =While saving the sequence there were following validation issues:
+authoring.fla.save.successful  =The design is valid and has been saved.
+authoring.fla.liveedit.save.successful  =Changes were successfully applied.
+authoring.fla.navigate.away.confirm  =Your design is not saved.\\nAny changes you made since you last saved will be lost.
+authoring.fla.delete.node.confirm  =Are you sure you want to delete this
+authoring.fla.sequence.overwrite.confirm  =Are you sure you want to overwrite the existing sequence?
+authoring.fla.new.folder.title.prompt  =Please enter the name for a new folder
+authoring.fla.rename.title.prompt  =Please enter the new name for
+authoring.fla.save.sequence.title.prompt  =Please enter a title for the sequence
+authoring.fla.import.part.choose.prompt  =Click on activities to choose them for import
+authoring.fla.folder.not.selected.error  =Please choose a folder
+authoring.fla.title.validation.error  =The title must not be blank and must not contain any of these characters < > ^ * @ % $
+authoring.fla.folder.exists.error  =A folder with this name already exists.
+authoring.fla.sequence.exists.error  =A sequence with this name already exists.
+authoring.fla.sequence.save.error  =Error while saving sequence
+authoring.fla.svg.save.error  =Error while saving sequence thumbnail
+authoring.fla.sequence.not.selected.error  =Please choose a sequence
+authoring.fla.sequence.load.error  =Error while loading the sequence
+authoring.fla.transition.from.exists.error  =Transition from this activity already exists
+authoring.fla.export.sequence.dialog.title  =Sequence export
+authoring.fla.activity.copy.title.prefix  =Copy [0] of
+authoring.fla.preview.lesson.default.title  =Preview
+authoring.fla.save.dialog.title  =Save sequence
+authoring.fla.open.dialog.title  =Open sequence
+authoring.fla.import.dialog.title  =Import Learning Design
+authoring.fla.import.part.dialog.title  =Import activities
+authoring.fla.run.sequences.folder  =Run sequences
+authoring.fla.arrange.confirm  =There are annotations on the canvas.\\n\ They will be not arranged automatically, you will have to adjust them manually later.\\n\ Do you want to continue?
+authoring.fla.clear.canvas.confirm  =You have got unsaved changes. They will be lost. Do you want to continue?
+authoring.fla.branching.start.place.prompt  =Place the branching point
+authoring.fla.branching.end.place.prompt  =Place the converge point
+authoring.fla.annotation.region.place.prompt  =Click and hold to start drawing an annotation region
+authoring.fla.annotation.label.place.prompt  =Click to add an annotation label
+authoring.fla.optional.activity.place.prompt  =Click to add an optional activity container.
+authoring.fla.support.activity.place.prompt  =Click to add a support activity container.
+authoring.fla.transition.place.prompt  =Click on an activity
+authoring.fla.paste.error  =Sorry, you can not paste this type of activity
+authoring.fla.preview.error  =Error while initialising lesson for preview
+authoring.fla.cross.branching.error  =Cross-branching transitions are not allowed
+authoring.fla.support.transition.error  =Support activities can not be connected to any other activity
+authoring.fla.end.match.error  =: a branch that ends in this branching does not start in it
+authoring.fla.ok.button  =OK
+authoring.fla.cancel.button  =Cancel
+authoring.fla.clear.all.button  =Clear all
+authoring.fla.refresh.button  =Refresh
+authoring.fla.remove.condition.button  =Remove
+authoring.fla.properties.dialog.title  =Properties
+authoring.fla.group.naming.dialog.title  =Group Naming
+authoring.fla.groups.to.branches.match.dialog_title  =Match Groups to Branches
+authoring.fla.branch.mapping.groups.header  =Groups
+authoring.fla.branch.mapping.group.header  =Group
+authoring.fla.conditions.dialog.title  =Select Output Conditions for Input
+authoring.fla.branch.mapping.conditions.header  =Conditions
+authoring.fla.branch.mapping.condition.header  =Condition
+authoring.fla.branch.mapping.gate.header  =Gate
+authoring.fla.branch.mapping.branches.header  =Branches
+authoring.fla.branch.mapping.branch.header  =Branch
+authoring.fla.gate.state.mapping.dialog.title  =Map gate conditions
+authoring.fla.branch.mapping.dialog.title  =Match conditions to branches
+authoring.fla.gate.state.open  =open
+authoring.fla.gate.state.closed  =closed
+authoring.fla.branch.mapping.default.branch.suffix  =(default)
+authoring.fla.complex.output.suffix  =(user defined)
+authoring.fla.range.output.suffix  =(range)
+authoring.fla.range.condition.description  =Range [0] to [1]
+authoring.fla.exact.condition.description  =Exact value of
+authoring.fla.less.condition.description  =Less than or eq
+authoring.fla.greater.condition.description  =Greater than or eq
+authoring.fla.default.range.condition.title.prefix  =Untitled
+authoring.fla.clear.all.confirm  =There are conditions linked to an existing branch.\\nDo you wish to remove them?
+authoring.fla.remove.condition.confirm  =This condition is linked to an existing branch.\\nDo you wish to remove it?
+authoring.fla.refresh.conditions.confirm  =You are about to update your conditions for the selected output definition.\\n\ This will clear all links to existing branches.\\nDo you wish to continue?
+authoring.fla.conditions.to.default.gate.state.confirm  =All remaining conditions will be mapped to the selected gate\\'s closed state
+authoring.fla.conditions.to.default.branch.confirm  =All remaining conditions will be mapped to the default branch
+authoring.fla.groups.to.default.branch.confirm  =All remaining groups will be mapped to the default branch
+authoring.fla.range.condition.add.start.error  =The start value can not be within the range of an existing condition
+authoring.fla.range.condition.add.end.error  =The end value can not be within the range of an existing condition
+authoring.fla.group.title.validation.erorr  =Group name must not be blank and must not contain any of these characters < > ^ * @ % $
+authoring.fla.page.title  =Authoring
+authoring.fla.page.menu.new  =New
+authoring.fla.page.menu.open  =Open
+authoring.fla.page.menu.import  =Import
+authoring.fla.page.menu.import.part  =Import part
+authoring.fla.page.menu.save  =Save
+authoring.fla.page.menu.saveas  =Save as
+authoring.fla.page.menu.export.lams  =Export
+authoring.fla.page.menu.copy  =Copy
+authoring.fla.page.menu.paste  =Paste
+authoring.fla.page.menu.transition  =Transition
+authoring.fla.page.menu.optional  =Optional
+authoring.fla.page.menu.optional.activity  =Activity
+authoring.fla.page.menu.optional.support  =Support
+authoring.fla.page.menu.flow  =Flow
+authoring.fla.page.menu.flow.gate  =Gate
+authoring.fla.page.menu.flow.branch  =Branch
+authoring.fla.page.menu.group  =Group
+authoring.fla.page.menu.annotate  =Annotate
+authoring.fla.page.menu.annotate.label  =Label
+authoring.fla.page.menu.annotate.region  =Region
+authoring.fla.page.menu.arrange  =Arrange
+authoring.fla.page.menu.preview  =Preview
+authoring.fla.page.ld.title  =Untitled
+authoring.fla.page.ld.description  =Description:
+authoring.fla.page.ld.license  =License:
+authoring.fla.page.ld.license.none  =No license currently selected. Please select one.
+authoring.fla.page.ld.license.info  =Additional license information:
+authoring.fla.page.dialog.access  =Recently used sequences
+authoring.fla.page.dialog.ld.title  =Title:
+authoring.fla.page.dialog.mappings  =Mappings
+authoring.fla.page.prop.title  =Title:
+authoring.fla.page.prop.default  =Default?
+authoring.fla.page.prop.grouping.type  =Grouping type:
+authoring.fla.page.prop.grouping.type.random  =Random
+authoring.fla.page.prop.grouping.type.monitor  =Choose in Monitor
+authoring.fla.page.prop.grouping.type.learner  =Learner's choice
+authoring.fla.page.prop.groups.number  =Number of groups:
+authoring.fla.page.prop.groups.learners  =Or learners per group:
+authoring.fla.page.prop.groups.equal  =Equal group sizes?
+authoring.fla.page.prop.groups.view.learners  =View learners before selection?
+authoring.fla.page.prop.groups.name  =Name Groups
+authoring.fla.page.prop.gradebook  =Gradebook output:
+authoring.fla.page.prop.description  =Description:
+authoring.fla.page.prop.gate.type  =Type:
+authoring.fla.page.prop.gate.type.condition  =Condition
+authoring.fla.page.prop.gate.type.sync  =Synchronise
+authoring.fla.page.prop.gate.type.schedule  =Schedule
+authoring.fla.page.prop.gate.type.permission  =Permission
+authoring.fla.page.prop.input  =Input (Tool):
+authoring.fla.page.prop.gate.delay  =Delay:
+authoring.fla.page.prop.days  =days
+authoring.fla.page.prop.hours  =hours
+authoring.fla.page.prop.minutes  =minutes
+authoring.fla.page.prop.gate.activity.finish.based  =Since learner finished previous activity?
+authoring.fla.page.prop.conditions.create  =Create conditions
+authoring.fla.page.prop.gate.conditions.map  =Map gate conditions
+authoring.fla.page.prop.branching.type  =Branching type:
+authoring.fla.page.prop.branching.type.chose  =Instructor's choice
+authoring.fla.page.prop.branching.type.group  =Group-based
+authoring.fla.page.prop.branching.type.tool  =Learner's output
+authoring.fla.page.prop.branching.type.optional  =Learner's choice
+authoring.fla.page.prop.grouping  =Grouping:
+authoring.fla.page.prop.branching.conditions.match  =Match conditions to branches
+authoring.fla.page.prop.branching.groups.match  =Match Groups to Branches
+authoring.fla.page.prop.branching.sequences.min  =Min sequences:
+authoring.fla.page.prop.branching.sequences.max  =Max sequences:
+authoring.fla.page.prop.optional.activities.min  =Min activities:
+authoring.fla.page.prop.optional.activities.max  =Max activities:
+authoring.fla.page.prop.color  =Color:
+authoring.fla.page.dialog.cond.output.choose  =[ Choose Output ]
+authoring.fla.page.dialog.cond.options.choose  =[ Options ]
+authoring.fla.page.dialog.cond.greater  =Greater than or equal to
+authoring.fla.page.dialog.cond.less  =Less than or equal to
+authoring.fla.page.dialog.cond.range  =Range
+authoring.fla.page.dialog.cond.range.from  =From:
+authoring.fla.page.dialog.cond.range.to  =To:
+authoring.fla.page.dialog.cond.add  =Add
+authoring.fla.page.dialog.cond.name  =Name:
+authoring.fla.page.dialog.cond.list.name  =Name
+authoring.fla.page.dialog.cond.list.condition  =Condition
+authoring.fla.page.download.image  =Click here to download the image.
+authoring.fla.page.download.wait  =Please wait for the download.
+authoring.fla.page.download.close  =Close the dialog when the download is finished.
+authoring.fla.page.svg.generator.title  =SVG Generator
+authoring.fla.tool.groups.all  =All
+authoring.fla.liveedit.cancel.confirm  =Do you want to cancel changes made in Live Edit?
+authoring.fla.liveedit.readonly.activity.error  =The activity can not be modified. It is read-only.
+authoring.fla.liveedit.readonly.move.parent.error  =The activity can not be moved outside its parent. It is read-only.
+authoring.fla.liveedit.readonly.remove.activity.error  =The activity can not be removed. It is read-only.
+authoring.fla.liveedit.readonly.remove.parent.error  =The activity can not be removed. Its parent activity is read-only.
+authoring.fla.liveedit.readonly.remove.child.error  =The activity can not be removed. It has read-only child activities.
+authoring.fla.liveedit.readonly.remove.transition.error  =The transition can not be removed. It is read-only.
+ckeditor.math.math  =Math
+ckeditor.math.functions  =Functions
+ckeditor.math.greek  =Greek
+ckeditor.math.matrix  =Matrix
+ckeditor.math.symbols  =Symbols
+ckeditor.math.arrows  =Arrows
+ckeditor.math.accents  =Accents
+ckeditor.math.formatting  =Formatting
+authoring.fla.cut.button  =Cut
+authoring.fla.modify.error  =You cannot modify this resource
+authoring.fla.folder.move.to.child.error  =Cannot move a folder into its child
+label.password.must.lcase  =at least 1 lower case letter
+label.timezone.warning  =The timezone set in your profile does not match timezone on your computer. The times shown will be for the timezone set in your profile.
+authoring.fla.folder.can.not.save.error  =You cannot save in this folder
+authoring.fla.boolean.output.suffix  =(boolean: 1 or 0)
+lessons  =Lessons
+label.tour  =Tour
+tour.intro.title  =LAMS Tour
+tour.intro.content  =This short tour will show you the features of the main LAMS screen. You can stop the tour at any time by clicking End Tour, and restart it again by clicking on the Tour button.
+tour.course.reveal.content  =Click here to reveal or hide your courses.
+tour.courses.content  =Click on a course to make it the current course.
+tour.favorites.content  =Your favourite courses will appear at the top of the list.
+tour.lessons.content  =Lessons will appear here for the current course.
+tour.notification.content  =Review the notifications that you have received about your lessons.
+tour.authoring.content  =Create or modify the learning designs used for lessons.
+tour.user.profile.content  =Update your personal settings.
+tour.course.name.title  =Course Name
+tour.course.name.content  =Current course name. Click on the star to add this course to your favourites in the course list.
+tour.add.lesson.content  =Create a new lesson for this course using this button, or a lesson to a course subgroup using the Add Lesson button next to the subgroup name.
+tour.add.single.activity.lesson.content  =Use the down arrow to select an activity and then create a lesson with just this single activity.
+tour.course.gradebook.content  =View your marks for this course.
+tour.more.actions.content  =General options for managing this course such as notifications, subgroups, gradebook. The contents of this menu will vary depending on your responsibilities.
+tour.lesson.monitoring.title  =Lesson Monitoring
+tour.lesson.monitoring.content  =The Monitoring screen shows you where the learners are in the lesson their contributions.
+tour.lesson.notifications.title  =Lesson Notifications
+tour.lesson.notifications.content  =Send email notifications to learners.
+tour.lesson.gradebook.title  =Lesson Gradebook
+tour.lesson.gradebook.content  =Review learners\' marks and the length of time taken in the lesson.
+tour.lesson.conditions.title  =Lesson Conditions
+tour.lesson.conditions.content  =Set up conditions for starting or ending the lesson.
+tour.lesson.remove.title  =Remove Lesson
+tour.lesson.remove.content  =Remove the lesson completely. This is permanent - it cannot be undone.
+tour.end.title  =End Of Tour
+tour.end.content  =Thank you for taking the tour. To restart the tour, click the Tour button again.
+errors.maxfilesize  =Uploaded file exceeded maximum size: {0}
+error.attachment.executable  =Uploaded file is executable
+label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
+label.file  =File
+authoring.fla.page.prop.size  =Size:
+authoring.fla.conditions.mapping.broken  =Conditions in the activity were changed. Please review following activities as they referred the modified conditions:
+authoring.fla.activity.unnamed.description  =unnamed
+authoring.fla.activity.gate.description  =gate
+authoring.fla.activity.branching.description  =branching
+tour.prev  =Prev
+tour.next  =Next
+tour.end.tour  =End of tour
+label.search.for.courses  =Search for courses
+label.save.as.course.grouping  =Save as a Course Grouping
+label.enter.course.grouping.name  =Please enter name for the new course grouping
+label.course.groups.name.not.unique  =Course grouping with such name already exists. Please enter another one.
+label.save.as.course.grouping.hint  =You can save the groups as "Course groupings" so it can be used in other lessons as well. If the groups are just specifically for this lesson, you might not want to do this. Otherwise, click the button to give them a name and reuse them later.
+label.advanced.settings  =Advanced settings
+audit.delete.portrait  =Portrait for user {0} {1}({2}) deleted. Portrait Id was {3}.
+authoring.fla.weights.menu  =Weights
+authoring.fla.weights.title  =Weights on activity outputs
+authoring.fla.weights.activity  =Activity
+authoring.fla.weights.output  =Output
+authoring.fla.weights.weight  =Weight
+authoring.fla.weights.sum  =Sum
+authoring.fla.weights.sum.error  =Output weights do not sum up to 100%. Adjust them in Weights dialog.
+label.tab.advanced.field.gradebook.complete  =Display activity scores on completion
+index.kumalive  =Kumalive
+index.kumalive.tooltip  =Enter a live lesson
+index.kumalive.enter.learner  =Enter as a learner
+index.kumalive.report  =Reports
+index.kumalive.rubric  =Rubrics management
+label.import.groups.from.template  =Import groups from template
+label.import.groups.from.template.description  =Download the template spreadsheet to create your groups using all the present learners in this lesson/course. Once you upload the file, the groups will be automatically created according to the spreadsheet.
+label.download.template  =Download Template
+label.upload.group.spreadsheet  =Upload Finished Spreadsheet
+error.file.required  =Grouped Spreadsheet Required
+error.file.wrong.format  =Grouped Spreadsheet in the wrong format. Please upload a file based on the given template.
+label.import.successful  =Group Import successful. {0} learners allocated to groups, {1} learners skipped.
+label.import.warning.replace.groups  =Importing this file will replace the existing groups. Do you want to import this file?
+filename.create.grouping.template  =create-grouping-template
+spreadsheet.column.login  =Login
+spreadsheet.column.firstname  =First Name
+spreadsheet.column.lastname  =Last Name
+spreadsheet.column.groupname  =Group Name
+error.groups.upload.locked  =Cannot update groups as the groups are now in use.
+error.branching.upload.must.use.existing.groups  =Cannot update branching. Must use the existing names: {0}.
+label.print  =Print
+authoring.tbl.desc.peer.review  =These are the criteria for which the learners will rate each other using a 5 star rating. These fields are optional and no Peer Review will be created if they are left blank.
+authoring.section.peerreview  =Peer Review
+authoring.label.peerrevice.criteria.num  =Rating Criteria {0}
+authoring.label.peerrevice.allow.comments  =Allow learners to comment on other learners
+authoring.label.peerrevice.min.words.in.comments  =Minimum number of words in a comment
+authoring.create.criteria  =Create Criteria
+audit.design.created  =Learning design "{0}" ({1}) created by {2} ({3})
+authoring.fla.save.successful.check.grouping  =Your design is valid and has been saved.\\nIf this is a TBL sequence, you may want to make following activities grouped:
+authoring.fla.weights.none  =No activities with weightable gradebook output
+audit.live.edit.start  =Live Edit of Learning Design "{0}" ({1}) for Lesson ({2}) started by {3} ({4})
+audit.live.edit.end  =Live Edit of Learning Design "{0}" ({1}) for Lesson ({2}) completed by {3} ({4})
+label.post.anonomously  =Post anonymously
+label.anonymous  =Anonymous
+label.anonymous.tooltip  =Turn on "Post anonymously" to hide your name from other learners. Teachers will still be able to see your name.
+authoring.fla.page.ld.title.desc  =Click to display sequence details
+label.start  =Start:
+label.end  =End:
+error.lesson.with.scheduled.end.only.have.individual.limits  =Lessons with a scheduled end date can only have individual time limits, not a lesson time limit.
+error.lesson.end.date.must.be.after.start.date  =Scheduled end date must be after the start date.
+label.policies.title  =Policies
+label.agree.to.policies.before.proceeding  =Please agree to all the policies before proceeding
+label.consent.required  =Consent is required
+label.agree.to.policy  =I agree to the policy
+label.policy.name  =Policy name
+label.policy.type  =Policy type
+label.policy.type.site  =Site policy
+label.policy.type.privacy  =Privacy policy
+label.policy.type.third.party  =Third party policy
+label.policy.type.other  =Other policy
+label.summary  =Summary
+label.full.policy  =Full policy
+label.consent  =Consent
+label.policies.consents  =Policies and consents
+label.version  =Version
+label.consented  =Consented?
+label.consented.on  =Consented on
+label.policy.details  =Policy details
+authoring.fla.page.prop.gradebook.none  =No score
+label.select.country  =Select a country
+error.country.required  =Country is required
+error.cannot.login.as.with.not.allow.direct.access  =You cannot login as this user as they are an Integration Learner and 'Allow direct access to main LAMS page for Integration Learners' is turned off in the system configuration.
+signup.email.verify.body.1  =Hi there,
+signup.email.verify.body.2  =Please confirm your email address by clicking on the link below
+signup.email.verify.body.3  =Regards,
+signup.email.verify.body.4  =LAMS Signup System
+signup.email.welcome.body.1  =Hi there,
+signup.email.welcome.body.2  =You''ve successfully registered an account with username {0} on the LAMS server at {1}.
+signup.email.welcome.body.3  =If you ever forget your password, you can reset it via this URL
+signup.email.welcome.body.4  =Regards,
+signup.email.welcome.body.5  =LAMS Signup System
+authoring.fla.readonly.checkbox  =read-only
+authoring.fla.readonly.forbidden  =This sequence is read-only. If you want to modify it, you can create its copy.
+register.email.verify  =A confirmation email will be sent before you are able to log in.
+signup.email.verify.sent  =A confirmation email has been sent to {0}<br />Check your email and follow the instructions.
+authoring.enable.confidence.levels  =Enable confidence levels
+authoring.fla.page.menu.apply.changes  =Apply changes
+forgot.password.request.processed  =If the email/username that you have provided exists, an email would be sent to the registered email address.
+label.view  =View
+index.outcome.manage  =Outcomes
+index.outcome.manage.tooltip  =Manage learning outcomes and scales
+outcome.manage.remove  =Remove outcome
+outcome.manage.remove.confirm  =Are you sure you want to remove this outcome?
+outcome.manage.add  =Add outcome
+outcome.manage.edit  =Edit outcome
+outcome.manage.view  =View outcome
+outcome.manage.add.name  =Name
+outcome.manage.add.code  =Code
+outcome.manage.add.description  =Description
+outcome.manage.add.scale  =Scale
+outcome.manage.add.save  =Save
+outcome.manage.add.error  =Error while saving an outcome
+outcome.manage.add.error.name.blank  =Name can not be blank
+outcome.manage.add.error.code.blank  =Code can not be blank
+outcome.manage.add.error.scale.choose  =You have to choose a scale
+outcome.manage.remove.error.in.use =The outcome is mapped to some items. It can not be removed.
+scale.title  =Scales
+scale.manage  =Manage scales
+scale.manage.add  =Add scale
+scale.manage.edit  =Edit scale
+scale.manage.view  =View scale
+scale.manage.remove  =Remove scale
+scale.manage.remove.scale  =Error while removing a scale.
+scale.manage.remove.error.in.use =The scale is used in some outcomes. It can not be removed.
+scale.manage.remove.confirm  =Are you sure you want to remove this scale?
+scale.manage.add.value  =Values
+scale.manage.add.value.info  =Enter comma separated values in increasing order of value. For example, an A,B,C,D scale must be entered as D,C,B,A.
+scale.manage.add.value.error.blank  =A value must not be blank
+scale.manage.add.error  =Error while saving an outcome scale
+outcome.authoring.title  =Learning outcomes
+outcome.authoring.input  =Search and select by outcome name or code
+outcome.authoring.existing  =Added outcomes
+outcome.authoring.existing.none  =none
+outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
+outcome.authoring.create.new = [create new]
+outcome.export.date  =Exported on:
+outcome.export  =Export
+outcome.import  =Import
+outcome.import.error  =Error while importing outcomes or scales. Check logs.
+authoring.msg.close.cancel.save  =Do you want to close this window without saving?
+authoring.msg.list.cancel.save  =Do you want to return to the template list without saving?
+authoring.fla.page.menu.new.template  =Use Template
+authoring.template.list.introduction  =Select a template from the list to see more details about the design that will be created. You can the proceed to create the design or return back to this list.
+authoring.learning.design.templates  =Learning Design Templates
+authoring.template.successful  =Your design has been saved as {0}.
+authoring.label.sequence.title  =Name
+authoring.error.question.num  =RAT Questions: Question {0} may not be blank
+authoring.error.question.correct.num  =RAT Questions: One of the answers for Question {0} needs to be correct.
+authoring.description.application.exercise  =Application Exercise (These question(s) will be shown during the analysis phase in the sequence.)
+authoring.label.grouping  =Teams
+authoring.label.group.name  =Team_{0}
+authoring.label.grouping.learners.choice  =Learner's Choice
+authoring.label.grouping.teachers.choice  =Teacher's Choice
+authoring.label.grouping.random.allocation  =Random Allocation
+authoring.label.numgroups  =Number of teams:
+authoring.error.numgroups  =Number of teams must be 1 to 99.
+authoring.label.numlearners  =Number of learners:
+authoring.error.numlearners  =Number of learners must be 1 to 99.
+authoring.error.group.data  =Teams settings are not correct.
+authoring.section.lessondetails  =Lesson Details
+authoring.section.questions  =RAT Questions
+authoring.section.applicationexercise  =Application Exercises
+authoring.section.introduction  =Introduction
+authoring.create.question  =Add Question
+authoring.create.essay.question  =Add Essay Question
+authoring.create.mc.question  =Add Multiple Choice Question
+authoring.label.application.exercise.num  =Application Exercise {0}
+authoring.error.application.exercise.num  =Application Exercises: Application Exercise {0} may not be blank.
+authoring.label.question.num  =Question {0}
+authoring.label.option.num  =Option {0}
+authoring.error.option  =Option may not be blank
+authoring.label.correct.question  =Correct?
+authoring.create.option  =Add Option
+button.next  =Next
+button.previous  =Previous
+button.return.to.template.list  =Back to Templates
+authoring.error.content.id  =Content ID is missing
+authoring.error.question.must.have.answer.num  =RAT Questions: Question {0} must have at least one answer.
+authoring.error.application.exercise.question.must.not.be.blank.num =Application Exercises: {0} Question {1} may not be blank.
+authoring.error.application.exercise.must.have.answer.num  =Application Exercises: {0} Question {1} must have at least one answer.
+authoring.error.application.exercise.must.have.100.percent  =Application Exercises:  {0} Question {1} must have at least one answer worth 100%.
+authoring.error.application.exercise.not.blank.and.grade  =Application Exercises: {0} Question {1} may not be blank and must have a grade.
+authoring.error.application.exercise.needs.noticeboard.text  =Application Exercises:  {0} is missing the text for the noticeboard.
+authoring.error.rat.not.blank=RAT Questions:  There must be at least one question.
+authoring.label.grade  =Grade
+authoring.label.none  =None
+authoring.tbl.template.title  =Team Based Learning
+authoring.tbl.template.description  =Individual and Team Readiness Assessments followed by Application Exercises.
+authoring.tbl.desc.question  =Adding RAT questions.
+authoring.tbl.enable.confidence.tooltip =Asks students in the iRAT how confident they are with their choosen answer. Then the confidence level for each student is displayed in the tRAT to all members of their team.
+authoring.tbl.desc.ae  =Adding Application Exercises (AEs). You can create multiple AEs if needed.
+authoring.template.basic.import.qti  =Import IMS QTI
+authoring.tbl.use.noticeboard=Add Noticeboard after AE
+authoring.tbl.use.noticeboard.tooltip=After the AE, displays content to students as additional information or as a reflection on the AE topic
+authoring.create.application.exercise=Add New Application Exercise
+label.marks=Marks
+authoring.tbl.delete.appex.prompt=Do you want to delete the Application Exercise {0}?
+authoring.tbl.delete.mcq.prompt=Do you want to delete the RAT Question {0}?
+
+#QB questions#
+label.create.question  =Create question
+label.question.type.multiple.choice  =Multiple choice
+label.question.type.matching.pairs  =Matching pairs
+label.question.type.short.answer  =Short answer
+label.question.type.numerical  =Numerical
+label.question.type.true.false  =True/False
+label.question.type.essay  =Essay
+label.question.type.ordering  =Ordering
+label.question.type.mark.hedging  =Mark hedging
+label.search.question.bank  =Search question bank
+label.question.type  =Type:
+label.question.successfully.imported  =Question successfully imported
+label.import.qti  =Import questions in IMS QTI format
+label.export.qti  =Export questions in IMS QTI format
+label.import.xml  =Import questions in XML format
+label.export.xml  =Export questions in XML format
+msg.import.file.format  =The import file must be .xml file exported from assessment tool and not exceed size of {0}
+error.import.file.format  =The import file is not an .xml file.
+
+#======= End labels: Exported 872 labels for en AU =====
Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
===================================================================
diff -u -re3bdd10ab88fbb1a570a9a79de64df6dbfef2922 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision e3bdd10ab88fbb1a570a9a79de64df6dbfef2922)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(.../AuthoringService.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -379,7 +379,7 @@
     @Override
     public boolean setupEditOnFlyLock(Long learningDesignID, Integer userID)
 	    throws LearningDesignException, UserException, IOException {
-	User user = (User) baseDAO.find(User.class, userID);
+	User user = baseDAO.find(User.class, userID);
 	if (user == null) {
 	    throw new UserException(messageService.getMessage("no.such.user.exist", new Object[] { userID }));
 	}
@@ -431,7 +431,7 @@
 
     @Override
     public void setupEditOnFlyGate(Long learningDesignID, Integer userID) throws UserException, IOException {
-	User user = (User) baseDAO.find(User.class, userID);
+	User user = baseDAO.find(User.class, userID);
 	if (user == null) {
 	    throw new UserException(messageService.getMessage("no.such.user.exist", new Object[] { userID }));
 	}
@@ -457,7 +457,7 @@
     @SuppressWarnings("unchecked")
     @Override
     public void finishEditOnFly(Long learningDesignID, Integer userID, boolean cancelled) throws Exception {
-	User user = (User) baseDAO.find(User.class, userID);
+	User user = baseDAO.find(User.class, userID);
 	if (user == null) {
 	    throw new IOException("User not found, ID: " + userID);
 	}
@@ -778,12 +778,12 @@
 		    messageService.getMessage("no.such.learningdesign.exist", new Object[] { originalDesignID }));
 	}
 
-	User user = (User) baseDAO.find(User.class, userID);
+	User user = baseDAO.find(User.class, userID);
 	if (user == null) {
 	    throw new UserException(messageService.getMessage("no.such.user.exist", new Object[] { userID }));
 	}
 
-	WorkspaceFolder workspaceFolder = (WorkspaceFolder) baseDAO.find(WorkspaceFolder.class, workspaceFolderID);
+	WorkspaceFolder workspaceFolder = baseDAO.find(WorkspaceFolder.class, workspaceFolderID);
 	if (workspaceFolder == null) {
 	    throw new WorkspaceFolderException(
 		    messageService.getMessage("no.such.workspace.exist", new Object[] { workspaceFolderID }));
@@ -879,7 +879,8 @@
 	    ToolActivity toolActivity = (ToolActivity) activity;
 	    // copy the content
 	    Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, customCSV);
-	    outcomeService.copyOutcomeMappings(null, toolActivity.getToolContentId(), null, null, newContentId, null);
+	    outcomeService.copyOutcomeMappings(null, toolActivity.getToolContentId(), null, null, null, newContentId,
+		    null, null);
 	    toolActivity.setToolContentId(newContentId);
 
 	    // clear read only field
@@ -1309,7 +1310,7 @@
 	User user = null;
 	Integer userID = AuthoringService.getUserId();
 	if (userID != null) {
-	    user = (User) baseDAO.find(User.class, userID);
+	    user = baseDAO.find(User.class, userID);
 	}
 	if (user == null) {
 	    throw new UserException("UserID missing or user not found.");
@@ -1319,7 +1320,7 @@
 	WorkspaceFolder workspaceFolder = null;
 	boolean authorised = false;
 	if (workspaceFolderID != null) {
-	    workspaceFolder = (WorkspaceFolder) baseDAO.find(WorkspaceFolder.class, workspaceFolderID);
+	    workspaceFolder = baseDAO.find(WorkspaceFolder.class, workspaceFolderID);
 	    authorised = workspaceManagementService.isUserAuthorizedToModifyFolderContents(workspaceFolderID, userID);
 	}
 
@@ -1403,7 +1404,7 @@
     @Override
     public Long copyToolContent(Long toolContentID, String customCSV) throws IOException {
 	Long newToolContentID = lamsCoreToolService.notifyToolToCopyContent(toolContentID, customCSV);
-	outcomeService.copyOutcomeMappings(null, toolContentID, null, null, newToolContentID, null);
+	outcomeService.copyOutcomeMappings(null, toolContentID, null, null, null, newToolContentID, null, null);
 	return newToolContentID;
     }
 
@@ -1414,7 +1415,7 @@
     public Vector<LicenseDTO> getAvailableLicenses() {
 	List<License> licenses = licenseDAO.getLicensesByOrderId();
 	Vector<LicenseDTO> licenseDTOList = new Vector(licenses.size());
-	for ( License element : licenses ) {
+	for (License element : licenses) {
 	    licenseDTOList.add(element.getLicenseDTO(Configuration.get(ConfigurationKeys.SERVER_URL)));
 	}
 	return licenseDTOList;
@@ -1428,7 +1429,7 @@
     public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID,
 	    Long learningLibraryID, String contentFolderID, Integer organisationID) {
 	Integer userID = AuthoringService.getUserId();
-	User user = (User) baseDAO.find(User.class, userID);
+	User user = baseDAO.find(User.class, userID);
 
 	LearningDesign learningDesign = new LearningDesign(null, null, null, learningDesignTitle, null, null, 1, false,
 		false, null, null, null, new Date(), Configuration.get(ConfigurationKeys.SERVER_VERSION_NUMBER), user,
@@ -1443,7 +1444,7 @@
 	    learningDesign.setCopyTypeID(LearningDesign.COPY_TYPE_LESSON);
 	    // taken from MonitoringService#initializeLesson()
 	    int MAX_DEEP_LEVEL_FOLDER = 50;
-	    Organisation organisation = (Organisation) baseDAO.find(Organisation.class, organisationID);
+	    Organisation organisation = baseDAO.find(Organisation.class, organisationID);
 	    for (int idx = 0; idx < MAX_DEEP_LEVEL_FOLDER; idx++) {
 		if ((organisation == null) || (folder != null)) {
 		    break;
Index: lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(.../OutcomeController.java)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java	(.../OutcomeController.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,645 +1,676 @@
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
- *
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
-
-package org.lamsfoundation.lams.web.outcome;
-
-import java.util.Date;
-import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
-import java.util.List;
-import java.util.Set;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.log4j.Logger;
-import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.outcome.Outcome;
-import org.lamsfoundation.lams.outcome.OutcomeMapping;
-import org.lamsfoundation.lams.outcome.OutcomeResult;
-import org.lamsfoundation.lams.outcome.OutcomeScale;
-import org.lamsfoundation.lams.outcome.OutcomeScaleItem;
-import org.lamsfoundation.lams.outcome.service.IOutcomeService;
-import org.lamsfoundation.lams.security.ISecurityService;
-import org.lamsfoundation.lams.usermanagement.Role;
-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.Configuration;
-import org.lamsfoundation.lams.util.ConfigurationKeys;
-import org.lamsfoundation.lams.util.ExcelCell;
-import org.lamsfoundation.lams.util.ExcelUtil;
-import org.lamsfoundation.lams.util.FileUtil;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.WebUtil;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Controller;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
-import org.springframework.web.bind.annotation.ModelAttribute;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.multipart.MultipartFile;
-
-import com.fasterxml.jackson.databind.node.ArrayNode;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-
-@Controller
-@RequestMapping("/outcome")
-public class OutcomeController {
-    private static Logger log = Logger.getLogger(OutcomeController.class);
-
-    @Autowired
-    private IUserManagementService userManagementService;
-    @Autowired
-    private ISecurityService securityService;
-    @Autowired
-    private IOutcomeService outcomeService;
-    @Autowired
-    @Qualifier("centralMessageService")
-    private MessageService messageService;
-
-    @RequestMapping("/outcomeManage")
-    public String outcomeManage(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
-
-	List<Outcome> outcomes = outcomeService.getOutcomes();
-	request.setAttribute("outcomes", outcomes);
-	return "outcome/outcomeManage";
-    }
-
-    @RequestMapping("/outcomeEdit")
-    public String outcomeEdit(@ModelAttribute OutcomeForm outcomeForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
-
-	Long outcomeId = WebUtil.readLongParam(request, "outcomeId", true);
-	Outcome outcome = outcomeId == null ? null : (Outcome) userManagementService.findById(Outcome.class, outcomeId);
-
-	outcomeForm.setContentFolderId(IOutcomeService.OUTCOME_CONTENT_FOLDER_ID);
-	if (outcome == null) {
-	    outcomeForm.setScaleId(IOutcomeService.DEFAULT_SCALE_ID);
-	} else {
-	    outcomeForm.setOutcomeId(outcome.getOutcomeId());
-	    outcomeForm.setName(outcome.getName());
-	    outcomeForm.setCode(outcome.getCode());
-	    outcomeForm.setDescription(outcome.getDescription());
-	    outcomeForm.setScaleId(outcome.getScale().getScaleId());
-	}
-
-	List<OutcomeScale> scales = outcomeService.getScales();
-	request.setAttribute("scales", scales);
-
-	return "outcome/outcomeEdit";
-    }
-
-    @SuppressWarnings("unchecked")
-    @RequestMapping("/outcomeSave")
-    public String outcomeSave(@ModelAttribute OutcomeForm outcomeForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	Integer userId = getUserDTO().getUserID();
-	Long outcomeId = outcomeForm.getOutcomeId();
-	Outcome outcome = outcomeId == null ? null : (Outcome) userManagementService.findById(Outcome.class, outcomeId);
-
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
-	validateOutcomeForm(outcomeForm, errorMap);
-	if (!errorMap.isEmpty()) {
-	    request.setAttribute("errorMap", errorMap);
-	} else {
-	    try {
-		if (outcome == null) {
-		    outcome = new Outcome();
-		    User user = (User) userManagementService.findById(User.class, userId);
-		    outcome.setCreateBy(user);
-		    outcome.setCreateDateTime(new Date());
-		}
-
-		outcome.setName(outcomeForm.getName());
-		outcome.setCode(outcomeForm.getCode());
-		outcome.setDescription(outcomeForm.getDescription());
-		long scaleId = outcomeForm.getScaleId() == null || outcomeForm.getScaleId() == 0
-			? IOutcomeService.DEFAULT_SCALE_ID
-			: outcomeForm.getScaleId();
-		OutcomeScale scale = (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
-		outcome.setScale(scale);
-		userManagementService.save(outcome);
-
-		if (log.isDebugEnabled()) {
-		    log.debug("Saved outcome " + outcome.getOutcomeId());
-		}
-		request.setAttribute("saved", true);
-	    } catch (Exception e) {
-		log.error("Exception while saving an outcome", e);
-		errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error"));
-		request.setAttribute("errorMap", errorMap);
-	    }
-	}
-
-	List<OutcomeScale> scales = userManagementService.findAll(OutcomeScale.class);
-	request.setAttribute("scales", scales);
-	return "outcome/outcomeEdit";
-    }
-
-    @RequestMapping("/outcomeRemove")
-    public String outcomeRemove(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
-
-	Long outcomeId = WebUtil.readLongParam(request, "outcomeId", false);
-	Outcome outcome = (Outcome) userManagementService.findById(Outcome.class, outcomeId);
-	if (outcome == null) {
-	    throw new IllegalArgumentException("Can not find an outcome with ID " + outcomeId);
-	}
-
-	long mappingCount = outcomeService.countOutcomeMappings(outcomeId);
-	if (mappingCount == 0) {
-	    userManagementService.delete(outcome);
-	    if (log.isDebugEnabled()) {
-		log.debug("Deleted outcome " + outcomeId);
-	    }
-	} else {
-	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
-	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.remove.error.in.use"));
-	    request.setAttribute("errorMap", errorMap);
-	}
-
-	return outcomeManage(request, response);
-    }
-
-    @RequestMapping("/outcomeSearch")
-    @ResponseBody
-    public String outcomeSearch(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	String search = WebUtil.readStrParam(request, "term", true);
-	boolean addEnabled = Configuration.getAsBoolean(ConfigurationKeys.LEARNING_OUTCOME_QUICK_ADD_ENABLE);
-
-	List<Outcome> outcomes = outcomeService.getOutcomes(search);
-	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
-	for (Outcome outcome : outcomes) {
-	    ObjectNode outcomeJSON = JsonNodeFactory.instance.objectNode();
-	    outcomeJSON.put("value", outcome.getOutcomeId());
-	    outcomeJSON.put("label",
-		    outcome.getName() + (StringUtils.isBlank(outcome.getCode()) ? "" : " (" + outcome.getCode() + ")"));
-	    responseJSON.add(outcomeJSON);
-	}
-	responseJSON.add(search);
-	responseJSON.add(String.valueOf(addEnabled));
-	response.setContentType("application/json;charset=utf-8");
-	return responseJSON.toString();
-    }
-
-    @RequestMapping("/outcomeMap")
-    @ResponseBody
-    public String outcomeMap(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	Long outcomeId = WebUtil.readLongParam(request, "outcomeId", true);
-	Long lessonId = WebUtil.readLongParam(request, "lessonId", true);
-	Long toolContentId = WebUtil.readLongParam(request, "toolContentId", true);
-	if (lessonId == null && toolContentId == null) {
-	    throw new IllegalArgumentException(
-		    "Either lesson ID or tool content ID must not be null when creating an outcome mapping");
-	}
-	Long itemId = WebUtil.readLongParam(request, "itemId", true);
-	Outcome outcome = null;
-	if (outcomeId == null) {
-	    boolean addEnabled = Configuration.getAsBoolean(ConfigurationKeys.LEARNING_OUTCOME_QUICK_ADD_ENABLE);
-	    if (!addEnabled) {
-		throw new SecurityException("Adding Learning Outcomes on the fly is disabled");
-	    }
-	    // create a new outcome on the fly
-	    String name = WebUtil.readStrParam(request, "name");
-	    String code = null;
-	    // check if name contains code part
-	    String[] nameParts = name.split("\\(");
-	    if (nameParts.length > 1) {
-		name = nameParts[0].trim();
-		code = nameParts[1].replaceFirst("\\)", "").trim();
-	    }
-	    outcome = new Outcome();
-
-	    Integer userId = getUserDTO().getUserID();
-	    User user = (User) userManagementService.findById(User.class, userId);
-	    outcome.setCreateBy(user);
-	    outcome.setCreateDateTime(new Date());
-
-	    outcome.setName(name);
-	    outcome.setCode(code);
-	    OutcomeScale scale = (OutcomeScale) userManagementService.findById(OutcomeScale.class,
-		    IOutcomeService.DEFAULT_SCALE_ID);
-	    outcome.setScale(scale);
-	    userManagementService.save(outcome);
-
-	    if (log.isDebugEnabled()) {
-		log.debug("Saved outcome " + outcome.getOutcomeId());
-	    }
-
-	} else {
-	    outcome = (Outcome) userManagementService.findById(Outcome.class, outcomeId);
-	}
-
-	List<OutcomeMapping> outcomeMappings = outcomeService.getOutcomeMappings(lessonId, toolContentId, itemId);
-	for (OutcomeMapping existingMapping : outcomeMappings) {
-	    if (existingMapping.getOutcome().getOutcomeId().equals(outcome.getOutcomeId())) {
-		throw new IllegalArgumentException(
-			"Trying to map an already mapped outcome with ID " + outcome.getOutcomeId());
-	    }
-	}
-
-	OutcomeMapping outcomeMapping = new OutcomeMapping();
-	outcomeMapping.setOutcome(outcome);
-	outcomeMapping.setLessonId(lessonId);
-	outcomeMapping.setToolContentId(toolContentId);
-	outcomeMapping.setItemId(itemId);
-	userManagementService.save(outcomeMapping);
-
-	if (log.isDebugEnabled()) {
-	    log.debug("Mapped outcome " + outcome.getOutcomeId() + " to lesson ID " + lessonId + " and tool content ID "
-		    + toolContentId + " and item ID " + itemId);
-	}
-
-	response.setContentType("text/plain;charset=utf-8");
-	return String.valueOf(outcomeMapping.getMappingId());
-    }
-
-    @RequestMapping("/outcomeGetMappings")
-    @ResponseBody
-    public String outcomeGetMappings(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	Long lessonId = WebUtil.readLongParam(request, "lessonId", true);
-	Long toolContentId = WebUtil.readLongParam(request, "toolContentId", true);
-	if (lessonId == null && toolContentId == null) {
-	    throw new IllegalArgumentException(
-		    "Either lesson ID or tool content ID must not be null when fetching outcome mappings");
-	}
-	Long itemId = WebUtil.readLongParam(request, "itemId", true);
-	Integer userId = getUserDTO().getUserID();
-	if (!request.isUserInRole(Role.SYSADMIN) && !request.isUserInRole(Role.AUTHOR)) {
-	    String error = "User " + userId + " is not sysadmin nor an author and can not map outcome";
-	    log.error(error);
-	    throw new SecurityException(error);
-	}
-
-	List<OutcomeMapping> outcomeMappings = outcomeService.getOutcomeMappings(lessonId, toolContentId, itemId);
-	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
-	for (OutcomeMapping outcomeMapping : outcomeMappings) {
-	    Outcome outcome = outcomeMapping.getOutcome();
-	    ObjectNode outcomeJSON = JsonNodeFactory.instance.objectNode();
-	    outcomeJSON.put("mappingId", outcomeMapping.getMappingId());
-	    outcomeJSON.put("outcomeId", outcome.getOutcomeId());
-	    outcomeJSON.put("label",
-		    outcome.getName() + (StringUtils.isBlank(outcome.getCode()) ? "" : " (" + outcome.getCode() + ")"));
-	    responseJSON.add(outcomeJSON);
-	}
-	response.setContentType("application/json;charset=utf-8");
-	return responseJSON.toString();
-    }
-
-    @RequestMapping("/outcomeRemoveMapping")
-    public void outcomeRemoveMapping(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	Long mappingId = WebUtil.readLongParam(request, "mappingId");
-	OutcomeMapping outcomeMapping = (OutcomeMapping) userManagementService.findById(OutcomeMapping.class,
-		mappingId);
-	userManagementService.delete(outcomeMapping);
-
-	if (log.isDebugEnabled()) {
-	    log.debug("Deleted outcome mapping " + mappingId);
-	}
-    }
-
-    @SuppressWarnings("unchecked")
-    @RequestMapping("/outcomeSetResult")
-    @ResponseBody
-    public String outcomeSetResult(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	Long mappingId = WebUtil.readLongParam(request, "pk");
-	Integer value = WebUtil.readIntParam(request, "value");
-	Integer targetUserId = WebUtil.readIntParam(request, "name");
-	OutcomeMapping outcomeMapping = (OutcomeMapping) userManagementService.findById(OutcomeMapping.class,
-		mappingId);
-	Long lessonId = outcomeMapping.getLessonId();
-	if (lessonId == null) {
-	    ToolActivity toolActivity = ((List<ToolActivity>) userManagementService.findByProperty(ToolActivity.class,
-		    "toolContentId", outcomeMapping.getToolContentId())).get(0);
-	    lessonId = toolActivity.getLearningDesign().getLessons().iterator().next().getLessonId();
-	}
-	Integer userId = getUserDTO().getUserID();
-	securityService.isLessonMonitor(lessonId, userId, "set outcome result", true);
-
-	OutcomeResult result = outcomeService.getOutcomeResult(userId, mappingId);
-	if (result == null) {
-	    // result does not exist; if value == -1, it means it is not meant to exist, otherwise create
-	    if (value > -1) {
-		result = new OutcomeResult();
-		User user = (User) userManagementService.findById(User.class, userId);
-		result.setCreateBy(user);
-		result.setCreateDateTime(new Date());
-		result.setMapping(outcomeMapping);
-		User targetUser = (User) userManagementService.findById(User.class, targetUserId);
-		result.setUser(targetUser);
-		result.setValue(value);
-		userManagementService.save(result);
-		if (log.isDebugEnabled()) {
-		    log.debug("Added outcome result " + result.getResultId());
-		}
-	    }
-	    // modify only if value is different
-	} else if (!result.getValue().equals(value)) {
-	    // if value is -1, remove the result
-	    if (value == -1) {
-		Long resultId = result.getResultId();
-		userManagementService.delete(result);
-		if (log.isDebugEnabled()) {
-		    log.debug("Deleted outcome result " + resultId);
-		}
-	    } else {
-		// update existing result
-		result.setValue(value);
-		User user = (User) userManagementService.findById(User.class, userId);
-		result.setCreateBy(user);
-		result.setCreateBy(user);
-		result.setValue(value);
-		userManagementService.save(result);
-		if (log.isDebugEnabled()) {
-		    log.debug("Edited outcome result " + result.getResultId());
-		}
-	    }
-	}
-
-	// if something else than OK is sent, x-editable will print ERROR!
-	response.setContentType("text/plain;charset=utf-8");
-	return "OK";
-    }
-
-    @RequestMapping("/outcomeExport")
-    public void outcomeExport(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "export outcomes", true);
-
-	LinkedHashMap<String, ExcelCell[][]> dataToExport = outcomeService.exportOutcomes();
-
-	String fileName = "lams_outcomes.xls";
-	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
-
-	response.setContentType("application/x-download");
-	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-
-	// 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);
-
-	// Code to generate file and write file contents to response
-	ServletOutputStream out = response.getOutputStream();
-	ExcelUtil.createExcelXLS(out, dataToExport, messageService.getMessage("outcome.export.date"), true);
-    }
-
-    @RequestMapping("/outcomeImport")
-    public String outcomeImport(@RequestParam("file") MultipartFile file, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
-
-	try {
-	    int importCount = outcomeService.importOutcomes(file);
-	    log.info("Imported " + importCount + " outcomes");
-	} catch (Exception e) {
-	    log.error("Error while importing outcomes", e);
-	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
-	    errorMap.add("GLOBAL", messageService.getMessage("outcome.import.error"));
-	    request.setAttribute("errorMap", errorMap);
-	}
-
-	return outcomeManage(request, response);
-    }
-
-    @RequestMapping("/scaleManage")
-    public String scaleManage(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	List<OutcomeScale> scales = outcomeService.getScales();
-	request.setAttribute("scales", scales);
-
-	return "outcome/scaleManage";
-    }
-
-    @RequestMapping("/scaleRemove")
-    public String scaleRemove(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	Long scaleId = WebUtil.readLongParam(request, "scaleId", false);
-	OutcomeScale scale = (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
-	if (scale == null) {
-	    throw new IllegalArgumentException("Can not find an outcome scale with ID " + scaleId);
-	}
-
-	long scaleUseCount = outcomeService.countScaleUse(scaleId);
-	if (scaleUseCount == 0) {
-	    userManagementService.delete(scale);
-	    if (log.isDebugEnabled()) {
-		log.debug("Deleted outcome scale " + scaleId);
-	    }
-	} else {
-	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
-	    errorMap.add("GLOBAL", messageService.getMessage("scale.manage.remove.error.in.use"));
-	    request.setAttribute("errorMap", errorMap);
-	}
-
-	return scaleManage(request, response);
-    }
-
-    @RequestMapping("/scaleEdit")
-    public String scaleEdit(@ModelAttribute("scaleForm") OutcomeScaleForm scaleForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	Long scaleId = WebUtil.readLongParam(request, "scaleId", true);
-	OutcomeScale scale = scaleId == null ? null
-		: (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
-
-	scaleForm.setContentFolderId(IOutcomeService.OUTCOME_CONTENT_FOLDER_ID);
-	if (scale != null) {
-	    scaleForm.setScaleId(scale.getScaleId());
-	    scaleForm.setName(scale.getName());
-	    scaleForm.setCode(scale.getCode());
-	    scaleForm.setDescription(scale.getDescription());
-	    scaleForm.setItems(scale.getItemString());
-	}
-
-	request.setAttribute("isDefaultScale", outcomeService.isDefaultScale(scaleForm.getScaleId()));
-	return "outcome/scaleEdit";
-    }
-
-    @RequestMapping("/scaleSave")
-    public String scaleSave(@ModelAttribute("scaleForm") OutcomeScaleForm scaleForm, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	Integer userId = getUserDTO().getUserID();
-	Long scaleId = scaleForm.getScaleId();
-	OutcomeScale scale = scaleId == null ? null
-		: (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
-	if (scale != null && outcomeService.isDefaultScale(scaleId)) {
-	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "The default scale can not be altered");
-	    return null;
-	}
-
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
-	validateScaleForm(scaleForm, errorMap);
-	List<String> items = OutcomeScale.parseItems(scaleForm.getItems());
-	if (items == null) {
-	    errorMap.add("GLOBAL", messageService.getMessage("scale.manage.add.value.error.blank"));
-	}
-	if (errorMap.isEmpty()) {
-	    try {
-		if (scale == null) {
-		    scale = new OutcomeScale();
-		    User user = (User) userManagementService.findById(User.class, userId);
-		    scale.setCreateBy(user);
-		    scale.setCreateDateTime(new Date());
-		}
-
-		scale.setName(scaleForm.getName());
-		scale.setCode(scaleForm.getCode());
-		scale.setDescription(scaleForm.getDescription());
-		userManagementService.save(scale);
-
-		// find existing scales and add new ones
-		Set<OutcomeScaleItem> newItems = new LinkedHashSet<>();
-		int value = 0;
-		for (String itemString : items) {
-		    itemString = itemString.trim();
-		    if (StringUtils.isBlank(itemString)) {
-			errorMap.add("GLOBAL", messageService.getMessage("scale.manage.add.value.error.blank"));
-			break;
-		    }
-		    OutcomeScaleItem item = null;
-		    for (OutcomeScaleItem exisitngItem : scale.getItems()) {
-			if (itemString.equals(exisitngItem.getName())) {
-			    item = exisitngItem;
-			    break;
-			}
-		    }
-		    if (item == null) {
-			item = new OutcomeScaleItem();
-			item.setScale(scale);
-			item.setName(itemString);
-		    }
-		    item.setValue(value++);
-		    newItems.add(item);
-		}
-		if (errorMap.isEmpty()) {
-		    scale.getItems().clear();
-		    scale.getItems().addAll(newItems);
-		    userManagementService.save(scale);
-
-		    if (log.isDebugEnabled()) {
-			log.debug("Saved outcome scale " + scale.getScaleId());
-		    }
-
-		    request.setAttribute("saved", true);
-		}
-	    } catch (Exception e) {
-		log.error("Exception while saving an outcome", e);
-		errorMap.add("GLOBAL", messageService.getMessage("scale.manage.add.error"));
-	    }
-	}
-	if (!errorMap.isEmpty()) {
-	    request.setAttribute("errorMap", errorMap);
-	}
-
-	return "outcome/scaleEdit";
-    }
-
-    @RequestMapping("/scaleExport")
-    public void scaleExport(HttpServletRequest request, HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "export outcome scales", true);
-
-	LinkedHashMap<String, ExcelCell[][]> dataToExport = outcomeService.exportScales();
-
-	String fileName = "lams_outcome_scales.xls";
-	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
-
-	response.setContentType("application/x-download");
-	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-
-	// 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);
-
-	// Code to generate file and write file contents to response
-	ServletOutputStream out = response.getOutputStream();
-	ExcelUtil.createExcelXLS(out, dataToExport, messageService.getMessage("outcome.export.date"), true);
-    }
-
-    @RequestMapping("/scaleImport")
-    public String scaleImport(@RequestParam("file") MultipartFile file, HttpServletRequest request,
-	    HttpServletResponse response) throws Exception {
-	UserDTO user = getUserDTO();
-	securityService.isSysadmin(user.getUserID(), "import outcome scales", true);
-
-	try {
-	    int importCount = outcomeService.importScales(file);
-	    log.info("Imported " + importCount + " outcome scales");
-	} catch (Exception e) {
-	    log.error("Error while importing outcome scales", e);
-	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
-	    errorMap.add("GLOBAL", messageService.getMessage("outcome.import.error"));
-	    request.setAttribute("errorMap", errorMap);
-	}
-
-	return scaleManage(request, response);
-    }
-
-    private UserDTO getUserDTO() {
-	HttpSession ss = SessionManager.getSession();
-	return (UserDTO) ss.getAttribute(AttributeNames.USER);
-    }
-
-    private void validateOutcomeForm(OutcomeForm outcomeForm, MultiValueMap<String, String> errorMap) {
-	if (StringUtils.isBlank(outcomeForm.getName())) {
-	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.name.blank"));
-	}
-	/**
-	 * LDEV-4786 We allow blank code when creating an outcome straight from outcome select field
-	 * if (StringUtils.isBlank(outcomeForm.getCode())) {
-	 * errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.code.blank"));
-	 * }
-	 * If no outcome is chosen, the default scale gets chosen
-	 * if (outcomeForm.getScaleId() == null || outcomeForm.getScaleId() == 0) {
-	 * errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.scale.choose"));
-	 * }
-	 **/
-    }
-
-    private void validateScaleForm(OutcomeScaleForm scaleForm, MultiValueMap<String, String> errorMap) {
-	if (StringUtils.isBlank(scaleForm.getName())) {
-	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.name.blank"));
-	}
-	if (StringUtils.isBlank(scaleForm.getCode())) {
-	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.code.blank"));
-	}
-    }
-
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.web.outcome;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.log4j.Logger;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.outcome.OutcomeMapping;
+import org.lamsfoundation.lams.outcome.OutcomeResult;
+import org.lamsfoundation.lams.outcome.OutcomeScale;
+import org.lamsfoundation.lams.outcome.OutcomeScaleItem;
+import org.lamsfoundation.lams.outcome.service.IOutcomeService;
+import org.lamsfoundation.lams.security.ISecurityService;
+import org.lamsfoundation.lams.usermanagement.Role;
+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.Configuration;
+import org.lamsfoundation.lams.util.ConfigurationKeys;
+import org.lamsfoundation.lams.util.ExcelCell;
+import org.lamsfoundation.lams.util.ExcelUtil;
+import org.lamsfoundation.lams.util.FileUtil;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.multipart.MultipartFile;
+
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
+@Controller
+@RequestMapping("/outcome")
+public class OutcomeController {
+    private static Logger log = Logger.getLogger(OutcomeController.class);
+
+    @Autowired
+    private IUserManagementService userManagementService;
+    @Autowired
+    private ISecurityService securityService;
+    @Autowired
+    private IOutcomeService outcomeService;
+    @Autowired
+    @Qualifier("centralMessageService")
+    private MessageService messageService;
+
+    @RequestMapping("/outcomeManage")
+    public String outcomeManage(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
+
+	List<Outcome> outcomes = outcomeService.getOutcomes();
+	request.setAttribute("outcomes", outcomes);
+	return "outcome/outcomeManage";
+    }
+
+    @RequestMapping("/outcomeEdit")
+    public String outcomeEdit(@ModelAttribute OutcomeForm outcomeForm, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
+
+	Long outcomeId = WebUtil.readLongParam(request, "outcomeId", true);
+	Outcome outcome = outcomeId == null ? null : (Outcome) userManagementService.findById(Outcome.class, outcomeId);
+
+	outcomeForm.setContentFolderId(IOutcomeService.OUTCOME_CONTENT_FOLDER_ID);
+	if (outcome == null) {
+	    outcomeForm.setScaleId(IOutcomeService.DEFAULT_SCALE_ID);
+	} else {
+	    outcomeForm.setOutcomeId(outcome.getOutcomeId());
+	    outcomeForm.setName(outcome.getName());
+	    outcomeForm.setCode(outcome.getCode());
+	    outcomeForm.setDescription(outcome.getDescription());
+	    outcomeForm.setScaleId(outcome.getScale().getScaleId());
+	}
+
+	List<OutcomeScale> scales = outcomeService.getScales();
+	request.setAttribute("scales", scales);
+
+	return "outcome/outcomeEdit";
+    }
+
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/outcomeSave")
+    public String outcomeSave(@ModelAttribute OutcomeForm outcomeForm, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	Integer userId = getUserDTO().getUserID();
+	Long outcomeId = outcomeForm.getOutcomeId();
+	Outcome outcome = outcomeId == null ? null : (Outcome) userManagementService.findById(Outcome.class, outcomeId);
+
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
+	validateOutcomeForm(outcomeForm, errorMap);
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
+	} else {
+	    try {
+		if (outcome == null) {
+		    outcome = new Outcome();
+		    User user = (User) userManagementService.findById(User.class, userId);
+		    outcome.setCreateBy(user);
+		    outcome.setCreateDateTime(new Date());
+		}
+
+		outcome.setName(outcomeForm.getName());
+		outcome.setCode(outcomeForm.getCode());
+		outcome.setDescription(outcomeForm.getDescription());
+		long scaleId = outcomeForm.getScaleId() == null || outcomeForm.getScaleId() == 0
+			? IOutcomeService.DEFAULT_SCALE_ID
+			: outcomeForm.getScaleId();
+		OutcomeScale scale = (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
+		outcome.setScale(scale);
+		userManagementService.save(outcome);
+
+		if (log.isDebugEnabled()) {
+		    log.debug("Saved outcome " + outcome.getOutcomeId());
+		}
+		request.setAttribute("saved", true);
+	    } catch (Exception e) {
+		log.error("Exception while saving an outcome", e);
+		errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error"));
+		request.setAttribute("errorMap", errorMap);
+	    }
+	}
+
+	List<OutcomeScale> scales = userManagementService.findAll(OutcomeScale.class);
+	request.setAttribute("scales", scales);
+	return "outcome/outcomeEdit";
+    }
+
+    @RequestMapping("/outcomeRemove")
+    public String outcomeRemove(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
+
+	Long outcomeId = WebUtil.readLongParam(request, "outcomeId", false);
+	Outcome outcome = (Outcome) userManagementService.findById(Outcome.class, outcomeId);
+	if (outcome == null) {
+	    throw new IllegalArgumentException("Can not find an outcome with ID " + outcomeId);
+	}
+
+	long mappingCount = outcomeService.countOutcomeMappings(outcomeId);
+	if (mappingCount == 0) {
+	    userManagementService.delete(outcome);
+	    if (log.isDebugEnabled()) {
+		log.debug("Deleted outcome " + outcomeId);
+	    }
+	} else {
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
+	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.remove.error.in.use"));
+	    request.setAttribute("errorMap", errorMap);
+	}
+
+	return outcomeManage(request, response);
+    }
+
+    @RequestMapping("/outcomeSearch")
+    @ResponseBody
+    public String outcomeSearch(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	String search = WebUtil.readStrParam(request, "term", true);
+	boolean addEnabled = Configuration.getAsBoolean(ConfigurationKeys.LEARNING_OUTCOME_QUICK_ADD_ENABLE);
+
+	List<Outcome> outcomes = outcomeService.getOutcomes(search);
+	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
+	for (Outcome outcome : outcomes) {
+	    ObjectNode outcomeJSON = JsonNodeFactory.instance.objectNode();
+	    outcomeJSON.put("value", outcome.getOutcomeId());
+	    outcomeJSON.put("label",
+		    outcome.getName() + (StringUtils.isBlank(outcome.getCode()) ? "" : " (" + outcome.getCode() + ")"));
+	    responseJSON.add(outcomeJSON);
+	}
+	responseJSON.add(search);
+	responseJSON.add(String.valueOf(addEnabled));
+	response.setContentType("application/json;charset=utf-8");
+	return responseJSON.toString();
+    }
+
+    @RequestMapping(path = "/outcomeMap", produces = "text/plain;charset=utf-8")
+    @ResponseBody
+    public String outcomeMap(@RequestParam(required = false) Long outcomeId,
+	    @RequestParam(required = false) Long lessonId, @RequestParam(required = false) Long toolContentId,
+	    @RequestParam(required = false) Long itemId, @RequestParam(required = false) Integer qbQuestionId,
+	    @RequestParam(required = false) String name) throws Exception {
+	if (lessonId == null && toolContentId == null && qbQuestionId == null) {
+	    throw new IllegalArgumentException(
+		    "Either lesson ID or tool content ID or QB question ID must not be null when creating an outcome mapping");
+	}
+	Outcome outcome = null;
+	if (outcomeId == null) {
+	    boolean addEnabled = Configuration.getAsBoolean(ConfigurationKeys.LEARNING_OUTCOME_QUICK_ADD_ENABLE);
+	    if (!addEnabled) {
+		throw new SecurityException("Adding Learning Outcomes on the fly is disabled");
+	    }
+	    // create a new outcome on the fly
+	    String code = null;
+	    // check if name contains code part
+	    String[] nameParts = name.split("\\(");
+	    if (nameParts.length > 1) {
+		name = nameParts[0].trim();
+		code = nameParts[1].replaceFirst("\\)", "").trim();
+	    }
+	    outcome = new Outcome();
+
+	    Integer userId = getUserDTO().getUserID();
+	    User user = (User) userManagementService.findById(User.class, userId);
+	    outcome.setCreateBy(user);
+	    outcome.setCreateDateTime(new Date());
+
+	    outcome.setName(name);
+	    outcome.setCode(code);
+	    OutcomeScale scale = (OutcomeScale) userManagementService.findById(OutcomeScale.class,
+		    IOutcomeService.DEFAULT_SCALE_ID);
+	    outcome.setScale(scale);
+	    userManagementService.save(outcome);
+
+	    if (log.isDebugEnabled()) {
+		log.debug("Saved outcome " + outcome.getOutcomeId());
+	    }
+
+	} else {
+	    outcome = (Outcome) userManagementService.findById(Outcome.class, outcomeId);
+	}
+
+	List<OutcomeMapping> outcomeMappings = outcomeService.getOutcomeMappings(lessonId, toolContentId, itemId,
+		qbQuestionId);
+	for (OutcomeMapping existingMapping : outcomeMappings) {
+	    if (existingMapping.getOutcome().getOutcomeId().equals(outcome.getOutcomeId())) {
+		throw new IllegalArgumentException(
+			"Trying to map an already mapped outcome with ID " + outcome.getOutcomeId());
+	    }
+	}
+
+	OutcomeMapping outcomeMapping = new OutcomeMapping();
+	outcomeMapping.setOutcome(outcome);
+	outcomeMapping.setLessonId(lessonId);
+	outcomeMapping.setToolContentId(toolContentId);
+	outcomeMapping.setItemId(itemId);
+	outcomeMapping.setQbQuestionId(qbQuestionId);
+	userManagementService.save(outcomeMapping);
+
+	if (log.isDebugEnabled()) {
+	    log.debug("Mapped outcome " + outcome.getOutcomeId() + " to lesson ID " + lessonId + " and tool content ID "
+		    + toolContentId + " and item ID " + itemId + " and QB question ID " + qbQuestionId);
+	}
+
+	return String.valueOf(outcomeMapping.getMappingId());
+    }
+
+    @RequestMapping(path = "/outcomeGetMappings", produces = "application/json;charset=utf-8")
+    @ResponseBody
+    public String outcomeGetMappings(@RequestParam(required = false) Long lessonId,
+	    @RequestParam(required = false) Long toolContentId, @RequestParam(required = false) Long itemId,
+	    @RequestParam(required = false) Integer qbQuestionId, HttpServletRequest request) throws Exception {
+	if (lessonId == null && toolContentId == null && qbQuestionId == null) {
+	    throw new IllegalArgumentException(
+		    "Either lesson ID or tool content ID or QB question ID must not be null when fetching outcome mappings");
+	}
+	Integer userId = getUserDTO().getUserID();
+	if (!request.isUserInRole(Role.SYSADMIN) && !request.isUserInRole(Role.AUTHOR)) {
+	    String error = "User " + userId + " is not sysadmin nor an author and can not map outcome";
+	    log.error(error);
+	    throw new SecurityException(error);
+	}
+
+	List<OutcomeMapping> outcomeMappings = outcomeService.getOutcomeMappings(lessonId, toolContentId, itemId,
+		qbQuestionId);
+	OutcomeController.filterQuestionMappings(outcomeMappings);
+
+	ArrayNode responseJSON = JsonNodeFactory.instance.arrayNode();
+	for (OutcomeMapping outcomeMapping : outcomeMappings) {
+	    Outcome outcome = outcomeMapping.getOutcome();
+	    ObjectNode outcomeJSON = JsonNodeFactory.instance.objectNode();
+	    outcomeJSON.put("mappingId", outcomeMapping.getMappingId());
+	    outcomeJSON.put("outcomeId", outcome.getOutcomeId());
+	    outcomeJSON.put("qbMapping", outcomeMapping.getQbQuestionId() != null);
+	    outcomeJSON.put("label",
+		    outcome.getName() + (StringUtils.isBlank(outcome.getCode()) ? "" : " (" + outcome.getCode() + ")"));
+	    responseJSON.add(outcomeJSON);
+	}
+	return responseJSON.toString();
+    }
+
+    @RequestMapping("/outcomeRemoveMapping")
+    public void outcomeRemoveMapping(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	Long mappingId = WebUtil.readLongParam(request, "mappingId");
+	OutcomeMapping outcomeMapping = (OutcomeMapping) userManagementService.findById(OutcomeMapping.class,
+		mappingId);
+	userManagementService.delete(outcomeMapping);
+
+	if (log.isDebugEnabled()) {
+	    log.debug("Deleted outcome mapping " + mappingId);
+	}
+    }
+
+    @SuppressWarnings("unchecked")
+    @RequestMapping("/outcomeSetResult")
+    @ResponseBody
+    public String outcomeSetResult(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	Long mappingId = WebUtil.readLongParam(request, "pk");
+	Integer value = WebUtil.readIntParam(request, "value");
+	Integer targetUserId = WebUtil.readIntParam(request, "name");
+	OutcomeMapping outcomeMapping = (OutcomeMapping) userManagementService.findById(OutcomeMapping.class,
+		mappingId);
+	Long lessonId = outcomeMapping.getLessonId();
+	if (lessonId == null) {
+	    ToolActivity toolActivity = ((List<ToolActivity>) userManagementService.findByProperty(ToolActivity.class,
+		    "toolContentId", outcomeMapping.getToolContentId())).get(0);
+	    lessonId = toolActivity.getLearningDesign().getLessons().iterator().next().getLessonId();
+	}
+	Integer userId = getUserDTO().getUserID();
+	securityService.isLessonMonitor(lessonId, userId, "set outcome result", true);
+
+	OutcomeResult result = outcomeService.getOutcomeResult(userId, mappingId);
+	if (result == null) {
+	    // result does not exist; if value == -1, it means it is not meant to exist, otherwise create
+	    if (value > -1) {
+		result = new OutcomeResult();
+		User user = (User) userManagementService.findById(User.class, userId);
+		result.setCreateBy(user);
+		result.setCreateDateTime(new Date());
+		result.setMapping(outcomeMapping);
+		User targetUser = (User) userManagementService.findById(User.class, targetUserId);
+		result.setUser(targetUser);
+		result.setValue(value);
+		userManagementService.save(result);
+		if (log.isDebugEnabled()) {
+		    log.debug("Added outcome result " + result.getResultId());
+		}
+	    }
+	    // modify only if value is different
+	} else if (!result.getValue().equals(value)) {
+	    // if value is -1, remove the result
+	    if (value == -1) {
+		Long resultId = result.getResultId();
+		userManagementService.delete(result);
+		if (log.isDebugEnabled()) {
+		    log.debug("Deleted outcome result " + resultId);
+		}
+	    } else {
+		// update existing result
+		result.setValue(value);
+		User user = (User) userManagementService.findById(User.class, userId);
+		result.setCreateBy(user);
+		result.setCreateBy(user);
+		result.setValue(value);
+		userManagementService.save(result);
+		if (log.isDebugEnabled()) {
+		    log.debug("Edited outcome result " + result.getResultId());
+		}
+	    }
+	}
+
+	// if something else than OK is sent, x-editable will print ERROR!
+	response.setContentType("text/plain;charset=utf-8");
+	return "OK";
+    }
+
+    @RequestMapping("/outcomeExport")
+    public void outcomeExport(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "export outcomes", true);
+
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = outcomeService.exportOutcomes();
+
+	String fileName = "lams_outcomes.xls";
+	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
+
+	response.setContentType("application/x-download");
+	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+
+	// 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);
+
+	// Code to generate file and write file contents to response
+	ServletOutputStream out = response.getOutputStream();
+	ExcelUtil.createExcelXLS(out, dataToExport, messageService.getMessage("outcome.export.date"), true);
+    }
+
+    @RequestMapping("/outcomeImport")
+    public String outcomeImport(@RequestParam("file") MultipartFile file, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "import outcomes", true);
+
+	try {
+	    int importCount = outcomeService.importOutcomes(file);
+	    log.info("Imported " + importCount + " outcomes");
+	} catch (Exception e) {
+	    log.error("Error while importing outcomes", e);
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
+	    errorMap.add("GLOBAL", messageService.getMessage("outcome.import.error"));
+	    request.setAttribute("errorMap", errorMap);
+	}
+
+	return outcomeManage(request, response);
+    }
+
+    @RequestMapping("/scaleManage")
+    public String scaleManage(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	List<OutcomeScale> scales = outcomeService.getScales();
+	request.setAttribute("scales", scales);
+
+	return "outcome/scaleManage";
+    }
+
+    @RequestMapping("/scaleRemove")
+    public String scaleRemove(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	Long scaleId = WebUtil.readLongParam(request, "scaleId", false);
+	OutcomeScale scale = (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
+	if (scale == null) {
+	    throw new IllegalArgumentException("Can not find an outcome scale with ID " + scaleId);
+	}
+
+	long scaleUseCount = outcomeService.countScaleUse(scaleId);
+	if (scaleUseCount == 0) {
+	    userManagementService.delete(scale);
+	    if (log.isDebugEnabled()) {
+		log.debug("Deleted outcome scale " + scaleId);
+	    }
+	} else {
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
+	    errorMap.add("GLOBAL", messageService.getMessage("scale.manage.remove.error.in.use"));
+	    request.setAttribute("errorMap", errorMap);
+	}
+
+	return scaleManage(request, response);
+    }
+
+    @RequestMapping("/scaleEdit")
+    public String scaleEdit(@ModelAttribute("scaleForm") OutcomeScaleForm scaleForm, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	Long scaleId = WebUtil.readLongParam(request, "scaleId", true);
+	OutcomeScale scale = scaleId == null ? null
+		: (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
+
+	scaleForm.setContentFolderId(IOutcomeService.OUTCOME_CONTENT_FOLDER_ID);
+	if (scale != null) {
+	    scaleForm.setScaleId(scale.getScaleId());
+	    scaleForm.setName(scale.getName());
+	    scaleForm.setCode(scale.getCode());
+	    scaleForm.setDescription(scale.getDescription());
+	    scaleForm.setItems(scale.getItemString());
+	}
+
+	request.setAttribute("isDefaultScale", outcomeService.isDefaultScale(scaleForm.getScaleId()));
+	return "outcome/scaleEdit";
+    }
+
+    @RequestMapping("/scaleSave")
+    public String scaleSave(@ModelAttribute("scaleForm") OutcomeScaleForm scaleForm, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	Integer userId = getUserDTO().getUserID();
+	Long scaleId = scaleForm.getScaleId();
+	OutcomeScale scale = scaleId == null ? null
+		: (OutcomeScale) userManagementService.findById(OutcomeScale.class, scaleId);
+	if (scale != null && outcomeService.isDefaultScale(scaleId)) {
+	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "The default scale can not be altered");
+	    return null;
+	}
+
+	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
+	validateScaleForm(scaleForm, errorMap);
+	List<String> items = OutcomeScale.parseItems(scaleForm.getItems());
+	if (items == null) {
+	    errorMap.add("GLOBAL", messageService.getMessage("scale.manage.add.value.error.blank"));
+	}
+	if (errorMap.isEmpty()) {
+	    try {
+		if (scale == null) {
+		    scale = new OutcomeScale();
+		    User user = (User) userManagementService.findById(User.class, userId);
+		    scale.setCreateBy(user);
+		    scale.setCreateDateTime(new Date());
+		}
+
+		scale.setName(scaleForm.getName());
+		scale.setCode(scaleForm.getCode());
+		scale.setDescription(scaleForm.getDescription());
+		userManagementService.save(scale);
+
+		// find existing scales and add new ones
+		Set<OutcomeScaleItem> newItems = new LinkedHashSet<>();
+		int value = 0;
+		for (String itemString : items) {
+		    itemString = itemString.trim();
+		    if (StringUtils.isBlank(itemString)) {
+			errorMap.add("GLOBAL", messageService.getMessage("scale.manage.add.value.error.blank"));
+			break;
+		    }
+		    OutcomeScaleItem item = null;
+		    for (OutcomeScaleItem exisitngItem : scale.getItems()) {
+			if (itemString.equals(exisitngItem.getName())) {
+			    item = exisitngItem;
+			    break;
+			}
+		    }
+		    if (item == null) {
+			item = new OutcomeScaleItem();
+			item.setScale(scale);
+			item.setName(itemString);
+		    }
+		    item.setValue(value++);
+		    newItems.add(item);
+		}
+		if (errorMap.isEmpty()) {
+		    scale.getItems().clear();
+		    scale.getItems().addAll(newItems);
+		    userManagementService.save(scale);
+
+		    if (log.isDebugEnabled()) {
+			log.debug("Saved outcome scale " + scale.getScaleId());
+		    }
+
+		    request.setAttribute("saved", true);
+		}
+	    } catch (Exception e) {
+		log.error("Exception while saving an outcome", e);
+		errorMap.add("GLOBAL", messageService.getMessage("scale.manage.add.error"));
+	    }
+	}
+	if (!errorMap.isEmpty()) {
+	    request.setAttribute("errorMap", errorMap);
+	}
+
+	return "outcome/scaleEdit";
+    }
+
+    @RequestMapping("/scaleExport")
+    public void scaleExport(HttpServletRequest request, HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "export outcome scales", true);
+
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = outcomeService.exportScales();
+
+	String fileName = "lams_outcome_scales.xls";
+	fileName = FileUtil.encodeFilenameForDownload(request, fileName);
+
+	response.setContentType("application/x-download");
+	response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+
+	// 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);
+
+	// Code to generate file and write file contents to response
+	ServletOutputStream out = response.getOutputStream();
+	ExcelUtil.createExcelXLS(out, dataToExport, messageService.getMessage("outcome.export.date"), true);
+    }
+
+    @RequestMapping("/scaleImport")
+    public String scaleImport(@RequestParam("file") MultipartFile file, HttpServletRequest request,
+	    HttpServletResponse response) throws Exception {
+	UserDTO user = getUserDTO();
+	securityService.isSysadmin(user.getUserID(), "import outcome scales", true);
+
+	try {
+	    int importCount = outcomeService.importScales(file);
+	    log.info("Imported " + importCount + " outcome scales");
+	} catch (Exception e) {
+	    log.error("Error while importing outcome scales", e);
+	    MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>(1);
+	    errorMap.add("GLOBAL", messageService.getMessage("outcome.import.error"));
+	    request.setAttribute("errorMap", errorMap);
+	}
+
+	return scaleManage(request, response);
+    }
+
+    private UserDTO getUserDTO() {
+	HttpSession ss = SessionManager.getSession();
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
+    private void validateOutcomeForm(OutcomeForm outcomeForm, MultiValueMap<String, String> errorMap) {
+	if (StringUtils.isBlank(outcomeForm.getName())) {
+	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.name.blank"));
+	}
+	/**
+	 * LDEV-4786 We allow blank code when creating an outcome straight from outcome select field
+	 * if (StringUtils.isBlank(outcomeForm.getCode())) {
+	 * errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.code.blank"));
+	 * }
+	 * If no outcome is chosen, the default scale gets chosen
+	 * if (outcomeForm.getScaleId() == null || outcomeForm.getScaleId() == 0) {
+	 * errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.scale.choose"));
+	 * }
+	 **/
+    }
+
+    private void validateScaleForm(OutcomeScaleForm scaleForm, MultiValueMap<String, String> errorMap) {
+	if (StringUtils.isBlank(scaleForm.getName())) {
+	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.name.blank"));
+	}
+	if (StringUtils.isBlank(scaleForm.getCode())) {
+	    errorMap.add("GLOBAL", messageService.getMessage("outcome.manage.add.error.code.blank"));
+	}
+    }
+
+    /**
+     * There can be duplicates in mappings, if one comes from activity and the other comes from a QB question that the
+     * activity imported.
+     * We need to get rid of duplicates and sort the remaining mappings.
+     */
+    private static void filterQuestionMappings(List<OutcomeMapping> mappings) {
+	Iterator<OutcomeMapping> iterator = mappings.iterator();
+	while (iterator.hasNext()) {
+	    OutcomeMapping mapping = iterator.next();
+	    boolean duplicateFound = false;
+	    for (OutcomeMapping otherMapping : mappings) {
+		if (!mapping.getMappingId().equals(otherMapping.getMappingId())
+			&& mapping.getOutcome().getOutcomeId().equals(otherMapping.getOutcome().getOutcomeId())) {
+		    duplicateFound = true;
+		    break;
+		}
+	    }
+	    // remove the one coming from activity, not one coming from question
+	    if (duplicateFound && mapping.getQbQuestionId() == null) {
+		iterator.remove();
+	    }
+	}
+
+	Collections.sort(mappings,
+		Comparator.comparing(OutcomeMapping::getOutcome, Comparator.comparing(Outcome::getName)));
+    }
+
 }
\ No newline at end of file
Index: lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_central/web/qb/stats.jsp
===================================================================
diff -u -r80ab947256f1314103a88c68432755741615271b -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 80ab947256f1314103a88c68432755741615271b)
+++ lams_central/web/qb/stats.jsp	(.../stats.jsp)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,462 +1,464 @@
-<%@ page contentType="text/html; charset=utf-8" language="java"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
-<%@ taglib uri="tags-core" prefix="c"%>
-
-<c:set var="question" value="${stats.question}" />
-
-<!DOCTYPE html>
-<lams:html>
-<lams:head>
-	<title>Question statistics</title>
-	
-	<lams:css/>
-	<link type="text/css" href="<lams:LAMSURL/>css/defaultHTML_chart.css" rel="stylesheet">
-	<link type="text/css" href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet">
-	<style>
-		.question-table {
-			margin-bottom
-		}
-		.question-table > .row {
-			padding-bottom: 10px;
-		}
-		
-		.question-table > .row > div:first-child, .qb-stats-table th, .section-header  {
-			font-weight: bold;
-		}
-		
-		#chartDiv {
-			height: 220px;
-		}
-		
-		#usage a {
-			text-decoration: underline;
-		}
-				
-		.row {
-			margin-top: 10px;
-		}
-		
-		.middle-cell {
-			padding-top: 6px;
-			display: inline-block;
-		}
-		
-		.middle-buttons {
-			text-align: center;
-		}
-
-		.header-column {
-			font-weight: bold;
-		}
-	</style>
-	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>	
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/d3.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/chart.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
-	<script type="text/javascript">
-		var permanentRemove = ${permanentRemove},
-			permanentRemovePossible = ${permanentRemovePossible},
-			optionsExist = ${not empty question.qbOptions};
-		
-		$(document).ready(function(){
-			if (optionsExist) {
-				drawChart('bar', 'chartDiv', ${stats.answersJSON});
-			}
-			$("time.timeago").timeago();
-		});
-		
-		// add or copy questions to a collection
-		function addCollectionQuestion(copy) {
-			var targetCollectionUid = $('#targetCollectionSelect').val();
-			$.ajax({
-				'url'  : '<lams:LAMSURL />qb/collection/addCollectionQuestion.do',
-				'type' : 'POST',
-				'dataType' : 'text',
-				'data' : {
-					'targetCollectionUid' : targetCollectionUid,
-					'copy'				  : copy,
-					'qbQuestionId'	      : ${question.questionId}
-				},
-				'cache' : false
-			}).done(function(){
-				document.location.reload();
-			});
-		}
-		
-		function removeCollectionQuestion(collectionUid) {
-			if (permanentRemove) {
-				if (!permanentRemovePossible) {
-					alert("The question is in one collection only, so it would be permanently removed.\n"
-						  + "It is not possible as the question is used in sequences.");
-					return;
-				}
-				if (!confirm("The question is in one collection only. Are you sure that you want to remove it permanently?")){
-					return;
-				}
-			}
-			$.ajax({
-				'url'  : '<lams:LAMSURL />qb/collection/removeCollectionQuestion.do',
-				'type' : 'POST',
-				'dataType' : 'text',
-				'data' : {
-					'collectionUid' : collectionUid,
-					'qbQuestionId'	: ${question.questionId}
-				},
-				'cache' : false
-			}).done(function(){
-				if (permanentRemove) {
-					document.location.href = '<lams:LAMSURL />qb/collection/show.do';
-				} else {
-					document.location.reload();
-				}
-			});
-		}
-	    
-		function exportQTI(){
-	    	var frame = document.getElementById("downloadFileDummyIframe");
-	    	frame.src = '<c:url value="/imsqti/exportQuestionAsQTI.do" />?qbQuestionUid=${question.uid}';
-	    }
-
-	    //this method gets invoked after question has been edited and saved
-		function refreshThickbox(){
-			var newQuestionUid = $("#itemArea").html();
-			location.href = '<c:url value="/qb/stats/show.do" />?qbQuestionUid=' + newQuestionUid;
-		};
-	</script>
-</lams:head>
-<body class="stripes">
-
-<lams:Page title="Question statistics" type="admin">
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Question
-			
-			<div class="btn-group-xs pull-right">
-				<a href="<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=${question.uid}&KeepThis=true&TB_iframe=true" class="btn btn-default thickbox"> 
-					<i class="fa fa-pencil"	title="<fmt:message key="label.edit" />"></i>
-				</a>
-			
-				<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default">
-					<i class="fa fa-download" title="<fmt:message key='label.export.qti'/>"></i>
-				</a>
-			</div>
-		</div>
-		<div class="panel-body">
-			<div class="question-table">
-				<div class="row">
-					<div class="col-sm-1">
-						Version:
-					</div>
-					<div class="col-sm-11">
-						<c:out value="${question.version}" />
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-1">
-						Title:
-					</div>
-					<div class="col-sm-11">
-						<c:out value="${question.name}" escapeXml="false" />
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-1">
-						Description:
-					</div>
-					<div class="col-sm-11">
-						<c:out value="${question.description}" escapeXml="false" />
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-1">
-						Feedback:
-					</div>
-					<div class="col-sm-11">
-						<c:out value="${question.feedback}" escapeXml="false" />
-					</div>
-				</div>
-				<div class="row">
-					<div class="col-sm-1">
-						Mark:
-					</div>
-					<div class="col-sm-11">
-						<c:out value="${question.maxMark}" />
-					</div>
-				</div>
-			</div>
-
-			<c:if test="${not empty question.qbOptions}">
-				<p class="question-section-header">Options</p>
-				<table class="table table-striped qb-stats-table">
-					<tr>
-						<th>
-							#
-						</th>
-						<th>
-							Title
-						</th>
-						<th>
-							Correct?
-						</th>
-						<th>
-							Average selection<br>(as first choice)
-						</th>
-					</tr>
-					<c:forEach var="option" items="${question.qbOptions}" varStatus="status">
-						<tr>
-							<td>
-								${status.index + 1}
-							</td>
-							<td>
-								<c:out value="${option.name}" escapeXml="false" />
-							</td>
-							<td>
-								<c:if test="${option.correct}">
-									<i class="fa fa-check"></i>
-								</c:if>
-							</td>
-							<td>
-								<%--(${empty stats.answersRaw[option.uid] ? 0 : stats.answersRaw[option.uid]})--%>
-								${stats.answersPercent[option.uid]}%
-							</td>
-						</tr>
-					</c:forEach>
-				</table>		
-			</c:if>
-		</div>
-	</div>
-	
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Management
-		</div>
-		<div class="panel-body">
-			<div class="container-fluid">			
-				<c:if test="${not empty availableCollections and transferAllowed}">
-					<div class="row">
-						<div class="col-xs-12 col-md-2 middle-cell">
-							Transfer questions to
-						</div>
-						<div class="col-xs-12 col-md-6">
-							<select class="form-control" id="targetCollectionSelect">
-								<c:forEach var="target" items="${availableCollections}">
-									<option value="${target.uid}">
-										<c:out value="${target.name}" />
-									</option>
-								</c:forEach>
-							</select>
-						</div>
-						<div class="col-xs-12 col-md-4">
-							<button class="btn btn-default" onClick="javascript:addCollectionQuestion(false)">Add</button>
-							<button class="btn btn-default" onClick="javascript:addCollectionQuestion(true)">Copy</button>
-						</div>
-					</div>
-				</c:if>
-				
-				<div class="row">
-					<div class="col-xs-0 col-md-2"></div>
-					<div class="col-xs-12 col-md-8 header-column">
-						Existing collections
-					</div>
-					<div class="col-xs-0 col-md-2"></div>
-				</div>
-				
-				<c:forEach var="collection" items="${existingCollections}">
-					<div class="row">
-						<div class="col-xs-0 col-md-2"></div>
-						<div class="col-xs-12 col-md-6 middle-cell">
-							<c:out value="${collection.name}" />
-						</div>
-						<div class="col-xs-12 col-md-2">
-							<c:if test="${transferAllowed}">
-								<button class="btn btn-default" onClick="javascript:removeCollectionQuestion(${collection.uid})">Remove</button>
-							</c:if>
-						</div>
-					</div>
-				</c:forEach>
-			</div>
-		</div>
-	</div>
-	
-	<c:if test="${not empty question.qbOptions}">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				Average selection chart
-			</div>
-			<div id="chartDiv" class="panel-body">
-			</div>
-		</div>
-	</c:if>
-	
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Burning questions
-		</div>
-		<div class="panel-body">
-			<c:choose>
-				<c:when test="${empty stats.burningQuestions}">
-					This question does not have any burning questions
-				</c:when>
-				<c:otherwise>
-					<table class="table table-striped qb-stats-table">
-						<tr>
-							<th>
-								Question
-							</th>
-							<th>
-								Likes
-							</th>
-						</tr>
-						<c:forEach var="question" items="${stats.burningQuestions}">
-							<tr>
-								<td>
-									<c:out value="${question.key}" />
-								</td>
-								<td>
-									<c:out value="${question.value}" />
-								</td>
-							</tr>
-						</c:forEach>
-					</table>
-				</c:otherwise>
-			</c:choose>
-		</div>
-	</div>
-	
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Usage in lessons
-		</div>
-		<div class="panel-body">
-			<c:choose>
-				<c:when test="${empty stats.activities}">
-					This question is not used in any lesson
-				</c:when>
-				<c:otherwise>
-					<table id="usage" class="table table-striped qb-stats-table">
-						<tr>
-							<th>
-								Organisation
-							</th>
-							<th>
-								Lesson
-							</th>
-							<th>
-								Activity
-							</th>
-							<th>
-								Tool type
-							</th>
-							<th>
-								Test participant count
-							</th>
-							<th>
-								Difficulty index
-							</th>
-							<th>
-								Discrimination index
-							</th>
-							<th>
-								Point biserial
-							</th>
-						</tr>
-						<c:forEach var="activityDTO" items="${stats.activities}">
-							<c:set var="lesson" value="${activityDTO.activity.learningDesign.lessons.iterator().next()}" />
-							<tr>
-								<td>
-									<c:out value="${lesson.organisation.name}" />
-								</td>
-								<td title="${lesson.lessonId}">
-									<c:out value="${lesson.lessonName}" />
-								</td>
-								<td title="${activityDTO.activity.activityId}">
-									<c:choose>
-										<c:when test="${empty activityDTO.monitorURL}">
-											<c:out value="${activityDTO.activity.title}" />
-										</c:when>
-										<c:otherwise>
-											<a href="${activityDTO.monitorURL}">
-												<c:out value="${activityDTO.activity.title}" />
-											</a>
-										</c:otherwise>
-									</c:choose>
-								</td>
-								<td>
-									<c:out value="${activityDTO.activity.tool.toolDisplayName}" />
-								</td>
-								<td>
-									<c:out value="${activityDTO.participantCount}" />
-								</td>
-								<c:choose>
-									<c:when test="${activityDTO.participantCount < 2}">
-										<td>-</td>
-										<td>-</td>
-										<td>-</td>
-									</c:when>
-									<c:otherwise>
-										<td><fmt:formatNumber type="number" maxFractionDigits="2" value="${activityDTO.difficultyIndex}" /></td>
-										<td><fmt:formatNumber type="number" maxFractionDigits="2" value="${activityDTO.discriminationIndex}" /></td>
-										<td><fmt:formatNumber type="number" maxFractionDigits="2" value="${activityDTO.pointBiserial}" /></td>
-										
-									</c:otherwise>
-								</c:choose>
-							</tr>
-						</c:forEach>
-					</table>
-				</c:otherwise>
-			</c:choose>
-		</div>
-	</div>
-	
-	<div class="panel panel-default">
-		<div class="panel-heading">
-			Previous versions
-		</div>
-		<div class="panel-body">
-			<c:choose>
-				<c:when test="${empty stats.versions}">
-					This question does not have any previous versions
-				</c:when>
-				<c:otherwise>
-					<table class="table table-striped qb-stats-table">
-						<tr>
-							<th>
-								#
-							</th>
-							<th>
-								Created date
-							</th>
-							<th>
-								Created ago
-							</th>
-						</tr>
-						<c:forEach var="version" items="${stats.versions}">
-							<tr>
-								<td>
-									<a href="/lams/qb/stats/show.do?qbQuestionUid=${version.uid}">v${version.version}</a>
-								</td>
-								<td>
-									<lams:Date value="${version.createDate}" />
-								</td>
-								<td>
-									<lams:Date value="${version.createDate}" timeago="true"/>
-								</td>
-							</tr>
-						</c:forEach>
-					</table>
-				</c:otherwise>
-			</c:choose>
-		</div>
-	</div>
-</lams:Page>
-
-<!-- For exporting QTI packages -->
-<iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
-<!-- For receiving question's uid after question has been saved -->
-<div id="itemArea" class="hidden"></div>
-</body>
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<c:set var="question" value="${stats.question}" />
+
+<!DOCTYPE html>
+<lams:html>
+<lams:head>
+	<title>Question statistics</title>
+	
+	<lams:css/>
+	<link type="text/css" href="<lams:LAMSURL/>css/defaultHTML_chart.css" rel="stylesheet">
+	<link type="text/css" href="<lams:LAMSURL/>css/thickbox.css" rel="stylesheet">
+	<style>
+		.question-table {
+			margin-bottom
+		}
+		.question-table > .row {
+			padding-bottom: 10px;
+		}
+		
+		.question-table > .row > div:first-child, .qb-stats-table th, .section-header  {
+			font-weight: bold;
+		}
+		
+		#chartDiv {
+			height: 220px;
+		}
+		
+		#usage a {
+			text-decoration: underline;
+		}
+				
+		.row {
+			margin-top: 10px;
+		}
+		
+		.middle-cell {
+			padding-top: 6px;
+			display: inline-block;
+		}
+		
+		.middle-buttons {
+			text-align: center;
+		}
+
+		.header-column {
+			font-weight: bold;
+		}
+	</style>
+	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery.timeago.js"></script>	
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/d3.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/chart.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/thickbox.js"></script>
+	<script type="text/javascript">
+		var permanentRemove = ${permanentRemove},
+			permanentRemovePossible = ${permanentRemovePossible},
+			optionsExist = ${not empty question.qbOptions};
+		
+		$(document).ready(function(){
+			if (optionsExist) {
+				drawChart('bar', 'chartDiv', ${stats.answersJSON});
+			}
+			$("time.timeago").timeago();
+		});
+		
+		// add or copy questions to a collection
+		function addCollectionQuestion(copy) {
+			var targetCollectionUid = $('#targetCollectionSelect').val();
+			$.ajax({
+				'url'  : '<lams:LAMSURL />qb/collection/addCollectionQuestion.do',
+				'type' : 'POST',
+				'dataType' : 'text',
+				'data' : {
+					'targetCollectionUid' : targetCollectionUid,
+					'copy'				  : copy,
+					'qbQuestionId'	      : ${question.questionId}
+				},
+				'cache' : false
+			}).done(function(){
+				document.location.reload();
+			});
+		}
+		
+		function removeCollectionQuestion(collectionUid) {
+			if (permanentRemove) {
+				if (!permanentRemovePossible) {
+					alert("The question is in one collection only, so it would be permanently removed.\n"
+						  + "It is not possible as the question is used in sequences.");
+					return;
+				}
+				if (!confirm("The question is in one collection only. Are you sure that you want to remove it permanently?")){
+					return;
+				}
+			}
+			$.ajax({
+				'url'  : '<lams:LAMSURL />qb/collection/removeCollectionQuestion.do',
+				'type' : 'POST',
+				'dataType' : 'text',
+				'data' : {
+					'collectionUid' : collectionUid,
+					'qbQuestionId'	: ${question.questionId}
+				},
+				'cache' : false
+			}).done(function(){
+				if (permanentRemove) {
+					document.location.href = '<lams:LAMSURL />qb/collection/show.do';
+				} else {
+					document.location.reload();
+				}
+			});
+		}
+	    
+		function exportQTI(){
+	    	var frame = document.getElementById("downloadFileDummyIframe");
+	    	frame.src = '<c:url value="/imsqti/exportQuestionAsQTI.do" />?qbQuestionUid=${question.uid}';
+	    }
+
+	    //this method gets invoked after question has been edited and saved
+		function refreshThickbox(){
+			var newQuestionUid = $("#itemArea").html();
+			location.href = '<c:url value="/qb/stats/show.do" />?qbQuestionUid=' + newQuestionUid;
+		};
+	</script>
+</lams:head>
+<body class="stripes">
+
+<lams:Page title="Question statistics" type="admin">
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Question
+			
+			<div class="btn-group-xs pull-right">
+				<a href="<c:url value='/qb/edit/editQuestion.do'/>?qbQuestionUid=${question.uid}&KeepThis=true&TB_iframe=true" class="btn btn-default thickbox"> 
+					<i class="fa fa-pencil"	title="<fmt:message key="label.edit" />"></i>
+				</a>
+			
+				<a href="#nogo" onClick="javascript:exportQTI()" class="btn btn-default">
+					<i class="fa fa-download" title="<fmt:message key='label.export.qti'/>"></i>
+				</a>
+			</div>
+		</div>
+		<div class="panel-body">
+			<div class="question-table">
+				<div class="row">
+					<div class="col-sm-1">
+						Version:
+					</div>
+					<div class="col-sm-11">
+						<c:out value="${question.version}" />
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-1">
+						Title:
+					</div>
+					<div class="col-sm-11">
+						<c:out value="${question.name}" escapeXml="false" />
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-1">
+						Description:
+					</div>
+					<div class="col-sm-11">
+						<c:out value="${question.description}" escapeXml="false" />
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-1">
+						Feedback:
+					</div>
+					<div class="col-sm-11">
+						<c:out value="${question.feedback}" escapeXml="false" />
+					</div>
+				</div>
+				<div class="row">
+					<div class="col-sm-1">
+						Mark:
+					</div>
+					<div class="col-sm-11">
+						<c:out value="${question.maxMark}" />
+					</div>
+				</div>
+			</div>
+
+			<c:if test="${not empty question.qbOptions}">
+				<p class="question-section-header">Options</p>
+				<table class="table table-striped qb-stats-table">
+					<tr>
+						<th>
+							#
+						</th>
+						<th>
+							Title
+						</th>
+						<th>
+							Correct?
+						</th>
+						<th>
+							Average selection<br>(as first choice)
+						</th>
+					</tr>
+					<c:forEach var="option" items="${question.qbOptions}" varStatus="status">
+						<tr>
+							<td>
+								${status.index + 1}
+							</td>
+							<td>
+								<c:out value="${option.name}" escapeXml="false" />
+							</td>
+							<td>
+								<c:if test="${option.correct}">
+									<i class="fa fa-check"></i>
+								</c:if>
+							</td>
+							<td>
+								<%--(${empty stats.answersRaw[option.uid] ? 0 : stats.answersRaw[option.uid]})--%>
+								${stats.answersPercent[option.uid]}%
+							</td>
+						</tr>
+					</c:forEach>
+				</table>		
+			</c:if>
+		</div>
+	</div>
+	
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Collections
+		</div>
+		<div class="panel-body">
+			<div class="container-fluid">			
+				<c:if test="${not empty availableCollections and transferAllowed}">
+					<div class="row">
+						<div class="col-xs-12 col-md-2 middle-cell">
+							Transfer questions to
+						</div>
+						<div class="col-xs-12 col-md-6">
+							<select class="form-control" id="targetCollectionSelect">
+								<c:forEach var="target" items="${availableCollections}">
+									<option value="${target.uid}">
+										<c:out value="${target.name}" />
+									</option>
+								</c:forEach>
+							</select>
+						</div>
+						<div class="col-xs-12 col-md-4">
+							<button class="btn btn-default" onClick="javascript:addCollectionQuestion(false)">Add</button>
+							<button class="btn btn-default" onClick="javascript:addCollectionQuestion(true)">Copy</button>
+						</div>
+					</div>
+				</c:if>
+				
+				<div class="row">
+					<div class="col-xs-0 col-md-2"></div>
+					<div class="col-xs-12 col-md-8 header-column">
+						Existing collections
+					</div>
+					<div class="col-xs-0 col-md-2"></div>
+				</div>
+				
+				<c:forEach var="collection" items="${existingCollections}">
+					<div class="row">
+						<div class="col-xs-0 col-md-2"></div>
+						<div class="col-xs-12 col-md-6 middle-cell">
+							<c:out value="${collection.name}" />
+						</div>
+						<div class="col-xs-12 col-md-2">
+							<c:if test="${transferAllowed}">
+								<button class="btn btn-default" onClick="javascript:removeCollectionQuestion(${collection.uid})">Remove</button>
+							</c:if>
+						</div>
+					</div>
+				</c:forEach>
+			</div>
+		</div>
+	</div>
+	
+	<lams:OutcomeAuthor qbQuestionId="${question.questionId}" />
+	
+	<c:if test="${not empty question.qbOptions}">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				Average selection chart
+			</div>
+			<div id="chartDiv" class="panel-body">
+			</div>
+		</div>
+	</c:if>
+	
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Burning questions
+		</div>
+		<div class="panel-body">
+			<c:choose>
+				<c:when test="${empty stats.burningQuestions}">
+					This question does not have any burning questions
+				</c:when>
+				<c:otherwise>
+					<table class="table table-striped qb-stats-table">
+						<tr>
+							<th>
+								Question
+							</th>
+							<th>
+								Likes
+							</th>
+						</tr>
+						<c:forEach var="question" items="${stats.burningQuestions}">
+							<tr>
+								<td>
+									<c:out value="${question.key}" />
+								</td>
+								<td>
+									<c:out value="${question.value}" />
+								</td>
+							</tr>
+						</c:forEach>
+					</table>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Usage in lessons
+		</div>
+		<div class="panel-body">
+			<c:choose>
+				<c:when test="${empty stats.activities}">
+					This question is not used in any lesson
+				</c:when>
+				<c:otherwise>
+					<table id="usage" class="table table-striped qb-stats-table">
+						<tr>
+							<th>
+								Organisation
+							</th>
+							<th>
+								Lesson
+							</th>
+							<th>
+								Activity
+							</th>
+							<th>
+								Tool type
+							</th>
+							<th>
+								Test participant count
+							</th>
+							<th>
+								Difficulty index
+							</th>
+							<th>
+								Discrimination index
+							</th>
+							<th>
+								Point biserial
+							</th>
+						</tr>
+						<c:forEach var="activityDTO" items="${stats.activities}">
+							<c:set var="lesson" value="${activityDTO.activity.learningDesign.lessons.iterator().next()}" />
+							<tr>
+								<td>
+									<c:out value="${lesson.organisation.name}" />
+								</td>
+								<td title="${lesson.lessonId}">
+									<c:out value="${lesson.lessonName}" />
+								</td>
+								<td title="${activityDTO.activity.activityId}">
+									<c:choose>
+										<c:when test="${empty activityDTO.monitorURL}">
+											<c:out value="${activityDTO.activity.title}" />
+										</c:when>
+										<c:otherwise>
+											<a href="${activityDTO.monitorURL}">
+												<c:out value="${activityDTO.activity.title}" />
+											</a>
+										</c:otherwise>
+									</c:choose>
+								</td>
+								<td>
+									<c:out value="${activityDTO.activity.tool.toolDisplayName}" />
+								</td>
+								<td>
+									<c:out value="${activityDTO.participantCount}" />
+								</td>
+								<c:choose>
+									<c:when test="${activityDTO.participantCount < 2}">
+										<td>-</td>
+										<td>-</td>
+										<td>-</td>
+									</c:when>
+									<c:otherwise>
+										<td><fmt:formatNumber type="number" maxFractionDigits="2" value="${activityDTO.difficultyIndex}" /></td>
+										<td><fmt:formatNumber type="number" maxFractionDigits="2" value="${activityDTO.discriminationIndex}" /></td>
+										<td><fmt:formatNumber type="number" maxFractionDigits="2" value="${activityDTO.pointBiserial}" /></td>
+										
+									</c:otherwise>
+								</c:choose>
+							</tr>
+						</c:forEach>
+					</table>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+	
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			Previous versions
+		</div>
+		<div class="panel-body">
+			<c:choose>
+				<c:when test="${empty stats.versions}">
+					This question does not have any previous versions
+				</c:when>
+				<c:otherwise>
+					<table class="table table-striped qb-stats-table">
+						<tr>
+							<th>
+								#
+							</th>
+							<th>
+								Created date
+							</th>
+							<th>
+								Created ago
+							</th>
+						</tr>
+						<c:forEach var="version" items="${stats.versions}">
+							<tr>
+								<td>
+									<a href="/lams/qb/stats/show.do?qbQuestionUid=${version.uid}">v${version.version}</a>
+								</td>
+								<td>
+									<lams:Date value="${version.createDate}" />
+								</td>
+								<td>
+									<lams:Date value="${version.createDate}" timeago="true"/>
+								</td>
+							</tr>
+						</c:forEach>
+					</table>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</div>
+</lams:Page>
+
+<!-- For exporting QTI packages -->
+<iframe id="downloadFileDummyIframe" style="display: none;"></iframe>
+<!-- For receiving question's uid after question has been saved -->
+<div id="itemArea" class="hidden"></div>
+</body>
 </lams:html>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,242 +1,242 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
-
-	<!-- ========================= GENERAL DEFINITIONS ========================= -->
-
-	<import resource="messageContext.xml"/>
-
-	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
-
- 	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
- 		 rather than several local Session Factories.
- 	-->
-	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
-		<property name="dataSource"><ref bean="dataSource"/></property>
-		<property name="packagesToScan">
-			<list>
-				<value>org.lamsfoundation.lams.comments</value>
-				<value>org.lamsfoundation.lams.config</value>
-				<value>org.lamsfoundation.lams.contentrepository</value>
-				<value>org.lamsfoundation.lams.events</value>
-				<value>org.lamsfoundation.lams.gradebook</value>
-				<value>org.lamsfoundation.lams.integration</value>
-				<value>org.lamsfoundation.lams.learningdesign</value>
-				<value>org.lamsfoundation.lams.lesson</value>
-				<value>org.lamsfoundation.lams.logevent</value>
-				<value>org.lamsfoundation.lams.outcome</value>
-				<value>org.lamsfoundation.lams.planner</value>
-				<value>org.lamsfoundation.lams.policies</value>
-				<value>org.lamsfoundation.lams.qb</value>
-				<value>org.lamsfoundation.lams.themes</value>
-				<value>org.lamsfoundation.lams.timezone</value>
-				<value>org.lamsfoundation.lams.tool</value>
-				<value>org.lamsfoundation.lams.usermanagement</value>
-				<value>org.lamsfoundation.lams.workspace</value>
-				<value>org.lamsfoundation.lams.**.model</value>
-			</list>
-		</property>
-		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
-	</bean>
-	
-	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
-	
-	<bean id="transactionRetryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.util.TransactionRetryService" />
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="*">PROPAGATION_REQUIRES_NEW</prop>
-			</props>
-		</property>
-	</bean>	
-	
-	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
-
-	<!-- LAMS primary business object: Hibernate implementation -->
-	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
-		  scope="prototype"
-	>
-		<property name="baseDAO"><ref bean="baseDAO"/></property>
-		<property name="groupDAO"><ref bean="groupDAO"/></property>
-		<property name="roleDAO"><ref bean="roleDAO"/></property>
-		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
-		<property name="favoriteOrganisationDAO"><ref bean="favoriteOrganisationDAO"/></property>
-		<property name="userDAO"><ref bean="userDAO"/></property>
-		<property name="userOrganisationDAO"><ref bean="userOrganisationDAO"/></property>
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="centralToolContentHandler"><ref bean="centralToolContentHandler"/></property>
-	</bean>	
-	
-	<!-- Transactional proxy for the user management primary business object -->
-	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="userManagementServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="find*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="delete*">PROPAGATION_REQUIRED</prop>
-				<prop key="disable*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
-				<prop key="is*">PROPAGATION_REQUIRED</prop>
-				<prop key="toggleOrganisationFavorite">PROPAGATION_REQUIRED</prop>
-				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
-				<prop key="upload*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="learningDesignServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.LearningDesignService">
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
-		<property name="activityDAO"><ref bean="activityDAO"/></property>
-		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
-		<property name="toolDAO"><ref bean="toolDAO"/></property>
-		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
-		<property name="toolActMessageService"><ref bean="loadedMessageSourceService"/></property>
-	</bean>
-	
-	<bean id="learningDesignService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="learningDesignServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
-				<prop key="setValid">PROPAGATION_REQUIRED</prop>
-				<prop key="getAllLearningLibraryDetails">PROPAGATION_REQUIRED</prop>
-				<prop key="getToolDTOs">PROPAGATION_REQUIRED</prop>
-				<prop key="getLearning*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="fillLearningLibraryID">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="lessonServiceTarget" class="org.lamsfoundation.lams.lesson.service.LessonService">
-		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
-		<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>
-		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
-		<property name="baseDAO"><ref bean="baseDAO"/></property>
-		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-	</bean>
-	
-	<bean id="lessonService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="lessonServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="perform*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="add*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="themeServiceTarget" class="org.lamsfoundation.lams.themes.service.ThemeService">
-		<property name="themeDAO"><ref bean="themeDAO"/></property>
-		<property name="userManagementService"><ref bean="userManagementService"/></property>
-	</bean>
-	
-	<bean id="themeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="themeServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="store*">PROPAGATION_REQUIRED</prop>
-				<prop key="set*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean id="timezoneServiceTarget" class="org.lamsfoundation.lams.timezone.service.TimezoneService">
-		<property name="timezoneDAO"><ref bean="timezoneDAO"/></property>
-	</bean>
-	
-	<bean id="timezoneService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="timezoneServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<bean id="signupServiceTarget" class="org.lamsfoundation.lams.signup.service.SignupService">
-		<property name="signupDAO"><ref bean="signupDAO" /></property>
-		<property name="userManagementService"><ref bean="userManagementService" /></property>
-		<property name="lessonService"><ref bean="lessonService" /></property>
-	</bean>
-
-	<bean id="signupService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager" /></property>
-		<property name="target"><ref bean="signupServiceTarget" /></property>
-		<property name="proxyTargetClass"><value>true</value></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="sign*">PROPAGATION_REQUIRED</prop>
-				<prop key="contextExists">PROPAGATION_REQUIRED</prop>
-				<prop key="courseKeyIsValid">PROPAGATION_REQUIRED</prop>
-				<prop key="emailVerify">PROPAGATION_REQUIRED</prop>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="usernameExists">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
+<?xml version="1.0" encoding="UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+
+	<!-- ========================= GENERAL DEFINITIONS ========================= -->
+
+	<import resource="messageContext.xml"/>
+
+	<!-- ========================= RESOURCE DEFINITIONS ========================= -->
+
+ 	<!-- Hibernate SessionFactory. Since LAMS 2.3 it is used in all tools and other parts of LAMS,
+ 		 rather than several local Session Factories.
+ 	-->
+	<bean id="coreSessionFactory" class="org.springframework.orm.hibernate5.LocalSessionFactoryBean">
+		<property name="dataSource"><ref bean="dataSource"/></property>
+		<property name="packagesToScan">
+			<list>
+				<value>org.lamsfoundation.lams.comments</value>
+				<value>org.lamsfoundation.lams.config</value>
+				<value>org.lamsfoundation.lams.contentrepository</value>
+				<value>org.lamsfoundation.lams.events</value>
+				<value>org.lamsfoundation.lams.gradebook</value>
+				<value>org.lamsfoundation.lams.integration</value>
+				<value>org.lamsfoundation.lams.learningdesign</value>
+				<value>org.lamsfoundation.lams.lesson</value>
+				<value>org.lamsfoundation.lams.logevent</value>
+				<value>org.lamsfoundation.lams.outcome</value>
+				<value>org.lamsfoundation.lams.planner</value>
+				<value>org.lamsfoundation.lams.policies</value>
+				<value>org.lamsfoundation.lams.qb</value>
+				<value>org.lamsfoundation.lams.themes</value>
+				<value>org.lamsfoundation.lams.timezone</value>
+				<value>org.lamsfoundation.lams.tool</value>
+				<value>org.lamsfoundation.lams.usermanagement</value>
+				<value>org.lamsfoundation.lams.workspace</value>
+				<value>org.lamsfoundation.lams.**.model</value>
+			</list>
+		</property>
+		<property name="hibernateProperties"><ref bean="hibernateProperties"/></property>
+	</bean>
+	
+	<bean id="multipartResolver" class="org.springframework.web.multipart.commons.CommonsMultipartResolver" />
+	
+	<bean id="transactionRetryService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.util.TransactionRetryService" />
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRES_NEW</prop>
+			</props>
+		</property>
+	</bean>	
+	
+	<!-- ========================= BUSINESS OBJECT DEFINITIONS ========================= -->
+
+	<!-- LAMS primary business object: Hibernate implementation -->
+	<bean id="userManagementServiceTarget" class="org.lamsfoundation.lams.usermanagement.service.UserManagementService"
+		  scope="prototype"
+	>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
+		<property name="groupDAO"><ref bean="groupDAO"/></property>
+		<property name="roleDAO"><ref bean="roleDAO"/></property>
+		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
+		<property name="favoriteOrganisationDAO"><ref bean="favoriteOrganisationDAO"/></property>
+		<property name="userDAO"><ref bean="userDAO"/></property>
+		<property name="userOrganisationDAO"><ref bean="userOrganisationDAO"/></property>
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="centralToolContentHandler"><ref bean="centralToolContentHandler"/></property>
+	</bean>	
+	
+	<!-- Transactional proxy for the user management primary business object -->
+	<bean id="userManagementService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="userManagementServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="find*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="delete*">PROPAGATION_REQUIRED</prop>
+				<prop key="disable*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
+				<prop key="is*">PROPAGATION_REQUIRED</prop>
+				<prop key="toggleOrganisationFavorite">PROPAGATION_REQUIRED</prop>
+				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
+				<prop key="upload*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="learningDesignServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.LearningDesignService">
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="toolDAO"><ref bean="toolDAO"/></property>
+		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
+		<property name="toolActMessageService"><ref bean="loadedMessageSourceService"/></property>
+	</bean>
+	
+	<bean id="learningDesignService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="learningDesignServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="validateLearningDesign">PROPAGATION_REQUIRED</prop>
+				<prop key="setValid">PROPAGATION_REQUIRED</prop>
+				<prop key="getAllLearningLibraryDetails">PROPAGATION_REQUIRED</prop>
+				<prop key="getToolDTOs">PROPAGATION_REQUIRED</prop>
+				<prop key="getLearning*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="fillLearningLibraryID">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="lessonServiceTarget" class="org.lamsfoundation.lams.lesson.service.LessonService">
+		<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+		<property name="lessonClassDAO"><ref bean="lessonClassDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
+		<property name="learnerProgressDAO"><ref bean="learnerProgressDAO"/></property>
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+	</bean>
+	
+	<bean id="lessonService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="lessonServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="perform*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="add*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="themeServiceTarget" class="org.lamsfoundation.lams.themes.service.ThemeService">
+		<property name="themeDAO"><ref bean="themeDAO"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
+	</bean>
+	
+	<bean id="themeService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="themeServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="store*">PROPAGATION_REQUIRED</prop>
+				<prop key="set*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean id="timezoneServiceTarget" class="org.lamsfoundation.lams.timezone.service.TimezoneService">
+		<property name="timezoneDAO"><ref bean="timezoneDAO"/></property>
+	</bean>
+	
+	<bean id="timezoneService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="timezoneServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<bean id="signupServiceTarget" class="org.lamsfoundation.lams.signup.service.SignupService">
+		<property name="signupDAO"><ref bean="signupDAO" /></property>
+		<property name="userManagementService"><ref bean="userManagementService" /></property>
+		<property name="lessonService"><ref bean="lessonService" /></property>
+	</bean>
+
+	<bean id="signupService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager" /></property>
+		<property name="target"><ref bean="signupServiceTarget" /></property>
+		<property name="proxyTargetClass"><value>true</value></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="sign*">PROPAGATION_REQUIRED</prop>
+				<prop key="contextExists">PROPAGATION_REQUIRED</prop>
+				<prop key="courseKeyIsValid">PROPAGATION_REQUIRED</prop>
+				<prop key="emailVerify">PROPAGATION_REQUIRED</prop>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="usernameExists">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
 	<bean id="policyServiceTarget" class="org.lamsfoundation.lams.policies.service.PolicyService">
 		<property name="policyDAO"><ref bean="policyDAO" /></property>
 		<property name="userManagementService"><ref bean="userManagementService" /></property>
@@ -260,266 +260,266 @@
 		</property>
 	</bean>
 	
-	<bean id="exportToolContentServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.ExportToolContentService">
-		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="activityDAO"><ref bean="activityDAO"/></property>
-		<property name="toolDAO"><ref bean="toolDAO"/></property>
-		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
-		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
-		<property name="baseDAO"><ref bean="baseDAO"/></property>
-		<property name="licenseDAO"><ref bean="licenseDAO"/></property>
-		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
-		<property name="transitionDAO"><ref bean="transitionDAO"/></property>
-		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
-		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
-	</bean>
-	
-	<bean id="exportToolContentService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="exportToolContentServiceTarget"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
-		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
-		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
-		<property name="proxyTargetClass"><value>true</value></property>     
-		
-		<property name="transactionAttributes">
-			<props>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="remove*">PROPAGATION_REQUIRED</prop>
-				<prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
-				<prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<!--  Access a message service related to a programatically loaded message file. -->
-	<!--  Can be used to arbitrarily access any message file that is on the classpath -->
-	<!--  as long as you know the file's name and full path.                          -->
-	<bean id="loadedMessageSourceService" class="org.lamsfoundation.lams.util.LoadedMessageSourceService">
-    </bean>
-    	
-    <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
-	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" scope="prototype">
-	</bean>
-			
-	<!--  Core Notebook Service -->
-	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
-		<property name="messageService"><ref bean="commonMessageService"/></property>
-		<property name="userManagementService"><ref bean="userManagementService"/></property>
-		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
-		<property name="baseDAO"><ref bean="baseDAO" /></property>
-	</bean>
-	
-	<bean id="coreNotebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target"><ref bean="coreNotebookServiceTarget"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
-		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
-		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
-		<property name="proxyTargetClass"><value>true</value></property>     
-		
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!--  Rating Service -->
-
-	<bean id="ratingService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.rating.service.RatingService">
-				<property name="messageService"><ref bean="commonMessageService"/></property>
-				<property name="ratingDAO"><ref bean="ratingDAO" /></property>
-				<property name="ratingCommentDAO"><ref bean="ratingCommentDAO" /></property>
-				<property name="ratingCriteriaDAO"><ref bean="ratingCriteriaDAO" /></property>
-				<property name="userManagementService"><ref bean="userManagementService"/></property>
-			</bean>
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="update*">PROPAGATION_REQUIRED</prop>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
+	<bean id="exportToolContentServiceTarget" class="org.lamsfoundation.lams.learningdesign.service.ExportToolContentService">
+		<property name="learningDesignService"><ref bean="learningDesignService"/></property>
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="activityDAO"><ref bean="activityDAO"/></property>
+		<property name="toolDAO"><ref bean="toolDAO"/></property>
+		<property name="toolContentDAO"><ref bean="toolContentDAO"/></property>
+		<property name="systemToolDAO"><ref bean="systemToolDAO"/></property>
+		<property name="baseDAO"><ref bean="baseDAO"/></property>
+		<property name="licenseDAO"><ref bean="licenseDAO"/></property>
+		<property name="groupingDAO"><ref bean="groupingDAO"/></property>
+		<property name="transitionDAO"><ref bean="transitionDAO"/></property>
+		<property name="learningDesignDAO"><ref bean="learningDesignDAO"/></property>
+		<property name="learningLibraryDAO"><ref bean="learningLibraryDAO"/></property>
+	</bean>
+	
+	<bean id="exportToolContentService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="exportToolContentServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
+		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
+		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
+		<property name="proxyTargetClass"><value>true</value></property>     
+		
+		<property name="transactionAttributes">
+			<props>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="remove*">PROPAGATION_REQUIRED</prop>
+				<prop key="export*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+				<prop key="import*">PROPAGATION_REQUIRED,+java.lang.Exception</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<!--  Access a message service related to a programatically loaded message file. -->
+	<!--  Can be used to arbitrarily access any message file that is on the classpath -->
+	<!--  as long as you know the file's name and full path.                          -->
+	<bean id="loadedMessageSourceService" class="org.lamsfoundation.lams.util.LoadedMessageSourceService">
+    </bean>
+    	
+    <!--  Each message service created by loadedMessageService is a ResourceBundleMessageSource -->
+	<bean id="loadedMessageSource" class="org.springframework.context.support.ResourceBundleMessageSource" scope="prototype">
+	</bean>
+			
+	<!--  Core Notebook Service -->
+	<bean id="coreNotebookServiceTarget" class="org.lamsfoundation.lams.notebook.service.CoreNotebookService">
+		<property name="messageService"><ref bean="commonMessageService"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
+		<property name="notebookEntryDAO"><ref bean="notebookEntryDAO" /></property>
+		<property name="baseDAO"><ref bean="baseDAO" /></property>
+	</bean>
+	
+	<bean id="coreNotebookService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target"><ref bean="coreNotebookServiceTarget"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<!-- TransactionProxyFactoryBean by default just proxies all interfaces implemented by the target object -->
+		<!-- AuthoringService is class so needs to be proxied via CGLIB -->
+		<!-- Specify "proxyTargetClass" = "true" to generate a CGLIB proxy-->
+		<property name="proxyTargetClass"><value>true</value></property>     
+		
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!--  Rating Service -->
+
+	<bean id="ratingService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.rating.service.RatingService">
+				<property name="messageService"><ref bean="commonMessageService"/></property>
+				<property name="ratingDAO"><ref bean="ratingDAO" /></property>
+				<property name="ratingCommentDAO"><ref bean="ratingCommentDAO" /></property>
+				<property name="ratingCriteriaDAO"><ref bean="ratingCriteriaDAO" /></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
+			</bean>
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
 				<prop key="delete*">PROPAGATION_REQUIRED</prop>
-				<prop key="rate*">PROPAGATION_REQUIRED</prop>
-				<prop key="commentItem">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-
-	</bean>
-	
-	<!-- Event notification Service -->
-
-	 <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
-        <property name="applicationContextSchedulerContextKey" value="context.central"/>
-        <property name="schedulerName" value="LAMS"/>
-    	<property name="quartzProperties">
-			<props>
-				<prop key="org.quartz.jobStore.class">org.springframework.scheduling.quartz.LocalDataSourceJobStore</prop>
-				<prop key="org.quartz.jobStore.driverDelegateClass">org.quartz.impl.jdbcjobstore.StdJDBCDelegate</prop>
-				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
-			</props>
-		</property> 
-		<property name="dataSource"><ref bean="dataSource"/></property>
-	
-		<property name="jobDetails">
-			<list>
-				<ref bean="resendMessagesJob" />
-			</list>
-		</property>
-		<property name="triggers">
-			<list>
-				<ref bean="resendMessagesJobTrigger" />
-			</list>
-		</property>    
-    </bean>
-
-
-    <bean id="eventNotificationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.events.EventNotificationService">
-				<property name="eventDAO"><ref bean="eventDAO" /></property>
-				<property name="userManagementService"><ref bean="userManagementService"/></property>
-        		<property name="messageService"><ref bean="commonMessageService"/></property>
-        		<property name="lessonService"><ref bean="lessonService"/></property>
-        		<property name="toolService"><ref bean="lamsToolService"/></property>
-			</bean>	
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="create*">PROPAGATION_REQUIRED</prop>
-				<prop key="eventExists">PROPAGATION_REQUIRED</prop>
-				<prop key="sendMessage">PROPAGATION_REQUIRED</prop>
-				<prop key="resendMessages">PROPAGATION_REQUIRED</prop>
-				<prop key="notify*">PROPAGATION_REQUIRED</prop>
-				<prop key="subscribe">PROPAGATION_REQUIRED</prop>
-				<prop key="unsubscribe">PROPAGATION_REQUIRED</prop>
-				<prop key="trigger*">PROPAGATION_REQUIRED</prop>
-				<prop key="isSubscribed">PROPAGATION_REQUIRED</prop>
-				<prop key="getNotification*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-	
-	<bean name="resendMessagesJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
-		<property name="jobClass" value="org.lamsfoundation.lams.events.ResendMessagesJob" />
-		<property name="name" value="Resend Messages Job"/>
-		<property name="durability" value="true" />
-	</bean>
-	
-	<bean id="resendMessagesJobTrigger" 
-                class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
-		<property name="jobDetail" ref="resendMessagesJob" />
-		<property name="name" value="Resend Messages Job Trigger"/>
-		<property name="repeatInterval" value="3600000" />
-		<property name="startDelay" value="120000" />
-	</bean>
-	
-	
-	<!-- Log Event notification Service -->
-	
-	<bean id="logEventService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.logevent.service.LogEventService">
-				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
-				<property name="logEventDAO"><ref bean="logEventDAO"/></property>
-				<property name="messageService"><ref bean="commonMessageService"/></property>
-				<property name="userManagementService"><ref bean="userManagementService"/></property>
-			</bean>	
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="get*">PROPAGATION_REQUIRED</prop>
-				<prop key="logEvent">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>	
-	
-	<!--  Configuration service -->
-	<bean id="configurationService"  class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name ="target">
-			<bean class="org.lamsfoundation.lams.util.Configuration">
-				<property name="configurationDAO"><ref bean="configurationDAO" /></property>
-				<property name="messageService"><ref bean="commonMessageService" /></property>
-				<property name="scheduler"><ref bean="scheduler" /></property>
-			</bean>
-		</property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="transactionAttributes">
-			<props>
-				<prop key="save*">PROPAGATION_REQUIRED</prop>
-				<prop key="persist*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
-
-	<!-- Security service -->
-	<bean id="securityServiceTarget" class="org.lamsfoundation.lams.security.SecurityService">
-		<property name="securityDAO"><ref bean="securityDAO"/></property>
-		<property name="logEventService"><ref bean="logEventService"/></property>
-	</bean>	
-	
-	<bean id="securityService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="securityServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="is*">PROPAGATION_REQUIRED,readOnly</prop>
-				<prop key="has*">PROPAGATION_REQUIRED,readOnly</prop>
-			</props>
-		</property>
-	</bean>
-
+				<prop key="rate*">PROPAGATION_REQUIRED</prop>
+				<prop key="commentItem">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+
+	</bean>
+	
+	<!-- Event notification Service -->
+
+	 <bean id="scheduler" class="org.springframework.scheduling.quartz.SchedulerFactoryBean">
+        <property name="applicationContextSchedulerContextKey" value="context.central"/>
+        <property name="schedulerName" value="LAMS"/>
+    	<property name="quartzProperties">
+			<props>
+				<prop key="org.quartz.jobStore.class">org.springframework.scheduling.quartz.LocalDataSourceJobStore</prop>
+				<prop key="org.quartz.jobStore.driverDelegateClass">org.quartz.impl.jdbcjobstore.StdJDBCDelegate</prop>
+				<prop key="org.quartz.jobStore.tablePrefix">lams_qtz_</prop>
+			</props>
+		</property> 
+		<property name="dataSource"><ref bean="dataSource"/></property>
+	
+		<property name="jobDetails">
+			<list>
+				<ref bean="resendMessagesJob" />
+			</list>
+		</property>
+		<property name="triggers">
+			<list>
+				<ref bean="resendMessagesJobTrigger" />
+			</list>
+		</property>    
+    </bean>
+
+
+    <bean id="eventNotificationService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.events.EventNotificationService">
+				<property name="eventDAO"><ref bean="eventDAO" /></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
+        		<property name="messageService"><ref bean="commonMessageService"/></property>
+        		<property name="lessonService"><ref bean="lessonService"/></property>
+        		<property name="toolService"><ref bean="lamsToolService"/></property>
+			</bean>	
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="create*">PROPAGATION_REQUIRED</prop>
+				<prop key="eventExists">PROPAGATION_REQUIRED</prop>
+				<prop key="sendMessage">PROPAGATION_REQUIRED</prop>
+				<prop key="resendMessages">PROPAGATION_REQUIRED</prop>
+				<prop key="notify*">PROPAGATION_REQUIRED</prop>
+				<prop key="subscribe">PROPAGATION_REQUIRED</prop>
+				<prop key="unsubscribe">PROPAGATION_REQUIRED</prop>
+				<prop key="trigger*">PROPAGATION_REQUIRED</prop>
+				<prop key="isSubscribed">PROPAGATION_REQUIRED</prop>
+				<prop key="getNotification*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<bean name="resendMessagesJob" class="org.springframework.scheduling.quartz.JobDetailFactoryBean">
+		<property name="jobClass" value="org.lamsfoundation.lams.events.ResendMessagesJob" />
+		<property name="name" value="Resend Messages Job"/>
+		<property name="durability" value="true" />
+	</bean>
+	
+	<bean id="resendMessagesJobTrigger" 
+                class="org.springframework.scheduling.quartz.SimpleTriggerFactoryBean">
+		<property name="jobDetail" ref="resendMessagesJob" />
+		<property name="name" value="Resend Messages Job Trigger"/>
+		<property name="repeatInterval" value="3600000" />
+		<property name="startDelay" value="120000" />
+	</bean>
+	
+	
+	<!-- Log Event notification Service -->
+	
+	<bean id="logEventService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.logevent.service.LogEventService">
+				<property name="lessonDAO"><ref bean="lessonDAO"/></property>
+				<property name="logEventDAO"><ref bean="logEventDAO"/></property>
+				<property name="messageService"><ref bean="commonMessageService"/></property>
+				<property name="userManagementService"><ref bean="userManagementService"/></property>
+			</bean>	
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="get*">PROPAGATION_REQUIRED</prop>
+				<prop key="logEvent">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>	
+	
+	<!--  Configuration service -->
+	<bean id="configurationService"  class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name ="transactionManager"><ref bean ="transactionManager"/></property>
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name ="target">
+			<bean class="org.lamsfoundation.lams.util.Configuration">
+				<property name="configurationDAO"><ref bean="configurationDAO" /></property>
+				<property name="messageService"><ref bean="commonMessageService" /></property>
+				<property name="scheduler"><ref bean="scheduler" /></property>
+			</bean>
+		</property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="transactionAttributes">
+			<props>
+				<prop key="save*">PROPAGATION_REQUIRED</prop>
+				<prop key="persist*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+
+	<!-- Security service -->
+	<bean id="securityServiceTarget" class="org.lamsfoundation.lams.security.SecurityService">
+		<property name="securityDAO"><ref bean="securityDAO"/></property>
+		<property name="logEventService"><ref bean="logEventService"/></property>
+	</bean>	
+	
+	<bean id="securityService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="securityServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="is*">PROPAGATION_REQUIRED,readOnly</prop>
+				<prop key="has*">PROPAGATION_REQUIRED,readOnly</prop>
+			</props>
+		</property>
+	</bean>
+
 	<!-- Outcome service -->
 	<bean id="outcomeServiceTarget" class="org.lamsfoundation.lams.outcome.service.OutcomeService">
 		<property name="outcomeDAO"><ref bean="outcomeDAO"/></property>
@@ -541,190 +541,192 @@
 			</props>
 		</property>
 	</bean>
-
-
-	<bean id="qbServiceTarget" class="org.lamsfoundation.lams.qb.service.QbService">
-		<property name="qbDAO"><ref bean="qbDAO"/></property>
-		<property name="gradebookService"><ref bean="gradebookService"/></property>
-		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
-		<property name="userManagementService"><ref bean="userManagementService"/></property>
-	</bean>
-	
-	<bean id="qbService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
-		<property name="transactionManager"><ref bean="transactionManager"/></property>
-		<property name="target"><ref bean="qbServiceTarget"/></property>
-		<property name="proxyTargetClass"><value>true</value></property> 
-		<property name="preInterceptors">
-			<list>
-				<ref bean="transactionRetryInterceptor" />			
-			</list>
-		</property>
-		<property name="transactionAttributes">
-			<props>
-				<prop key="*">PROPAGATION_REQUIRED</prop>
-			</props>
-		</property>
-	</bean>
+
+
+	<bean id="qbServiceTarget" class="org.lamsfoundation.lams.qb.service.QbService">
+		<property name="qbDAO"><ref bean="qbDAO"/></property>
+		<property name="gradebookService"><ref bean="gradebookService"/></property>
+		<property name="lamsCoreToolService"><ref bean="lamsCoreToolService"/></property>
+		<property name="userManagementService"><ref bean="userManagementService"/></property>
+	</bean>
 	
-	<!-- Learning Design related beans-->
-	
-	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="branchActivityEntryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.BranchActivityEntryDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="groupUserDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupUserDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!-- Lesson related beans -->
-	
-	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-
-	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--User management related beans -->
-	
-	<bean id="baseDAO" class="org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<!--  Theme beans -->
-	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.ThemeDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="favoriteOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.FavoriteOrganisationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Timezone service related beans -->
-	<bean id="timezoneDAO" class="org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	
-	<!--  Signup service related beans -->
-	<bean id="signupDAO" class="org.lamsfoundation.lams.signup.dao.hibernate.SignupDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory" /></property>
-	</bean>
-	
+	<bean id="qbService" class="org.springframework.transaction.interceptor.TransactionProxyFactoryBean">
+		<property name="transactionManager"><ref bean="transactionManager"/></property>
+		<property name="target"><ref bean="qbServiceTarget"/></property>
+		<property name="proxyTargetClass"><value>true</value></property> 
+		<property name="preInterceptors">
+			<list>
+				<ref bean="transactionRetryInterceptor" />			
+			</list>
+		</property>
+		<property name="transactionAttributes">
+			<props>
+				<prop key="*">PROPAGATION_REQUIRED</prop>
+			</props>
+		</property>
+	</bean>
+	
+	<!-- Learning Design related beans-->
+	
+	<bean id="activityDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="branchActivityEntryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.BranchActivityEntryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningLibraryDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="learningDesignDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="transitionDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.TransitionDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="groupDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="groupUserDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupUserDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="licenseDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.LicenseDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!-- Lesson related beans -->
+	
+	<bean id="lessonDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="lessonClassDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LessonClassDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+
+	<bean id="learnerProgressDAO" class="org.lamsfoundation.lams.lesson.dao.hibernate.LearnerProgressDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--User management related beans -->
+	
+	<bean id="baseDAO" class="org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<!--  Theme beans -->
+	<bean id="themeDAO" class="org.lamsfoundation.lams.themes.dao.hibernate.ThemeDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="roleDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.RoleDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="organisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.OrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="favoriteOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.FavoriteOrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<bean id="userOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserOrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Timezone service related beans -->
+	<bean id="timezoneDAO" class="org.lamsfoundation.lams.timezone.dao.hibernate.TimezoneDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	
+	<!--  Signup service related beans -->
+	<bean id="signupDAO" class="org.lamsfoundation.lams.signup.dao.hibernate.SignupDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory" /></property>
+	</bean>
+	
 	<!--  Policy service related beans -->
 	<bean id="policyDAO" class="org.lamsfoundation.lams.policies.dao.hibernate.PolicyDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory" /></property>
 	</bean>
 	
-	<!--Event service related beans -->
-	<bean id="eventDAO" class="org.lamsfoundation.lams.events.dao.hibernate.EventDAOHibernate">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  LogEvent service related beans -->
-	<bean id="logEventDAO" class="org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>		
-	
-	<!-- Core Notebook related beans -->
-	<bean id="notebookEntryDAO" class="org.lamsfoundation.lams.notebook.dao.hibernate.NotebookEntryDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-
-	<!-- Rating related beans -->
-	<bean id="ratingDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="ratingCommentDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCommentDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>	
-	<bean id="ratingCriteriaDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCriteriaDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Configuration related beans -->
-	<bean id="configurationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Competence related beans -->
-	<bean id="competenceDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	<bean id="competenceMappingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Data flow related beans -->
-	<bean id="dataFlowDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.DataFlowDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  Data flow related beans -->
-	<bean id="securityDAO" class="org.lamsfoundation.lams.security.SecurityDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-		
-	<!-- Outcome related beans -->
-	<bean id="outcomeDAO" class="org.lamsfoundation.lams.outcome.dao.hibernate.OutcomeDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<bean id="qbDAO" class="org.lamsfoundation.lams.qb.dao.hibernate.QbDAO">
-		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
-	</bean>
-	
-	<!--  System Session bean -->
-	<bean id="SystemSession"
-	    class="org.lamsfoundation.lams.web.session.SessionManager"
-	    init-method="init"
-	    destroy-method="destroy" />
-	
-	<bean id="statisticsService" class="org.lamsfoundation.lams.statistics.service.StatisticsService">
-   		<property name="baseDAO">
-   			<ref bean="baseDAO"/>
-   		</property>	
-   		<property name="userService">
-   			<ref bean="userManagementService"/>
-   		</property>
-    </bean>
-</beans>
+	<!--Event service related beans -->
+	<bean id="eventDAO" class="org.lamsfoundation.lams.events.dao.hibernate.EventDAOHibernate">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  LogEvent service related beans -->
+	<bean id="logEventDAO" class="org.lamsfoundation.lams.logevent.dao.hibernate.LogEventDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>		
+	
+	<!-- Core Notebook related beans -->
+	<bean id="notebookEntryDAO" class="org.lamsfoundation.lams.notebook.dao.hibernate.NotebookEntryDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+
+	<!-- Rating related beans -->
+	<bean id="ratingDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="ratingCommentDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCommentDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>	
+	<bean id="ratingCriteriaDAO" class="org.lamsfoundation.lams.rating.dao.hibernate.RatingCriteriaDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Configuration related beans -->
+	<bean id="configurationDAO" class="org.lamsfoundation.lams.config.dao.hibernate.ConfigurationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Competence related beans -->
+	<bean id="competenceDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	<bean id="competenceMappingDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.CompetenceMappingDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Data flow related beans -->
+	<bean id="dataFlowDAO" class="org.lamsfoundation.lams.learningdesign.dao.hibernate.DataFlowDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  Data flow related beans -->
+	<bean id="securityDAO" class="org.lamsfoundation.lams.security.SecurityDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+		
+	<!-- Outcome related beans -->
+	<bean id="outcomeDAO" class="org.lamsfoundation.lams.outcome.dao.hibernate.OutcomeDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+		<property name="qbDAO"><ref bean="qbDAO"/></property>
+	</bean>
+	
+	<!-- Question Bank related beans -->
+	<bean id="qbDAO" class="org.lamsfoundation.lams.qb.dao.hibernate.QbDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
+	<!--  System Session bean -->
+	<bean id="SystemSession"
+	    class="org.lamsfoundation.lams.web.session.SessionManager"
+	    init-method="init"
+	    destroy-method="destroy" />
+	
+	<bean id="statisticsService" class="org.lamsfoundation.lams.statistics.service.StatisticsService">
+   		<property name="baseDAO">
+   			<ref bean="baseDAO"/>
+   		</property>	
+   		<property name="userService">
+   			<ref bean="userManagementService"/>
+   		</property>
+    </bean>
+</beans>
Index: lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
===================================================================
diff -u -r48f344a789c9af4dcca102b6b5914333e9cbd17a -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java	(.../LAMSBaseDAO.java)	(revision 48f344a789c9af4dcca102b6b5914333e9cbd17a)
+++ lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java	(.../LAMSBaseDAO.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,604 +1,604 @@
-package org.lamsfoundation.lams.dao.hibernate;
-
-import java.io.Serializable;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.Root;
-
-import org.apache.log4j.Logger;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.query.Query;
-import org.lamsfoundation.lams.dao.IBaseDAO;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
-import org.springframework.stereotype.Repository;
-
-@Repository
-public class LAMSBaseDAO implements IBaseDAO {
-
-    private static class Qv {
-
-	String queryString;
-	Object[] values;
-
-	Qv(String queryString, Object[] values) {
-	    super();
-
-	    this.queryString = queryString;
-	    this.values = values;
-	}
-    }
-
-    private static final String SELECT = "from ";
-    private static final String DELETE = "delete ";
-    private static final String WHERE = " where ";
-    private static final String AND = " and ";
-    private static final String SPACE = " ";
-    private static final String SPOT = ".";
-    private static final String EQUAL_TO_WHAT = "=?";
-    private static final String LIKE_WHAT = " like ?";
-
-    private static Logger log = Logger.getLogger(LAMSBaseDAO.class);
-
-    @Autowired
-    @Qualifier("coreSessionFactory")
-    private SessionFactory sessionFactory;
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#insert(java.lang.Object)
-     */
-    @Override
-    public void insert(Object object) {
-	getSession().save(object);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#update(java.lang.Object)
-     */
-    @Override
-    public void update(Object object) {
-	getSession().update(object);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdate(java.lang.Object)
-     */
-    @Override
-    public void insertOrUpdate(Object object) {
-	getSession().saveOrUpdate(object);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdateAll(java.util.Collection
-     * )
-     */
-    @Override
-    public void insertOrUpdateAll(Collection objects) {
-	if (objects != null) {
-	    for (Object object : objects) {
-		getSession().saveOrUpdate(object);
-	    }
-	}
-    }
-
-    @Override
-    public void update(String queryString) {
-	doBulkUpdate(queryString);
-    }
-
-    @Override
-    public void update(String queryString, Object value) {
-	doBulkUpdate(queryString, value);
-    }
-
-    @Override
-    public void update(String queryString, Object[] values) {
-	doBulkUpdate(queryString, values);
-    }
-
-    @Override
-    public void update(Class clazz, String propertyToChange, Object newValue, String conditionProperty,
-	    Object conditionValue) {
-	// TODO implement me
-    }
-
-    @Override
-    public void update(Class clazz, String propertyToChange, Object newValue, Map<String, Object> conditions) {
-	// TODO implement me
-    }
-
-    @Override
-    public void update(Class clazz, Map<String, Object> newValues, String conditionProperty, Object conditionValue) {
-	// TODO implement me
-    }
-
-    @Override
-    public void update(Class clazz, Map<String, Object> newValues, Map<String, Object> conditions) {
-	// TODO implement me
-    }
-
-    @Override
-    public void updateAnythingLike(Class clazz, Object newValues, Object conditions) {
-	// TODO implement me
-    }
-
-    @Override
-    public void flush() {
-	getSession().flush();
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#delete(java.lang.Object)
-     */
-    @Override
-    public void delete(Object object) {
-	getSession().delete(object);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#deleteAll(java.lang.Class)
-     */
-    @Override
-    public void deleteAll(Class clazz) {
-	String queryString = buildQueryString(clazz, DELETE);
-	doBulkUpdate(queryString);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#deleteAll(java.util.Collection)
-     */
-    @Override
-    public void deleteAll(Collection objects) {
-	doDeleteAll(objects);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#deleteById(java.lang.Class,
-     * java.io.Serializable)
-     */
-    @Override
-    public void deleteById(Class clazz, Serializable id) {
-	delete(find(clazz, id));
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#deleteByProperty(java.lang.Class,
-     * java.lang.String, java.lang.Object)
-     */
-    @Override
-    public void deleteByProperty(Class clazz, String name, Object value) {
-	String queryString = buildQueryString(clazz, name, DELETE);
-	doBulkUpdate(queryString, value);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#deleteByProperties(java.lang.Class,
-     * java.util.Map)
-     */
-    @Override
-    public void deleteByProperties(Class clazz, Map<String, Object> properties) {
-	Qv qv = buildQueryString(clazz, properties, DELETE, EQUAL_TO_WHAT);
-	doBulkUpdate(qv.queryString, qv.values);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#deleteAnythingLike(java.lang.Object)
-     */
-    @Override
-    public void deleteAnythingLike(Object object) {
-	try {
-	    Qv qv = buildQueryString(object, DELETE);
-	    doBulkUpdate(qv.queryString, qv.values);
-	} catch (Exception e) {
-	    log.debug(e);
-	}
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#find(java.lang.Class,
-     * java.io.Serializable)
-     */
-    @Override
-    public <T> T find(Class<T> clazz, Serializable id) {
-	return getSession().get(clazz, id);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#findAll(java.lang.Class)
-     */
-    @Override
-    public <T> List<T> findAll(Class<T> clazz) {
-	return loadAll(clazz);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#findByProperty(java.lang.Class,
-     * java.lang.String, java.lang.Object)
-     */
-    @Override
-    public List findByProperty(Class clazz, String name, Object value) {
-	String queryString = buildQueryString(clazz, name, SELECT);
-	return doFind(queryString, value);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#findByProperties(java.lang.Class,
-     * java.util.Map)
-     */
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> List<T> findByProperties(Class<T> clazz, Map<String, Object> properties) {
-	Qv qv = buildQueryString(clazz, properties, SELECT, EQUAL_TO_WHAT);
-	return (List<T>) doFind(qv.queryString, qv.values);
-    }
-
-    private String buildQueryString(Class clazz, String operation) {
-	StringBuilder queryString = new StringBuilder(operation).append(clazz.getSimpleName());
-	// log.debug(queryString);
-	return queryString.toString();
-    }
-
-    private String buildQueryString(Class clazz, String name, String operation) {
-	String clazzName = clazz.getSimpleName();
-	String objName = createObjectName(clazzName);
-	StringBuilder queryString = new StringBuilder(operation).append(clazzName).append(SPACE).append(objName)
-		.append(WHERE).append(objName).append(SPOT).append(name).append(EQUAL_TO_WHAT);
-	// log.debug(queryString);
-	return queryString.toString();
-    }
-
-    @Override
-    public List find(String queryString) {
-	return doFind(queryString);
-    }
-
-    @Override
-    public List find(String queryString, Object value) {
-	return doFind(queryString, value);
-    }
-
-    @Override
-    public List find(String queryString, Object[] values) {
-	return doFind(queryString, values);
-    }
-
-    @Override
-    public List findByNamedQuery(String queryName) {
-	return doFindByNamedQuery(queryName);
-    }
-
-    @Override
-    public List findByNamedQuery(String queryName, Object value) {
-	return doFindByNamedQuery(queryName, value);
-    }
-
-    @Override
-    public List findByNamedQuery(String queryName, Object[] values) {
-	return doFindByNamedQuery(queryName, values);
-    }
-
-    @Override
-    public List searchByStringProperty(Class clazz, String name, String pattern) {
-	// TODO implement me
-	return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> List<T> searchByStringProperties(Class<T> clazz, Map<String, String> properties) {
-	Map<String, Object> p = new HashMap<>();
-	for (Map.Entry<String, String> entry : properties.entrySet()) {
-	    p.put(entry.getKey(), entry.getValue());
-	}
-	Qv qv = buildQueryString(clazz, p, SELECT, LIKE_WHAT);
-	return (List<T>) doFind(qv.queryString, qv.values);
-    }
-
-    @Override
-    public List searchByNumberSpan(Class clazz, String name, Integer min, Boolean minIncluded, Integer max,
-	    Boolean maxIncluded) {
-	// TODO implement me
-	return null;
-    }
-
-    private Qv buildQueryString(Class clazz, Map<String, Object> properties, String operation, String condition) {
-	String clazzName = clazz.getSimpleName();
-	String objName = createObjectName(clazzName);
-	StringBuilder queryString = new StringBuilder(operation).append(clazzName).append(SPACE).append(objName)
-		.append(WHERE);
-	Object[] values = new Object[properties.size()];
-	int i = 0;
-	for (Map.Entry<String, Object> entry : properties.entrySet()) {
-	    queryString.append(objName).append(SPOT).append(entry.getKey()).append(condition);
-	    if (i != properties.size() - 1) {
-		queryString.append(AND);
-	    }
-	    values[i] = entry.getValue();
-	    i++;
-	}
-	// log.debug(queryString);
-	return new Qv(queryString.toString(), values);
-    }
-
-    private Qv buildQueryString(Object obj, String operation) throws Exception {
-	String clazzName = obj.getClass().getSimpleName();
-	String objName = createObjectName(clazzName);
-	StringBuilder queryString = new StringBuilder(operation).append(clazzName).append(SPACE).append(objName)
-		.append(WHERE);
-	Field[] fields = obj.getClass().getDeclaredFields();
-	List<Object> values = new ArrayList<>();
-	for (int i = 0; i < fields.length; i++) {
-	    String name = fields[i].getName();
-	    Method readMethod = getReadMethod(fields[i], name, obj.getClass());
-	    Object value = readMethod.invoke(obj);
-	    if (value != null) {
-		queryString.append(objName).append(SPOT).append(name).append(EQUAL_TO_WHAT);
-		if (i != fields.length - 1) {
-		    queryString.append(AND);
-		}
-		values.add(value);
-	    }
-	}
-	// log.debug(queryString);
-	return new Qv(queryString.toString(), values.toArray());
-    }
-
-    private Method getReadMethod(Field field, String fieldName, Class clazz) throws Exception {
-	String convertedName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
-	if (field.getType().getSimpleName().equals("Boolean")) {
-	    return clazz.getDeclaredMethod("is" + convertedName);
-	} else {
-	    return clazz.getDeclaredMethod("get" + convertedName);
-	}
-
-    }
-
-    private String createObjectName(String clazzName) {
-	return clazzName.substring(0, 1).toLowerCase();
-    }
-
-    @Override
-    public void initialize(Object proxy) {
-	Hibernate.initialize(proxy);
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see org.lamsfoundation.lams.dao.IBaseDAO#countAll(java.lang.Class)
-     */
-    @Override
-    public long countAll(Class clazz) {
-	String query = "select count(*) from " + clazz.getSimpleName();
-
-	List list = doFind(query);
-
-	if (list != null && list.size() > 0) {
-	    return (Long) list.get(0);
-	} else {
-	    return 0;
-	}
-    }
-
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.lamsfoundation.lams.dao.IBaseDAO#countByProperties(java.lang.Class,
-     * java.util.Map)
-     */
-    @Override
-    public long countByProperties(Class clazz, Map<String, Object> properties) {
-	Qv qv = buildQueryString(clazz, properties, SELECT, EQUAL_TO_WHAT);
-	String query = "select count(*) " + qv.queryString;
-
-	List list = doFind(query, qv.values);
-
-	if (list != null && list.size() > 0) {
-	    return (Long) list.get(0);
-	} else {
-	    return 0;
-	}
-    }
-
-    protected Session getSession() {
-	return sessionFactory.getCurrentSession();
-    }
-
-    public void setSessionFactory(SessionFactory sessionFactory) {
-	this.sessionFactory = sessionFactory;
-    }
-
-    public SessionFactory getSessionFactory() {
-	return sessionFactory;
-    }
-
-    public List<?> doFind(final String queryString, final Object... values) {
-	Query queryObject = convertLegacyStyleParameters(queryString, values);
-	return queryObject.list();
-    }
-
-    private Query convertLegacyStyleParameters(final String queryString, final Object... values) {
-	Query queryObject = null;
-	if (values == null) {
-	    queryObject = getSession().createQuery(queryString);
-	} else {
-	    // replace all the current ? with :P1, :P2, etc
-	    String[] parts = Pattern.compile("\\?").split(queryString, 0);
-	    StringBuilder bldr = new StringBuilder(parts[0]);
-	    int i = 1;
-	    if (parts.length > 1) {
-		for (; i < parts.length; i++) {
-		    bldr.append(":P").append(i).append(" ").append(parts[i]);
-		}
-	    }
-	    if (queryString.endsWith("?")) {
-		bldr.append(" :P").append(i).append(" ");
-	    }
-	    queryObject = getSession().createQuery(bldr.toString());
-	    for (i = 0; i < values.length; i++) {
-		queryObject.setParameter("P" + Integer.toString(i + 1), values[i]);
-	    }
-	}
-	return queryObject;
-    }
-
-    public int doBulkUpdate(final String queryString, final Object... values) {
-	Query queryObject = convertLegacyStyleParameters(queryString, values);
-	return queryObject.executeUpdate();
-    }
-
-    public List<?> doFindByNamedQuery(final String queryName, final Object... values) {
-	Query queryObject = getSession().getNamedQuery(queryName);
-	if (values != null) {
-	    for (int i = 0; i < values.length; i++) {
-		queryObject.setParameter(i, values[i]);
-	    }
-	}
-	return queryObject.list();
-    }
-
-    public <T> List<T> loadAll(final Class<T> entityClass) {
-	CriteriaBuilder builder = getSession().getCriteriaBuilder();
-	CriteriaQuery<T> query = builder.createQuery(entityClass);
-	Root<T> variableRoot = query.from(entityClass);
-	query.select(variableRoot);
-	return getSession().createQuery(query).getResultList();
-
-    }
-
-    public void doDeleteAll(final Collection<?> entities) {
-	for (Object entity : entities) {
-	    getSession().delete(entity);
-	}
-    }
-
-    public List<?> doFindByNamedParam(final String queryString, final String[] paramNames, final Object[] values) {
-
-	if (paramNames.length != values.length) {
-	    throw new IllegalArgumentException("Length of paramNames array must match length of values array");
-	}
-	Query queryObject = getSession().createQuery(queryString);
-	if (values != null) {
-	    for (int i = 0; i < values.length; i++) {
-		applyNamedParameterToQuery(queryObject, paramNames[i], values[i]);
-	    }
-	}
-	return queryObject.list();
-    }
-
-    private void applyNamedParameterToQuery(Query queryObject, String paramName, Object value)
-	    throws HibernateException {
-
-	if (value instanceof Collection) {
-	    queryObject.setParameterList(paramName, (Collection<?>) value);
-	} else if (value instanceof Object[]) {
-	    queryObject.setParameterList(paramName, (Object[]) value);
-	} else {
-	    queryObject.setParameter(paramName, value);
-	}
-    }
-
-    public List<?> doFindByNamedQueryAndNamedParam(String queryName, String paramName, Object value) {
-
-	return doFindByNamedQueryAndNamedParam(queryName, new String[] { paramName }, new Object[] { value });
-    }
-
-    public List<?> doFindByNamedQueryAndNamedParam(final String queryName, final String[] paramNames,
-	    final Object[] values) {
-
-	if (values != null && (paramNames == null || paramNames.length != values.length)) {
-	    throw new IllegalArgumentException("Length of paramNames array must match length of values array");
-	}
-	Query queryObject = getSession().getNamedQuery(queryName);
-	if (values != null) {
-	    for (int i = 0; i < values.length; i++) {
-		applyNamedParameterToQuery(queryObject, paramNames[i], values[i]);
-	    }
-	}
-
-	return queryObject.list();
-    }
-
-    /**
-     * @see com.edgenius.paradise.dao.DAO#saveObject(java.lang.Object)
-     */
-    public void saveObject(Object o) {
-	getSession().saveOrUpdate(o);
-    }
-
-    /**
-     * @see com.edgenius.paradise.dao.DAO#getObject(java.lang.Class, java.io.Serializable)
-     */
-    public Object getObject(Class clazz, Serializable id) {
-	Object o = getSession().get(clazz, id);
-	return o;
-    }
-
-    /**
-     * @see com.edgenius.paradise.dao.DAO#getObjects(java.lang.Class)
-     */
-    public List getObjects(Class clazz) {
-	return loadAll(clazz);
-    }
-
-    /**
-     * @see com.edgenius.paradise.dao.DAO#removeObject(java.lang.Class, java.io.Serializable)
-     */
-    public void removeObject(Class clazz, Serializable id) {
-	getSession().delete(getObject(clazz, id));
-    }
-
-    @Override
-    public void releaseFromCache(Object o) {
-	getSessionFactory().getCurrentSession().evict(o);
-    }
-}
+package org.lamsfoundation.lams.dao.hibernate;
+
+import java.io.Serializable;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.regex.Pattern;
+
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.Root;
+
+import org.apache.log4j.Logger;
+import org.hibernate.Hibernate;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.hibernate.SessionFactory;
+import org.hibernate.query.Query;
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class LAMSBaseDAO implements IBaseDAO {
+
+    private static class Qv {
+
+	String queryString;
+	Object[] values;
+
+	Qv(String queryString, Object[] values) {
+	    super();
+
+	    this.queryString = queryString;
+	    this.values = values;
+	}
+    }
+
+    private static final String SELECT = "from ";
+    private static final String DELETE = "delete ";
+    private static final String WHERE = " where ";
+    private static final String AND = " and ";
+    private static final String SPACE = " ";
+    private static final String SPOT = ".";
+    private static final String EQUAL_TO_WHAT = "=?";
+    private static final String LIKE_WHAT = " like ?";
+
+    private static Logger log = Logger.getLogger(LAMSBaseDAO.class);
+
+    @Autowired
+    @Qualifier("coreSessionFactory")
+    private SessionFactory sessionFactory;
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#insert(java.lang.Object)
+     */
+    @Override
+    public void insert(Object object) {
+	getSession().save(object);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#update(java.lang.Object)
+     */
+    @Override
+    public void update(Object object) {
+	getSession().update(object);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdate(java.lang.Object)
+     */
+    @Override
+    public void insertOrUpdate(Object object) {
+	getSession().saveOrUpdate(object);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#insertOrUpdateAll(java.util.Collection
+     * )
+     */
+    @Override
+    public void insertOrUpdateAll(Collection objects) {
+	if (objects != null) {
+	    for (Object object : objects) {
+		getSession().saveOrUpdate(object);
+	    }
+	}
+    }
+
+    @Override
+    public void update(String queryString) {
+	doBulkUpdate(queryString);
+    }
+
+    @Override
+    public void update(String queryString, Object value) {
+	doBulkUpdate(queryString, value);
+    }
+
+    @Override
+    public void update(String queryString, Object[] values) {
+	doBulkUpdate(queryString, values);
+    }
+
+    @Override
+    public void update(Class clazz, String propertyToChange, Object newValue, String conditionProperty,
+	    Object conditionValue) {
+	// TODO implement me
+    }
+
+    @Override
+    public void update(Class clazz, String propertyToChange, Object newValue, Map<String, Object> conditions) {
+	// TODO implement me
+    }
+
+    @Override
+    public void update(Class clazz, Map<String, Object> newValues, String conditionProperty, Object conditionValue) {
+	// TODO implement me
+    }
+
+    @Override
+    public void update(Class clazz, Map<String, Object> newValues, Map<String, Object> conditions) {
+	// TODO implement me
+    }
+
+    @Override
+    public void updateAnythingLike(Class clazz, Object newValues, Object conditions) {
+	// TODO implement me
+    }
+
+    @Override
+    public void flush() {
+	getSession().flush();
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#delete(java.lang.Object)
+     */
+    @Override
+    public void delete(Object object) {
+	getSession().delete(object);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#deleteAll(java.lang.Class)
+     */
+    @Override
+    public void deleteAll(Class clazz) {
+	String queryString = buildQueryString(clazz, DELETE);
+	doBulkUpdate(queryString);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#deleteAll(java.util.Collection)
+     */
+    @Override
+    public void deleteAll(Collection objects) {
+	doDeleteAll(objects);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#deleteById(java.lang.Class,
+     * java.io.Serializable)
+     */
+    @Override
+    public void deleteById(Class clazz, Serializable id) {
+	delete(find(clazz, id));
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#deleteByProperty(java.lang.Class,
+     * java.lang.String, java.lang.Object)
+     */
+    @Override
+    public void deleteByProperty(Class clazz, String name, Object value) {
+	String queryString = buildQueryString(clazz, name, DELETE);
+	doBulkUpdate(queryString, value);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#deleteByProperties(java.lang.Class,
+     * java.util.Map)
+     */
+    @Override
+    public void deleteByProperties(Class clazz, Map<String, Object> properties) {
+	Qv qv = buildQueryString(clazz, properties, DELETE, EQUAL_TO_WHAT);
+	doBulkUpdate(qv.queryString, qv.values);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#deleteAnythingLike(java.lang.Object)
+     */
+    @Override
+    public void deleteAnythingLike(Object object) {
+	try {
+	    Qv qv = buildQueryString(object, DELETE);
+	    doBulkUpdate(qv.queryString, qv.values);
+	} catch (Exception e) {
+	    log.debug(e);
+	}
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#find(java.lang.Class,
+     * java.io.Serializable)
+     */
+    @Override
+    public <T> T find(Class<T> clazz, Serializable id) {
+	return getSession().get(clazz, id);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#findAll(java.lang.Class)
+     */
+    @Override
+    public <T> List<T> findAll(Class<T> clazz) {
+	return loadAll(clazz);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#findByProperty(java.lang.Class,
+     * java.lang.String, java.lang.Object)
+     */
+    @Override
+    public <T> List<T> findByProperty(Class<T> clazz, String name, Object value) {
+	String queryString = buildQueryString(clazz, name, SELECT);
+	return doFind(queryString, value);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#findByProperties(java.lang.Class,
+     * java.util.Map)
+     */
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> List<T> findByProperties(Class<T> clazz, Map<String, Object> properties) {
+	Qv qv = buildQueryString(clazz, properties, SELECT, EQUAL_TO_WHAT);
+	return doFind(qv.queryString, qv.values);
+    }
+
+    private String buildQueryString(Class clazz, String operation) {
+	StringBuilder queryString = new StringBuilder(operation).append(clazz.getSimpleName());
+	// log.debug(queryString);
+	return queryString.toString();
+    }
+
+    private String buildQueryString(Class clazz, String name, String operation) {
+	String clazzName = clazz.getSimpleName();
+	String objName = createObjectName(clazzName);
+	StringBuilder queryString = new StringBuilder(operation).append(clazzName).append(SPACE).append(objName)
+		.append(WHERE).append(objName).append(SPOT).append(name).append(EQUAL_TO_WHAT);
+	// log.debug(queryString);
+	return queryString.toString();
+    }
+
+    @Override
+    public List find(String queryString) {
+	return doFind(queryString);
+    }
+
+    @Override
+    public List find(String queryString, Object value) {
+	return doFind(queryString, value);
+    }
+
+    @Override
+    public List find(String queryString, Object[] values) {
+	return doFind(queryString, values);
+    }
+
+    @Override
+    public List findByNamedQuery(String queryName) {
+	return doFindByNamedQuery(queryName);
+    }
+
+    @Override
+    public List findByNamedQuery(String queryName, Object value) {
+	return doFindByNamedQuery(queryName, value);
+    }
+
+    @Override
+    public List findByNamedQuery(String queryName, Object[] values) {
+	return doFindByNamedQuery(queryName, values);
+    }
+
+    @Override
+    public List searchByStringProperty(Class clazz, String name, String pattern) {
+	// TODO implement me
+	return null;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> List<T> searchByStringProperties(Class<T> clazz, Map<String, String> properties) {
+	Map<String, Object> p = new HashMap<>();
+	for (Map.Entry<String, String> entry : properties.entrySet()) {
+	    p.put(entry.getKey(), entry.getValue());
+	}
+	Qv qv = buildQueryString(clazz, p, SELECT, LIKE_WHAT);
+	return doFind(qv.queryString, qv.values);
+    }
+
+    @Override
+    public List searchByNumberSpan(Class clazz, String name, Integer min, Boolean minIncluded, Integer max,
+	    Boolean maxIncluded) {
+	// TODO implement me
+	return null;
+    }
+
+    private Qv buildQueryString(Class clazz, Map<String, Object> properties, String operation, String condition) {
+	String clazzName = clazz.getSimpleName();
+	String objName = createObjectName(clazzName);
+	StringBuilder queryString = new StringBuilder(operation).append(clazzName).append(SPACE).append(objName)
+		.append(WHERE);
+	Object[] values = new Object[properties.size()];
+	int i = 0;
+	for (Map.Entry<String, Object> entry : properties.entrySet()) {
+	    queryString.append(objName).append(SPOT).append(entry.getKey()).append(condition);
+	    if (i != properties.size() - 1) {
+		queryString.append(AND);
+	    }
+	    values[i] = entry.getValue();
+	    i++;
+	}
+	// log.debug(queryString);
+	return new Qv(queryString.toString(), values);
+    }
+
+    private Qv buildQueryString(Object obj, String operation) throws Exception {
+	String clazzName = obj.getClass().getSimpleName();
+	String objName = createObjectName(clazzName);
+	StringBuilder queryString = new StringBuilder(operation).append(clazzName).append(SPACE).append(objName)
+		.append(WHERE);
+	Field[] fields = obj.getClass().getDeclaredFields();
+	List<Object> values = new ArrayList<>();
+	for (int i = 0; i < fields.length; i++) {
+	    String name = fields[i].getName();
+	    Method readMethod = getReadMethod(fields[i], name, obj.getClass());
+	    Object value = readMethod.invoke(obj);
+	    if (value != null) {
+		queryString.append(objName).append(SPOT).append(name).append(EQUAL_TO_WHAT);
+		if (i != fields.length - 1) {
+		    queryString.append(AND);
+		}
+		values.add(value);
+	    }
+	}
+	// log.debug(queryString);
+	return new Qv(queryString.toString(), values.toArray());
+    }
+
+    private Method getReadMethod(Field field, String fieldName, Class clazz) throws Exception {
+	String convertedName = fieldName.substring(0, 1).toUpperCase() + fieldName.substring(1);
+	if (field.getType().getSimpleName().equals("Boolean")) {
+	    return clazz.getDeclaredMethod("is" + convertedName);
+	} else {
+	    return clazz.getDeclaredMethod("get" + convertedName);
+	}
+
+    }
+
+    private String createObjectName(String clazzName) {
+	return clazzName.substring(0, 1).toLowerCase();
+    }
+
+    @Override
+    public void initialize(Object proxy) {
+	Hibernate.initialize(proxy);
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see org.lamsfoundation.lams.dao.IBaseDAO#countAll(java.lang.Class)
+     */
+    @Override
+    public long countAll(Class clazz) {
+	String query = "select count(*) from " + clazz.getSimpleName();
+
+	List list = doFind(query);
+
+	if (list != null && list.size() > 0) {
+	    return (Long) list.get(0);
+	} else {
+	    return 0;
+	}
+    }
+
+    /*
+     * (non-Javadoc)
+     *
+     * @see
+     * org.lamsfoundation.lams.dao.IBaseDAO#countByProperties(java.lang.Class,
+     * java.util.Map)
+     */
+    @Override
+    public long countByProperties(Class clazz, Map<String, Object> properties) {
+	Qv qv = buildQueryString(clazz, properties, SELECT, EQUAL_TO_WHAT);
+	String query = "select count(*) " + qv.queryString;
+
+	List list = doFind(query, qv.values);
+
+	if (list != null && list.size() > 0) {
+	    return (Long) list.get(0);
+	} else {
+	    return 0;
+	}
+    }
+
+    protected Session getSession() {
+	return sessionFactory.getCurrentSession();
+    }
+
+    public void setSessionFactory(SessionFactory sessionFactory) {
+	this.sessionFactory = sessionFactory;
+    }
+
+    public SessionFactory getSessionFactory() {
+	return sessionFactory;
+    }
+
+    public List doFind(final String queryString, final Object... values) {
+	Query queryObject = convertLegacyStyleParameters(queryString, values);
+	return queryObject.list();
+    }
+
+    private Query convertLegacyStyleParameters(final String queryString, final Object... values) {
+	Query queryObject = null;
+	if (values == null) {
+	    queryObject = getSession().createQuery(queryString);
+	} else {
+	    // replace all the current ? with :P1, :P2, etc
+	    String[] parts = Pattern.compile("\\?").split(queryString, 0);
+	    StringBuilder bldr = new StringBuilder(parts[0]);
+	    int i = 1;
+	    if (parts.length > 1) {
+		for (; i < parts.length; i++) {
+		    bldr.append(":P").append(i).append(" ").append(parts[i]);
+		}
+	    }
+	    if (queryString.endsWith("?")) {
+		bldr.append(" :P").append(i).append(" ");
+	    }
+	    queryObject = getSession().createQuery(bldr.toString());
+	    for (i = 0; i < values.length; i++) {
+		queryObject.setParameter("P" + Integer.toString(i + 1), values[i]);
+	    }
+	}
+	return queryObject;
+    }
+
+    public int doBulkUpdate(final String queryString, final Object... values) {
+	Query queryObject = convertLegacyStyleParameters(queryString, values);
+	return queryObject.executeUpdate();
+    }
+
+    public List<?> doFindByNamedQuery(final String queryName, final Object... values) {
+	Query queryObject = getSession().getNamedQuery(queryName);
+	if (values != null) {
+	    for (int i = 0; i < values.length; i++) {
+		queryObject.setParameter(i, values[i]);
+	    }
+	}
+	return queryObject.list();
+    }
+
+    public <T> List<T> loadAll(final Class<T> entityClass) {
+	CriteriaBuilder builder = getSession().getCriteriaBuilder();
+	CriteriaQuery<T> query = builder.createQuery(entityClass);
+	Root<T> variableRoot = query.from(entityClass);
+	query.select(variableRoot);
+	return getSession().createQuery(query).getResultList();
+
+    }
+
+    public void doDeleteAll(final Collection<?> entities) {
+	for (Object entity : entities) {
+	    getSession().delete(entity);
+	}
+    }
+
+    public List<?> doFindByNamedParam(final String queryString, final String[] paramNames, final Object[] values) {
+
+	if (paramNames.length != values.length) {
+	    throw new IllegalArgumentException("Length of paramNames array must match length of values array");
+	}
+	Query queryObject = getSession().createQuery(queryString);
+	if (values != null) {
+	    for (int i = 0; i < values.length; i++) {
+		applyNamedParameterToQuery(queryObject, paramNames[i], values[i]);
+	    }
+	}
+	return queryObject.list();
+    }
+
+    private void applyNamedParameterToQuery(Query queryObject, String paramName, Object value)
+	    throws HibernateException {
+
+	if (value instanceof Collection) {
+	    queryObject.setParameterList(paramName, (Collection<?>) value);
+	} else if (value instanceof Object[]) {
+	    queryObject.setParameterList(paramName, (Object[]) value);
+	} else {
+	    queryObject.setParameter(paramName, value);
+	}
+    }
+
+    public List<?> doFindByNamedQueryAndNamedParam(String queryName, String paramName, Object value) {
+
+	return doFindByNamedQueryAndNamedParam(queryName, new String[] { paramName }, new Object[] { value });
+    }
+
+    public List<?> doFindByNamedQueryAndNamedParam(final String queryName, final String[] paramNames,
+	    final Object[] values) {
+
+	if (values != null && (paramNames == null || paramNames.length != values.length)) {
+	    throw new IllegalArgumentException("Length of paramNames array must match length of values array");
+	}
+	Query queryObject = getSession().getNamedQuery(queryName);
+	if (values != null) {
+	    for (int i = 0; i < values.length; i++) {
+		applyNamedParameterToQuery(queryObject, paramNames[i], values[i]);
+	    }
+	}
+
+	return queryObject.list();
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#saveObject(java.lang.Object)
+     */
+    public void saveObject(Object o) {
+	getSession().saveOrUpdate(o);
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#getObject(java.lang.Class, java.io.Serializable)
+     */
+    public Object getObject(Class clazz, Serializable id) {
+	Object o = getSession().get(clazz, id);
+	return o;
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#getObjects(java.lang.Class)
+     */
+    public List getObjects(Class clazz) {
+	return loadAll(clazz);
+    }
+
+    /**
+     * @see com.edgenius.paradise.dao.DAO#removeObject(java.lang.Class, java.io.Serializable)
+     */
+    public void removeObject(Class clazz, Serializable id) {
+	getSession().delete(getObject(clazz, id));
+    }
+
+    @Override
+    public void releaseFromCache(Object o) {
+	getSessionFactory().getCurrentSession().evict(o);
+    }
+}
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -0,0 +1,16 @@
+-- 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-4834 Add Learning Outcomes to QB questions
+ALTER TABLE lams_outcome_mapping ADD COLUMN qb_question_id INT,
+								 ADD CONSTRAINT FK_lams_outcome_mapping_4 FOREIGN KEY (qb_question_id)
+								 	REFERENCES lams_qb_question (question_id) ON DELETE CASCADE ON UPDATE CASCADE;
+								 	
+----------------------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/outcome/OutcomeMapping.java
===================================================================
diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java	(.../OutcomeMapping.java)	(revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377)
+++ lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java	(.../OutcomeMapping.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,77 +1,102 @@
-package org.lamsfoundation.lams.outcome;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-
-@Entity
-@Table(name = "lams_outcome_mapping")
-public class OutcomeMapping implements Serializable {
-    private static final long serialVersionUID = -2195345501533401085L;
-
-    @Id
-    @Column(name = "mapping_id")
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long mappingId;
-
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "outcome_id")
-    private Outcome outcome;
-
-    @Column(name = "lesson_id")
-    private Long lessonId;
-
-    @Column(name = "tool_content_id")
-    private Long toolContentId;
-
-    @Column(name = "item_id")
-    private Long itemId;
-
-    public Long getMappingId() {
-	return mappingId;
-    }
-
-    public void setMappingId(Long mappingId) {
-	this.mappingId = mappingId;
-    }
-
-    public Outcome getOutcome() {
-	return outcome;
-    }
-
-    public void setOutcome(Outcome outcome) {
-	this.outcome = outcome;
-    }
-
-    public Long getLessonId() {
-	return lessonId;
-    }
-
-    public void setLessonId(Long lessonId) {
-	this.lessonId = lessonId;
-    }
-
-    public Long getToolContentId() {
-	return toolContentId;
-    }
-
-    public void setToolContentId(Long toolContentId) {
-	this.toolContentId = toolContentId;
-    }
-
-    public Long getItemId() {
-	return itemId;
-    }
-
-    public void setItemId(Long itemId) {
-	this.itemId = itemId;
-    }
+package org.lamsfoundation.lams.outcome;
+
+import java.io.Serializable;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+
+@Entity
+@Table(name = "lams_outcome_mapping")
+public class OutcomeMapping implements Serializable {
+    private static final long serialVersionUID = -2195345501533401085L;
+
+    @Id
+    @Column(name = "mapping_id")
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long mappingId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "outcome_id")
+    private Outcome outcome;
+
+    @Column(name = "lesson_id")
+    private Long lessonId;
+
+    @Column(name = "tool_content_id")
+    private Long toolContentId;
+
+    @Column(name = "item_id")
+    private Long itemId;
+
+    @Column(name = "qb_question_id")
+    private Integer qbQuestionId;
+
+    public Long getMappingId() {
+	return mappingId;
+    }
+
+    public void setMappingId(Long mappingId) {
+	this.mappingId = mappingId;
+    }
+
+    public Outcome getOutcome() {
+	return outcome;
+    }
+
+    public void setOutcome(Outcome outcome) {
+	this.outcome = outcome;
+    }
+
+    public Long getLessonId() {
+	return lessonId;
+    }
+
+    public void setLessonId(Long lessonId) {
+	this.lessonId = lessonId;
+    }
+
+    public Long getToolContentId() {
+	return toolContentId;
+    }
+
+    public void setToolContentId(Long toolContentId) {
+	this.toolContentId = toolContentId;
+    }
+
+    public Long getItemId() {
+	return itemId;
+    }
+
+    public void setItemId(Long itemId) {
+	this.itemId = itemId;
+    }
+
+    public Integer getQbQuestionId() {
+	return qbQuestionId;
+    }
+
+    public void setQbQuestionId(Integer qbQuestionId) {
+	this.qbQuestionId = qbQuestionId;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+	OutcomeMapping other = (OutcomeMapping) o;
+	return new EqualsBuilder().append(mappingId, other.mappingId).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(mappingId).toHashCode();
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
===================================================================
diff -u -r7ba17e82a4cd08db748536b39aef80a4f1c03027 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java	(.../IOutcomeDAO.java)	(revision 7ba17e82a4cd08db748536b39aef80a4f1c03027)
+++ lams_common/src/java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java	(.../IOutcomeDAO.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -35,7 +35,7 @@
 
     List<Outcome> getOutcomesSortedByName(String search);
 
-    List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId);
+    List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId, Integer qbQuestionId);
 
     List<OutcomeScale> getScalesSortedByName();
 
Index: lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
===================================================================
diff -u -r7ba17e82a4cd08db748536b39aef80a4f1c03027 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java	(.../OutcomeDAO.java)	(revision 7ba17e82a4cd08db748536b39aef80a4f1c03027)
+++ lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java	(.../OutcomeDAO.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -22,9 +22,14 @@
 
 package org.lamsfoundation.lams.outcome.dao.hibernate;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.hibernate.query.Query;
@@ -34,15 +39,21 @@
 import org.lamsfoundation.lams.outcome.OutcomeResult;
 import org.lamsfoundation.lams.outcome.OutcomeScale;
 import org.lamsfoundation.lams.outcome.dao.IOutcomeDAO;
+import org.lamsfoundation.lams.qb.dao.IQbDAO;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
 import org.springframework.stereotype.Repository;
 
 @Repository
 public class OutcomeDAO extends LAMSBaseDAO implements IOutcomeDAO {
 
+    private IQbDAO qbDAO;
+
     private static final String FIND_OUTCOMES_SORTED_BY_NAME = "FROM Outcome o ? ORDER BY o.name, o.code";
 
     private static final String FIND_SCALES_SORTED_BY_NAME = "FROM OutcomeScale o ORDER BY o.name, o.code";
 
+    private static final String FIND_OUTCOME_MAPPINGS_BY_QUESTION_ID = "FROM OutcomeMapping m WHERE m.qbQuestionId IN :qbQuestionIds";
+
     /**
      * Finds all global outcomes and ones for the given organisation
      */
@@ -71,19 +82,41 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
-    public List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId) {
+    public List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId,
+	    Integer qbQuestionId) {
+	List<OutcomeMapping> result = new ArrayList<>();
 	Map<String, Object> properties = new HashMap<>();
+
+	Set<Integer> qbQuestionIds = new HashSet<>();
 	if (lessonId != null) {
 	    properties.put("lessonId", lessonId);
 	}
 	if (toolContentId != null) {
 	    properties.put("toolContentId", toolContentId);
+
+	    Collection<QbQuestion> questions = qbDAO.getQuestionsByToolContentId(toolContentId);
+	    qbQuestionIds.addAll(
+		    questions.stream().collect(Collectors.mapping(QbQuestion::getQuestionId, Collectors.toSet())));
 	}
 	if (itemId != null) {
 	    properties.put("itemId", itemId);
 	}
-	return findByProperties(OutcomeMapping.class, properties);
+	// find mappings bound to the given lesson/activity/item
+	if (!properties.isEmpty()) {
+	    result.addAll(findByProperties(OutcomeMapping.class, properties));
+	}
+
+	// find mappings bound to an activity via its QB questions
+	if (qbQuestionId != null) {
+	    qbQuestionIds.add(qbQuestionId);
+	}
+	if (!qbQuestionIds.isEmpty()) {
+	    Query<OutcomeMapping> query = getSession()
+		    .createQuery(FIND_OUTCOME_MAPPINGS_BY_QUESTION_ID, OutcomeMapping.class)
+		    .setParameter("qbQuestionIds", qbQuestionIds);
+	    result.addAll(query.getResultList());
+	}
+	return result;
     }
 
     /**
@@ -96,7 +129,6 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public List<OutcomeResult> getOutcomeResults(Integer userId, Long lessonId, Long toolContentId, Long itemId) {
 	Map<String, Object> properties = new HashMap<>();
 	if (lessonId != null) {
@@ -115,12 +147,15 @@
     }
 
     @Override
-    @SuppressWarnings("unchecked")
     public OutcomeResult getOutcomeResult(Integer userId, Long mappingId) {
 	Map<String, Object> properties = new HashMap<>();
 	properties.put("user.userId", userId);
 	properties.put("mapping.mappingId", mappingId);
 	List<OutcomeResult> result = findByProperties(OutcomeResult.class, properties);
 	return result.isEmpty() ? null : result.get(0);
     }
+
+    public void setQbDAO(IQbDAO qbDAO) {
+	this.qbDAO = qbDAO;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
===================================================================
diff -u -r81e4f5489c431c5e9ff66769f43ebe9b14d36c1a -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java	(.../IOutcomeService.java)	(revision 81e4f5489c431c5e9ff66769f43ebe9b14d36c1a)
+++ lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java	(.../IOutcomeService.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,50 +1,51 @@
-package org.lamsfoundation.lams.outcome.service;
-
-import java.io.IOException;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import org.lamsfoundation.lams.outcome.Outcome;
-import org.lamsfoundation.lams.outcome.OutcomeMapping;
-import org.lamsfoundation.lams.outcome.OutcomeResult;
-import org.lamsfoundation.lams.outcome.OutcomeScale;
-import org.lamsfoundation.lams.util.ExcelCell;
-import org.springframework.web.multipart.MultipartFile;
-
-public interface IOutcomeService {
-    static final long DEFAULT_SCALE_ID = 1;
-
-    // just a hardcoded, random number
-    static final String OUTCOME_CONTENT_FOLDER_ID = "outcomeo-utco-meou-tcom-eoutcomeoutc";
-
-    List<Outcome> getOutcomes();
-
-    List<Outcome> getOutcomes(String search);
-
-    List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId);
-
-    long countOutcomeMappings(Long outcomeId);
-
-    long countScaleUse(Long scaleId);
-
-    List<OutcomeScale> getScales();
-
-    List<OutcomeResult> getOutcomeResults(Integer userId, Long lessonId, Long toolContentId, Long itemId);
-
-    OutcomeResult getOutcomeResult(Integer userId, Long mappingId);
-
-    OutcomeScale getDefaultScale();
-
-    boolean isDefaultScale(Long scaleId);
-
-    void copyOutcomeMappings(Long sourceLessonId, Long sourceToolContentId, Long sourceItemId, Long targetLessonId,
-	    Long targetToolContentId, Long targetItemId);
-
-    LinkedHashMap<String, ExcelCell[][]> exportScales();
-
-    LinkedHashMap<String, ExcelCell[][]> exportOutcomes();
-
-    int importScales(MultipartFile fileItem) throws IOException;
-
-    int importOutcomes(MultipartFile fileItem) throws IOException;
+package org.lamsfoundation.lams.outcome.service;
+
+import java.io.IOException;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.outcome.OutcomeMapping;
+import org.lamsfoundation.lams.outcome.OutcomeResult;
+import org.lamsfoundation.lams.outcome.OutcomeScale;
+import org.lamsfoundation.lams.util.ExcelCell;
+import org.springframework.web.multipart.MultipartFile;
+
+public interface IOutcomeService {
+    static final long DEFAULT_SCALE_ID = 1;
+
+    // just a hardcoded, random number
+    static final String OUTCOME_CONTENT_FOLDER_ID = "outcomeo-utco-meou-tcom-eoutcomeoutc";
+
+    List<Outcome> getOutcomes();
+
+    List<Outcome> getOutcomes(String search);
+
+    List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId, Integer qbQuestionId);
+
+    long countOutcomeMappings(Long outcomeId);
+
+    long countScaleUse(Long scaleId);
+
+    List<OutcomeScale> getScales();
+
+    List<OutcomeResult> getOutcomeResults(Integer userId, Long lessonId, Long toolContentId, Long itemId);
+
+    OutcomeResult getOutcomeResult(Integer userId, Long mappingId);
+
+    OutcomeScale getDefaultScale();
+
+    boolean isDefaultScale(Long scaleId);
+
+    void copyOutcomeMappings(Long sourceLessonId, Long sourceToolContentId, Long sourceItemId,
+	    Integer sourceQbQuestionId, Long targetLessonId, Long targetToolContentId, Long targetItemId,
+	    Integer targetQbQuestionId);
+
+    LinkedHashMap<String, ExcelCell[][]> exportScales();
+
+    LinkedHashMap<String, ExcelCell[][]> exportOutcomes();
+
+    int importScales(MultipartFile fileItem) throws IOException;
+
+    int importOutcomes(MultipartFile fileItem) throws IOException;
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
===================================================================
diff -u -r81e4f5489c431c5e9ff66769f43ebe9b14d36c1a -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(.../OutcomeService.java)	(revision 81e4f5489c431c5e9ff66769f43ebe9b14d36c1a)
+++ lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java	(.../OutcomeService.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,305 +1,307 @@
-package org.lamsfoundation.lams.outcome.service;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
-import org.apache.log4j.Logger;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFRow;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.poifs.filesystem.POIFSFileSystem;
-import org.lamsfoundation.lams.outcome.Outcome;
-import org.lamsfoundation.lams.outcome.OutcomeMapping;
-import org.lamsfoundation.lams.outcome.OutcomeResult;
-import org.lamsfoundation.lams.outcome.OutcomeScale;
-import org.lamsfoundation.lams.outcome.OutcomeScaleItem;
-import org.lamsfoundation.lams.outcome.dao.IOutcomeDAO;
-import org.lamsfoundation.lams.usermanagement.User;
-import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
-import org.lamsfoundation.lams.util.ExcelCell;
-import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.web.session.SessionManager;
-import org.lamsfoundation.lams.web.util.AttributeNames;
-import org.springframework.web.multipart.MultipartFile;
-
-public class OutcomeService implements IOutcomeService {
-    private IOutcomeDAO outcomeDAO;
-    private MessageService messageService;
-
-    private static Logger log = Logger.getLogger(OutcomeService.class);
-
-    @Override
-    public List<Outcome> getOutcomes() {
-	return outcomeDAO.getOutcomesSortedByName();
-    }
-
-    @Override
-    public List<OutcomeScale> getScales() {
-	return outcomeDAO.getScalesSortedByName();
-    }
-
-    @Override
-    public List<Outcome> getOutcomes(String search) {
-	return outcomeDAO.getOutcomesSortedByName(search);
-    }
-
-    @Override
-    public List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId) {
-	return outcomeDAO.getOutcomeMappings(lessonId, toolContentId, itemId);
-    }
-
-    @Override
-    public long countOutcomeMappings(Long outcomeId) {
-	Map<String, Object> properties = new HashMap<>();
-	properties.put("outcome.outcomeId", outcomeId);
-	return outcomeDAO.countByProperties(OutcomeMapping.class, properties);
-    }
-
-    @Override
-    public long countScaleUse(Long scaleId) {
-	Map<String, Object> properties = new HashMap<>();
-	properties.put("scale.scaleId", scaleId);
-	return outcomeDAO.countByProperties(Outcome.class, properties);
-    }
-
-    @Override
-    public List<OutcomeResult> getOutcomeResults(Integer userId, Long lessonId, Long toolContentId, Long itemId) {
-	return outcomeDAO.getOutcomeResults(userId, lessonId, toolContentId, itemId);
-    }
-
-    @Override
-    public OutcomeResult getOutcomeResult(Integer userId, Long mappingId) {
-	return outcomeDAO.getOutcomeResult(userId, mappingId);
-    }
-
-    @Override
-    public OutcomeScale getDefaultScale() {
-	return (OutcomeScale) outcomeDAO.find(OutcomeScale.class, DEFAULT_SCALE_ID);
-    }
-
-    @Override
-    public boolean isDefaultScale(Long scaleId) {
-	return scaleId != null && DEFAULT_SCALE_ID == scaleId;
-    }
-
-    @Override
-    public void copyOutcomeMappings(Long sourceLessonId, Long sourceToolContentId, Long sourceItemId,
-	    Long targetLessonId, Long targetToolContentId, Long targetItemId) {
-	List<OutcomeMapping> sourceMappings = getOutcomeMappings(sourceLessonId, sourceToolContentId, sourceItemId);
-	for (OutcomeMapping sourceMapping : sourceMappings) {
-	    OutcomeMapping targetMapping = new OutcomeMapping();
-	    targetMapping.setOutcome(sourceMapping.getOutcome());
-	    targetMapping.setLessonId(targetLessonId);
-	    targetMapping.setToolContentId(targetToolContentId);
-	    targetMapping.setItemId(targetItemId);
-	    outcomeDAO.insert(targetMapping);
-	}
-    }
-
-    @Override
-    public LinkedHashMap<String, ExcelCell[][]> exportScales() {
-	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<>();
-
-	// The entire data list
-	List<ExcelCell[]> rowList = new LinkedList<>();
-	ExcelCell[] row = new ExcelCell[4];
-	row[0] = new ExcelCell(messageService.getMessage("outcome.manage.add.name"), true);
-	row[1] = new ExcelCell(messageService.getMessage("outcome.manage.add.code"), true);
-	row[2] = new ExcelCell(messageService.getMessage("outcome.manage.add.description"), true);
-	row[3] = new ExcelCell(messageService.getMessage("scale.manage.add.value"), true);
-	rowList.add(row);
-
-	List<OutcomeScale> scales = getScales();
-	for (OutcomeScale scale : scales) {
-	    row = new ExcelCell[4];
-	    row[0] = new ExcelCell(scale.getName(), false);
-	    row[1] = new ExcelCell(scale.getCode(), false);
-	    row[2] = new ExcelCell(scale.getDescription(), false);
-	    row[3] = new ExcelCell(scale.getItemString(), false);
-	    rowList.add(row);
-	}
-
-	ExcelCell[][] data = rowList.toArray(new ExcelCell[][] {});
-	dataToExport.put(messageService.getMessage("scale.title"), data);
-	return dataToExport;
-    }
-
-    @Override
-    public LinkedHashMap<String, ExcelCell[][]> exportOutcomes() {
-	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<>();
-
-	// The entire data list
-	List<ExcelCell[]> rowList = new LinkedList<>();
-	ExcelCell[] row = new ExcelCell[4];
-	row[0] = new ExcelCell(messageService.getMessage("outcome.manage.add.name"), true);
-	row[1] = new ExcelCell(messageService.getMessage("outcome.manage.add.code"), true);
-	row[2] = new ExcelCell(messageService.getMessage("outcome.manage.add.description"), true);
-	row[3] = new ExcelCell(messageService.getMessage("outcome.manage.add.scale"), true);
-	rowList.add(row);
-
-	List<Outcome> outcomes = getOutcomes();
-	for (Outcome outcome : outcomes) {
-	    row = new ExcelCell[4];
-	    row[0] = new ExcelCell(outcome.getName(), false);
-	    row[1] = new ExcelCell(outcome.getCode(), false);
-	    row[2] = new ExcelCell(outcome.getDescription(), false);
-	    row[3] = new ExcelCell(outcome.getScale().getName(), false);
-	    rowList.add(row);
-	}
-
-	ExcelCell[][] data = rowList.toArray(new ExcelCell[][] {});
-	dataToExport.put(messageService.getMessage("index.outcome.manage"), data);
-	return dataToExport;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public int importScales(MultipartFile fileItem) throws IOException {
-	int counter = 0;
-	POIFSFileSystem fs = new POIFSFileSystem(fileItem.getInputStream());
-	try (HSSFWorkbook wb = new HSSFWorkbook(fs)) {
-	    HSSFSheet sheet = wb.getSheetAt(0);
-	    int startRow = sheet.getFirstRowNum();
-	    int endRow = sheet.getLastRowNum();
-	    User user = null;
-
-	    // make import work with files with header ("exported on") or without (pure data)
-	    HSSFRow row = sheet.getRow(startRow);
-	    HSSFCell cell = row.getCell(0);
-	    String header = cell.getStringCellValue();
-	    startRow += "name".equalsIgnoreCase(header) ? 1 : 5;
-
-	    for (int i = startRow; i < (endRow + 1); i++) {
-		row = sheet.getRow(i);
-		cell = row.getCell(0);
-		String name = cell.getStringCellValue();
-		cell = row.getCell(1);
-		String code = cell.getStringCellValue();
-		List<OutcomeScale> foundScales = outcomeDAO.findByProperty(OutcomeScale.class, "name", name);
-		foundScales.addAll(outcomeDAO.findByProperty(OutcomeScale.class, "code", code));
-		if (!foundScales.isEmpty()) {
-		    if (log.isDebugEnabled()) {
-			log.debug("Skipping an outcome scale with existing name \"" + name + "\" or code \"" + code
-				+ "\"");
-		    }
-		    continue;
-		}
-
-		cell = row.getCell(2);
-		String description = cell == null ? null : cell.getStringCellValue();
-		cell = row.getCell(3);
-		String itemsString = cell.getStringCellValue();
-
-		OutcomeScale scale = new OutcomeScale();
-		scale.setName(name);
-		scale.setCode(code);
-		scale.setDescription(description);
-		if (user == null) {
-		    UserDTO userDTO = OutcomeService.getUserDTO();
-		    user = (User) outcomeDAO.find(User.class, userDTO.getUserID());
-		}
-		scale.setCreateBy(user);
-		scale.setCreateDateTime(new Date());
-		outcomeDAO.insert(scale);
-
-		List<String> items = OutcomeScale.parseItems(itemsString);
-		int value = 0;
-		for (String itemString : items) {
-		    OutcomeScaleItem item = new OutcomeScaleItem();
-		    item.setName(itemString);
-		    item.setValue(value++);
-		    item.setScale(scale);
-		    outcomeDAO.insert(item);
-		}
-
-		counter++;
-	    }
-	}
-	return counter;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public int importOutcomes(MultipartFile fileItem) throws IOException {
-	int counter = 0;
-	POIFSFileSystem fs = new POIFSFileSystem(fileItem.getInputStream());
-	try (HSSFWorkbook wb = new HSSFWorkbook(fs)) {
-	    HSSFSheet sheet = wb.getSheetAt(0);
-	    int startRow = sheet.getFirstRowNum();
-	    int endRow = sheet.getLastRowNum();
-	    User user = null;
-
-	    // make import work with files with header ("exported on") or without (pure data)
-	    HSSFRow row = sheet.getRow(startRow);
-	    HSSFCell cell = row.getCell(0);
-	    String header = cell.getStringCellValue();
-	    startRow += "name".equalsIgnoreCase(header) ? 1 : 5;
-
-	    for (int i = startRow; i < (endRow + 1); i++) {
-		row = sheet.getRow(i);
-		cell = row.getCell(0);
-		String name = cell.getStringCellValue();
-		cell = row.getCell(1);
-		String code = cell.getStringCellValue();
-		List<Outcome> foundOutcomes = outcomeDAO.findByProperty(Outcome.class, "name", name);
-		foundOutcomes.addAll(outcomeDAO.findByProperty(Outcome.class, "code", code));
-		if (!foundOutcomes.isEmpty()) {
-		    if (log.isDebugEnabled()) {
-			log.debug("Skipping an outcome with existing name \"" + name + "\" or code \"" + code + "\"");
-		    }
-		    continue;
-		}
-		cell = row.getCell(3);
-		String scaleName = cell.getStringCellValue();
-		List<OutcomeScale> foundScales = outcomeDAO.findByProperty(OutcomeScale.class, "name", scaleName);
-		OutcomeScale scale = foundScales.isEmpty() ? null : foundScales.get(0);
-		if (scale == null) {
-		    if (log.isDebugEnabled()) {
-			log.debug("Skipping an outcome with missing scale with name: " + scaleName);
-		    }
-		    continue;
-		}
-
-		cell = row.getCell(2);
-		String description = cell == null ? null : cell.getStringCellValue();
-
-		Outcome outcome = new Outcome();
-		outcome.setName(name);
-		outcome.setCode(code);
-		outcome.setDescription(description);
-		outcome.setScale(scale);
-		if (user == null) {
-		    UserDTO userDTO = OutcomeService.getUserDTO();
-		    user = (User) outcomeDAO.find(User.class, userDTO.getUserID());
-		}
-		outcome.setCreateBy(user);
-		outcome.setCreateDateTime(new Date());
-		outcomeDAO.insert(outcome);
-
-		counter++;
-	    }
-	}
-	return counter;
-    }
-
-    private static UserDTO getUserDTO() {
-	HttpSession ss = SessionManager.getSession();
-	return (UserDTO) ss.getAttribute(AttributeNames.USER);
-    }
-
-    public void setOutcomeDAO(IOutcomeDAO outcomeDAO) {
-	this.outcomeDAO = outcomeDAO;
-    }
-
-    public void setMessageService(MessageService messageService) {
-	this.messageService = messageService;
-    }
+package org.lamsfoundation.lams.outcome.service;
+
+import java.io.IOException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpSession;
+
+import org.apache.log4j.Logger;
+import org.apache.poi.hssf.usermodel.HSSFCell;
+import org.apache.poi.hssf.usermodel.HSSFRow;
+import org.apache.poi.hssf.usermodel.HSSFSheet;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.poifs.filesystem.POIFSFileSystem;
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.outcome.OutcomeMapping;
+import org.lamsfoundation.lams.outcome.OutcomeResult;
+import org.lamsfoundation.lams.outcome.OutcomeScale;
+import org.lamsfoundation.lams.outcome.OutcomeScaleItem;
+import org.lamsfoundation.lams.outcome.dao.IOutcomeDAO;
+import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
+import org.lamsfoundation.lams.util.ExcelCell;
+import org.lamsfoundation.lams.util.MessageService;
+import org.lamsfoundation.lams.web.session.SessionManager;
+import org.lamsfoundation.lams.web.util.AttributeNames;
+import org.springframework.web.multipart.MultipartFile;
+
+public class OutcomeService implements IOutcomeService {
+    private IOutcomeDAO outcomeDAO;
+    private MessageService messageService;
+
+    private static Logger log = Logger.getLogger(OutcomeService.class);
+
+    @Override
+    public List<Outcome> getOutcomes() {
+	return outcomeDAO.getOutcomesSortedByName();
+    }
+
+    @Override
+    public List<OutcomeScale> getScales() {
+	return outcomeDAO.getScalesSortedByName();
+    }
+
+    @Override
+    public List<Outcome> getOutcomes(String search) {
+	return outcomeDAO.getOutcomesSortedByName(search);
+    }
+
+    @Override
+    public List<OutcomeMapping> getOutcomeMappings(Long lessonId, Long toolContentId, Long itemId,
+	    Integer qbQuestionId) {
+	return outcomeDAO.getOutcomeMappings(lessonId, toolContentId, itemId, qbQuestionId);
+    }
+
+    @Override
+    public long countOutcomeMappings(Long outcomeId) {
+	Map<String, Object> properties = new HashMap<>();
+	properties.put("outcome.outcomeId", outcomeId);
+	return outcomeDAO.countByProperties(OutcomeMapping.class, properties);
+    }
+
+    @Override
+    public long countScaleUse(Long scaleId) {
+	Map<String, Object> properties = new HashMap<>();
+	properties.put("scale.scaleId", scaleId);
+	return outcomeDAO.countByProperties(Outcome.class, properties);
+    }
+
+    @Override
+    public List<OutcomeResult> getOutcomeResults(Integer userId, Long lessonId, Long toolContentId, Long itemId) {
+	return outcomeDAO.getOutcomeResults(userId, lessonId, toolContentId, itemId);
+    }
+
+    @Override
+    public OutcomeResult getOutcomeResult(Integer userId, Long mappingId) {
+	return outcomeDAO.getOutcomeResult(userId, mappingId);
+    }
+
+    @Override
+    public OutcomeScale getDefaultScale() {
+	return outcomeDAO.find(OutcomeScale.class, DEFAULT_SCALE_ID);
+    }
+
+    @Override
+    public boolean isDefaultScale(Long scaleId) {
+	return scaleId != null && DEFAULT_SCALE_ID == scaleId;
+    }
+
+    @Override
+    public void copyOutcomeMappings(Long sourceLessonId, Long sourceToolContentId, Long sourceItemId,
+	    Integer sourceQbQuestionId, Long targetLessonId, Long targetToolContentId, Long targetItemId,
+	    Integer targetQbQuestionId) {
+	List<OutcomeMapping> sourceMappings = getOutcomeMappings(sourceLessonId, sourceToolContentId, sourceItemId,
+		sourceQbQuestionId);
+	for (OutcomeMapping sourceMapping : sourceMappings) {
+	    OutcomeMapping targetMapping = new OutcomeMapping();
+	    targetMapping.setOutcome(sourceMapping.getOutcome());
+	    targetMapping.setLessonId(targetLessonId);
+	    targetMapping.setToolContentId(targetToolContentId);
+	    targetMapping.setItemId(targetItemId);
+	    targetMapping.setQbQuestionId(targetQbQuestionId);
+	    outcomeDAO.insert(targetMapping);
+	}
+    }
+
+    @Override
+    public LinkedHashMap<String, ExcelCell[][]> exportScales() {
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<>();
+
+	// The entire data list
+	List<ExcelCell[]> rowList = new LinkedList<>();
+	ExcelCell[] row = new ExcelCell[4];
+	row[0] = new ExcelCell(messageService.getMessage("outcome.manage.add.name"), true);
+	row[1] = new ExcelCell(messageService.getMessage("outcome.manage.add.code"), true);
+	row[2] = new ExcelCell(messageService.getMessage("outcome.manage.add.description"), true);
+	row[3] = new ExcelCell(messageService.getMessage("scale.manage.add.value"), true);
+	rowList.add(row);
+
+	List<OutcomeScale> scales = getScales();
+	for (OutcomeScale scale : scales) {
+	    row = new ExcelCell[4];
+	    row[0] = new ExcelCell(scale.getName(), false);
+	    row[1] = new ExcelCell(scale.getCode(), false);
+	    row[2] = new ExcelCell(scale.getDescription(), false);
+	    row[3] = new ExcelCell(scale.getItemString(), false);
+	    rowList.add(row);
+	}
+
+	ExcelCell[][] data = rowList.toArray(new ExcelCell[][] {});
+	dataToExport.put(messageService.getMessage("scale.title"), data);
+	return dataToExport;
+    }
+
+    @Override
+    public LinkedHashMap<String, ExcelCell[][]> exportOutcomes() {
+	LinkedHashMap<String, ExcelCell[][]> dataToExport = new LinkedHashMap<>();
+
+	// The entire data list
+	List<ExcelCell[]> rowList = new LinkedList<>();
+	ExcelCell[] row = new ExcelCell[4];
+	row[0] = new ExcelCell(messageService.getMessage("outcome.manage.add.name"), true);
+	row[1] = new ExcelCell(messageService.getMessage("outcome.manage.add.code"), true);
+	row[2] = new ExcelCell(messageService.getMessage("outcome.manage.add.description"), true);
+	row[3] = new ExcelCell(messageService.getMessage("outcome.manage.add.scale"), true);
+	rowList.add(row);
+
+	List<Outcome> outcomes = getOutcomes();
+	for (Outcome outcome : outcomes) {
+	    row = new ExcelCell[4];
+	    row[0] = new ExcelCell(outcome.getName(), false);
+	    row[1] = new ExcelCell(outcome.getCode(), false);
+	    row[2] = new ExcelCell(outcome.getDescription(), false);
+	    row[3] = new ExcelCell(outcome.getScale().getName(), false);
+	    rowList.add(row);
+	}
+
+	ExcelCell[][] data = rowList.toArray(new ExcelCell[][] {});
+	dataToExport.put(messageService.getMessage("index.outcome.manage"), data);
+	return dataToExport;
+    }
+
+    @Override
+    public int importScales(MultipartFile fileItem) throws IOException {
+	int counter = 0;
+	POIFSFileSystem fs = new POIFSFileSystem(fileItem.getInputStream());
+	try (HSSFWorkbook wb = new HSSFWorkbook(fs)) {
+	    HSSFSheet sheet = wb.getSheetAt(0);
+	    int startRow = sheet.getFirstRowNum();
+	    int endRow = sheet.getLastRowNum();
+	    User user = null;
+
+	    // make import work with files with header ("exported on") or without (pure data)
+	    HSSFRow row = sheet.getRow(startRow);
+	    HSSFCell cell = row.getCell(0);
+	    String header = cell.getStringCellValue();
+	    startRow += "name".equalsIgnoreCase(header) ? 1 : 5;
+
+	    for (int i = startRow; i < (endRow + 1); i++) {
+		row = sheet.getRow(i);
+		cell = row.getCell(0);
+		String name = cell.getStringCellValue();
+		cell = row.getCell(1);
+		String code = cell.getStringCellValue();
+		List<OutcomeScale> foundScales = outcomeDAO.findByProperty(OutcomeScale.class, "name", name);
+		foundScales.addAll(outcomeDAO.findByProperty(OutcomeScale.class, "code", code));
+		if (!foundScales.isEmpty()) {
+		    if (log.isDebugEnabled()) {
+			log.debug("Skipping an outcome scale with existing name \"" + name + "\" or code \"" + code
+				+ "\"");
+		    }
+		    continue;
+		}
+
+		cell = row.getCell(2);
+		String description = cell == null ? null : cell.getStringCellValue();
+		cell = row.getCell(3);
+		String itemsString = cell.getStringCellValue();
+
+		OutcomeScale scale = new OutcomeScale();
+		scale.setName(name);
+		scale.setCode(code);
+		scale.setDescription(description);
+		if (user == null) {
+		    UserDTO userDTO = OutcomeService.getUserDTO();
+		    user = outcomeDAO.find(User.class, userDTO.getUserID());
+		}
+		scale.setCreateBy(user);
+		scale.setCreateDateTime(new Date());
+		outcomeDAO.insert(scale);
+
+		List<String> items = OutcomeScale.parseItems(itemsString);
+		int value = 0;
+		for (String itemString : items) {
+		    OutcomeScaleItem item = new OutcomeScaleItem();
+		    item.setName(itemString);
+		    item.setValue(value++);
+		    item.setScale(scale);
+		    outcomeDAO.insert(item);
+		}
+
+		counter++;
+	    }
+	}
+	return counter;
+    }
+
+    @Override
+    public int importOutcomes(MultipartFile fileItem) throws IOException {
+	int counter = 0;
+	POIFSFileSystem fs = new POIFSFileSystem(fileItem.getInputStream());
+	try (HSSFWorkbook wb = new HSSFWorkbook(fs)) {
+	    HSSFSheet sheet = wb.getSheetAt(0);
+	    int startRow = sheet.getFirstRowNum();
+	    int endRow = sheet.getLastRowNum();
+	    User user = null;
+
+	    // make import work with files with header ("exported on") or without (pure data)
+	    HSSFRow row = sheet.getRow(startRow);
+	    HSSFCell cell = row.getCell(0);
+	    String header = cell.getStringCellValue();
+	    startRow += "name".equalsIgnoreCase(header) ? 1 : 5;
+
+	    for (int i = startRow; i < (endRow + 1); i++) {
+		row = sheet.getRow(i);
+		cell = row.getCell(0);
+		String name = cell.getStringCellValue();
+		cell = row.getCell(1);
+		String code = cell.getStringCellValue();
+		List<Outcome> foundOutcomes = outcomeDAO.findByProperty(Outcome.class, "name", name);
+		foundOutcomes.addAll(outcomeDAO.findByProperty(Outcome.class, "code", code));
+		if (!foundOutcomes.isEmpty()) {
+		    if (log.isDebugEnabled()) {
+			log.debug("Skipping an outcome with existing name \"" + name + "\" or code \"" + code + "\"");
+		    }
+		    continue;
+		}
+		cell = row.getCell(3);
+		String scaleName = cell.getStringCellValue();
+		List<OutcomeScale> foundScales = outcomeDAO.findByProperty(OutcomeScale.class, "name", scaleName);
+		OutcomeScale scale = foundScales.isEmpty() ? null : foundScales.get(0);
+		if (scale == null) {
+		    if (log.isDebugEnabled()) {
+			log.debug("Skipping an outcome with missing scale with name: " + scaleName);
+		    }
+		    continue;
+		}
+
+		cell = row.getCell(2);
+		String description = cell == null ? null : cell.getStringCellValue();
+
+		Outcome outcome = new Outcome();
+		outcome.setName(name);
+		outcome.setCode(code);
+		outcome.setDescription(description);
+		outcome.setScale(scale);
+		if (user == null) {
+		    UserDTO userDTO = OutcomeService.getUserDTO();
+		    user = outcomeDAO.find(User.class, userDTO.getUserID());
+		}
+		outcome.setCreateBy(user);
+		outcome.setCreateDateTime(new Date());
+		outcomeDAO.insert(outcome);
+
+		counter++;
+	    }
+	}
+	return counter;
+    }
+
+    private static UserDTO getUserDTO() {
+	HttpSession ss = SessionManager.getSession();
+	return (UserDTO) ss.getAttribute(AttributeNames.USER);
+    }
+
+    public void setOutcomeDAO(IOutcomeDAO outcomeDAO) {
+	this.outcomeDAO = outcomeDAO;
+    }
+
+    public void setMessageService(MessageService messageService) {
+	this.messageService = messageService;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(.../IQbDAO.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java	(.../IQbDAO.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,69 +1,71 @@
-package org.lamsfoundation.lams.qb.dao;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import org.lamsfoundation.lams.dao.IBaseDAO;
-import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.qb.model.QbCollection;
-import org.lamsfoundation.lams.qb.model.QbQuestion;
-
-public interface IQbDAO extends IBaseDAO {
-
-    /**
-     * @param qbQuestionUid
-     * @return QbQuestion object with the specified uid
-     */
-    QbQuestion getQuestionByUid(Long qbQuestionUid);
-
-    /**
-     * @param questionId
-     * @return questions sharing the same questionId
-     */
-    List<QbQuestion> getQuestionsByQuestionId(Integer questionId);
-
-    // finds next question ID for Question Bank question
-    int getMaxQuestionId();
-
-    // finds next version for given question ID for Question Bank question
-    int getMaxQuestionVersion(Integer qbQuestionId);
-
-    List<ToolActivity> getQuestionActivities(long qbQuestionUid);
-
-    int getCountQuestionActivitiesByUid(long qbQuestionUid);
-
-    int getCountQuestionActivitiesByQuestionId(int qbQuestionId);
-
-    List<QbQuestion> getQuestionVersions(long qbQuestionUid);
-
-    Map<Long, Long> getAnswerStatsForQuestion(long qbQuestionUid);
-
-    Map<Integer, Long> getAnswersForActivity(long activityId, long qbQuestionUid);
-
-    Map<String, Long> getBurningQuestions(long qbQuestionUid);
-
-    List<QbQuestion> getPagedQuestions(Integer questionType, int page, int size, String sortBy, String sortOrder,
-	    String searchString);
-
-    int getCountQuestions(Integer questionType, String searchString);
-
-    List<QbQuestion> getCollectionQuestions(long collectionUid);
-
-    List<QbQuestion> getCollectionQuestions(long collectionUid, Integer offset, Integer limit, String orderBy,
-	    String orderDirection, String search);
-
-    List<QbCollection> getQuestionCollectionsByUid(long qbQuestionUid);
-
-    List<QbCollection> getQuestionCollectionsByQuestionId(int qbQuestionId);
-
-    int getCountCollectionQuestions(long collectionUid, String search);
-
-    void addCollectionQuestion(long collectionUid, int qbQuestionId);
-
-    void removeCollectionQuestion(long collectionUid, int qbQuestionId);
-
-    Set<Integer> getCollectionQuestionIdsExcluded(long collectionUid, Collection<Integer> qbQuestionIds);
-
+package org.lamsfoundation.lams.qb.dao;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.qb.model.QbCollection;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
+
+public interface IQbDAO extends IBaseDAO {
+
+    /**
+     * @param qbQuestionUid
+     * @return QbQuestion object with the specified uid
+     */
+    QbQuestion getQuestionByUid(Long qbQuestionUid);
+
+    /**
+     * @param questionId
+     * @return questions sharing the same questionId
+     */
+    List<QbQuestion> getQuestionsByQuestionId(Integer questionId);
+    
+    List<QbQuestion> getQuestionsByToolContentId(long toolContentId);
+    
+    // finds next question ID for Question Bank question
+    int getMaxQuestionId();
+
+    // finds next version for given question ID for Question Bank question
+    int getMaxQuestionVersion(Integer qbQuestionId);
+
+    List<ToolActivity> getQuestionActivities(long qbQuestionUid);
+    
+    int getCountQuestionActivitiesByUid(long qbQuestionUid);
+
+    int getCountQuestionActivitiesByQuestionId(int qbQuestionId);
+
+    List<QbQuestion> getQuestionVersions(long qbQuestionUid);
+
+    Map<Long, Long> getAnswerStatsForQuestion(long qbQuestionUid);
+
+    Map<Integer, Long> getAnswersForActivity(long activityId, long qbQuestionUid);
+
+    Map<String, Long> getBurningQuestions(long qbQuestionUid);
+
+    List<QbQuestion> getPagedQuestions(Integer questionType, int page, int size, String sortBy, String sortOrder,
+	    String searchString);
+
+    int getCountQuestions(Integer questionType, String searchString);
+
+    List<QbQuestion> getCollectionQuestions(long collectionUid);
+
+    List<QbQuestion> getCollectionQuestions(long collectionUid, Integer offset, Integer limit, String orderBy,
+	    String orderDirection, String search);
+
+    List<QbCollection> getQuestionCollectionsByUid(long qbQuestionUid);
+
+    List<QbCollection> getQuestionCollectionsByQuestionId(int qbQuestionId);
+
+    int getCountCollectionQuestions(long collectionUid, String search);
+
+    void addCollectionQuestion(long collectionUid, int qbQuestionId);
+
+    void removeCollectionQuestion(long collectionUid, int qbQuestionId);
+
+    Set<Integer> getCollectionQuestionIdsExcluded(long collectionUid, Collection<Integer> qbQuestionIds);
+
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
===================================================================
diff -u -r0b1e74374b821758fdda7835d8d283bf84fa8db0 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 0b1e74374b821758fdda7835d8d283bf84fa8db0)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java	(.../QbDAO.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,366 +1,375 @@
-package org.lamsfoundation.lams.qb.dao.hibernate;
-
-import java.math.BigInteger;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import javax.persistence.Query;
-
-import org.apache.commons.lang.StringUtils;
-import org.hibernate.query.NativeQuery;
-import org.hibernate.type.IntegerType;
-import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
-import org.lamsfoundation.lams.learningdesign.ToolActivity;
-import org.lamsfoundation.lams.qb.dao.IQbDAO;
-import org.lamsfoundation.lams.qb.model.QbCollection;
-import org.lamsfoundation.lams.qb.model.QbQuestion;
-
-public class QbDAO extends LAMSBaseDAO implements IQbDAO {
-
-    private static final String FIND_MAX_QUESTION_ID = "SELECT MAX(questionId) FROM QbQuestion";
-
-    private static final String FIND_MAX_VERSION = "SELECT MAX(version) FROM QbQuestion AS q WHERE q.questionId = :questionId";
-
-    private static final String FIND_QUESTION_ACTIVITIES = "SELECT a FROM ToolActivity AS a, QbToolQuestion AS q "
-	    + "WHERE a.toolContentId = q.toolContentId AND a.learningDesign.lessons IS NOT EMPTY AND q.qbQuestion.uid = :qbQuestionUid";
-
-    private static final String FIND_QUESTION_VERSIONS = "SELECT q FROM QbQuestion AS q, QbQuestion AS r "
-	    + "WHERE q.questionId = r.questionId AND q.uid <> r.uid AND r.uid = :qbQuestionUid";
-
-    private static final String FIND_ANSWER_STATS_BY_QB_QUESTION = "SELECT COALESCE(a.qb_option_uid, aa.question_option_uid) AS opt, COUNT(a.answer_uid) "
-	    + "FROM lams_qb_tool_question AS tq JOIN lams_qb_tool_answer AS a USING (tool_question_uid) "
-	    + "LEFT JOIN tl_lascrt11_answer_log AS sa ON a.answer_uid = sa.uid "
-	    + "LEFT JOIN tl_lascrt11_session AS ss ON sa.session_id = ss.session_id "
-	    + "LEFT JOIN tl_lascrt11_user AS su ON ss.uid = su.session_uid "
-	    + "LEFT JOIN tl_laasse10_option_answer AS aa ON a.answer_uid = aa.question_result_uid AND aa.answer_boolean = 1 "
-	    + "WHERE tq.qb_question_uid = :qbQuestionUid GROUP BY opt HAVING opt IS NOT NULL";
-
-    private static final String FIND_ANSWERS_BY_ACTIVITY = "SELECT COALESCE(mcu.que_usr_id, su.user_id, au.user_id), "
-	    + "COALESCE(a.qb_option_uid, aa.question_option_uid) AS opt "
-	    + "FROM lams_learning_activity AS act JOIN lams_qb_tool_question AS tq USING (tool_content_id) "
-	    + "JOIN lams_qb_tool_answer AS a USING (tool_question_uid) "
-	    + "LEFT JOIN tl_lamc11_usr_attempt AS mca ON a.answer_uid = mca.uid "
-	    + "LEFT JOIN tl_lamc11_que_usr AS mcu ON mca.que_usr_id = mcu.uid "
-	    + "LEFT JOIN tl_lascrt11_answer_log AS sa ON a.answer_uid = sa.uid "
-	    + "LEFT JOIN tl_lascrt11_session AS ss ON sa.session_id = ss.session_id "
-	    + "LEFT JOIN tl_lascrt11_user AS su ON ss.uid = su.session_uid "
-	    + "LEFT JOIN tl_laasse10_option_answer AS aa ON a.answer_uid = aa.question_result_uid AND aa.answer_boolean = 1 "
-	    + "LEFT JOIN tl_laasse10_question_result AS aq ON a.answer_uid = aq.uid "
-	    + "LEFT JOIN tl_laasse10_assessment_result AS ar ON aq.result_uid = ar.uid "
-	    + "LEFT JOIN tl_laasse10_user AS au ON ar.user_uid = au.uid "
-	    + "WHERE act.activity_id = :activityId AND tq.qb_question_uid = :qbQuestionUid HAVING opt IS NOT NULL";
-
-    private static final String FIND_BURNING_QUESTIONS = "SELECT b.question, COUNT(bl.uid) FROM ScratchieBurningQuestion b LEFT OUTER JOIN "
-	    + "BurningQuestionLike AS bl ON bl.burningQuestion = b WHERE b.scratchieItem.qbQuestion.uid = :qbQuestionUid "
-	    + "GROUP BY b.question ORDER BY COUNT(bl.uid) DESC";
-
-    private static final String FIND_COLLECTION_QUESTIONS = "SELECT q.* FROM lams_qb_collection_question AS cq "
-	    + "JOIN lams_qb_question AS q ON cq.qb_question_id = q.question_id WHERE "
-	    + "q.version = (SELECT MAX(version) FROM lams_qb_question WHERE question_id = q.question_id) "
-	    + "AND cq.collection_uid = :collectionUid";
-
-    private static final String FIND_QUESTION_COLLECTIONS_BY_UID = "SELECT c.* FROM lams_qb_collection_question AS cq "
-	    + "JOIN lams_qb_collection AS c ON cq.collection_uid = c.uid JOIN lams_qb_question AS q ON cq.qb_question_id = q.question_id "
-	    + "WHERE q.uid = :qbQuestionUid";
-
-    private static final String FIND_QUESTION_COLLECTIONS_BY_QUESTION_ID = "SELECT c.* FROM lams_qb_collection_question AS cq "
-	    + "JOIN lams_qb_collection AS c ON cq.collection_uid = c.uid WHERE cq.qb_question_id = :qbQuestionId";
-
-    private static final String ADD_COLLECTION_QUESTION = "INSERT INTO lams_qb_collection_question VALUES (:collectionUid, :qbQuestionId)";
-
-    private static final String EXISTS_COLLECTION_QUESTION = "SELECT 1 FROM lams_qb_collection_question WHERE collection_uid = :collectionUid "
-	    + "AND qb_question_id = :qbQuestionId";
-
-    private static final String REMOVE_COLLECTION_QUESTION = "DELETE FROM lams_qb_collection_question WHERE collection_uid = :collectionUid "
-	    + "AND qb_question_id = :qbQuestionId";
-
-    private static final String FIND_COLLECTION_QUESTIONS_EXCLUDED = "SELECT qb_question_id FROM lams_qb_collection_question "
-	    + "WHERE collection_uid = :collectionUid AND qb_question_id NOT IN :qbQuestionIds";
-
-    @Override
-    public QbQuestion getQuestionByUid(Long qbQuestionUid) {
-	return this.find(QbQuestion.class, qbQuestionUid);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<QbQuestion> getQuestionsByQuestionId(Integer questionId) {
-	final String FIND_QUESTIONS_BY_QUESTION_ID = "FROM " + QbQuestion.class.getName()
-		+ " WHERE questionId = :questionId ORDER BY version DESC";
-
-	Query q = getSession().createQuery(FIND_QUESTIONS_BY_QUESTION_ID, QbQuestion.class);
-	q.setParameter("questionId", questionId);
-	return q.getResultList();
-    }
-
-    @Override
-    public int getMaxQuestionId() {
-	Object result = this.getSession().createQuery(FIND_MAX_QUESTION_ID).uniqueResult();
-	Integer max = (Integer) result;
-	return max == null ? 1 : max + 1;
-    }
-
-    @Override
-    public int getMaxQuestionVersion(Integer qbQuestionId) {
-	Object result = this.getSession().createQuery(FIND_MAX_VERSION).setParameter("questionId", qbQuestionId)
-		.uniqueResult();
-	Integer max = (Integer) result;
-	return max == null ? 1 : max + 1;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<ToolActivity> getQuestionActivities(long qbQuestionUid) {
-	return this.getSession().createQuery(FIND_QUESTION_ACTIVITIES).setParameter("qbQuestionUid", qbQuestionUid)
-		.list();
-    }
-
-    @Override
-    public int getCountQuestionActivitiesByUid(long qbQuestionUid) {
-	return ((Long) getSession().createQuery(FIND_QUESTION_ACTIVITIES.replace("SELECT a", "SELECT COUNT(a)"))
-		.setParameter("qbQuestionUid", qbQuestionUid).getSingleResult()).intValue();
-    }
-
-    @Override
-    public int getCountQuestionActivitiesByQuestionId(int qbQuestionId) {
-	return ((Long) getSession()
-		.createQuery(FIND_QUESTION_ACTIVITIES.replace("SELECT a", "SELECT COUNT(a)")
-			.replace("uid = :qbQuestionUid", "questionId = :qbQuestionId"))
-		.setParameter("qbQuestionId", qbQuestionId).getSingleResult()).intValue();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public List<QbQuestion> getQuestionVersions(long qbQuestionUid) {
-	return this.getSession().createQuery(FIND_QUESTION_VERSIONS).setParameter("qbQuestionUid", qbQuestionUid)
-		.list();
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<Long, Long> getAnswerStatsForQuestion(long qbQuestionUid) {
-	List<Object[]> result = this.getSession().createSQLQuery(FIND_ANSWER_STATS_BY_QB_QUESTION)
-		.setParameter("qbQuestionUid", qbQuestionUid).list();
-	Map<Long, Long> map = new HashMap<>(result.size());
-	for (Object[] answerStat : result) {
-	    map.put(((BigInteger) answerStat[0]).longValue(), ((BigInteger) answerStat[1]).longValue());
-	}
-	return map;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<QbQuestion> getPagedQuestions(Integer questionType, int page, int size, String sortBy, String sortOrder,
-	    String searchString) {
-	//we sort of strip out HTML tags from the search by using REGEXP_REPLACE which skips all the content between < >
-	final String SELECT_QUESTIONS = "SELECT DISTINCT question.* " + " FROM lams_qb_question question  "
-		+ " LEFT OUTER JOIN lams_qb_option qboption " + "	ON qboption.qb_question_uid = question.uid "
-		+ " LEFT JOIN ("//help finding questions with the max available version
-		+ "	SELECT biggerQuestion.* FROM lams_qb_question biggerQuestion "
-		+ " 		LEFT OUTER JOIN lams_qb_option qboption1 "
-		+ "		ON qboption1.qb_question_uid = biggerQuestion.uid "
-		+ "	WHERE biggerQuestion.type = :questionType "
-		+ "	AND (REGEXP_REPLACE(biggerQuestion.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
-		+ " 	OR biggerQuestion.name LIKE CONCAT('%', :searchString, '%') "
-		+ " 	OR REGEXP_REPLACE(qboption1.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) "
-		+ ") AS biggerQuestion ON question.question_id = biggerQuestion.question_id AND question.version < biggerQuestion.version "
-		+ " WHERE biggerQuestion.version is NULL " + " AND question.type = :questionType "
-		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
-		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
-		+ " OR REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) ";
-	final String ORDER_BY_NAME = "ORDER BY question.name ";
-	final String ORDER_BY_SMTH_ELSE = "ORDER BY question.question_id ";
-
-	//TODO check the following query with real data. and see maybe it's better than the current (it's unlikely though) [https://stackoverflow.com/a/28090544/10331386 and https://stackoverflow.com/a/612268/10331386]
-//	SELECT t1.*
-//	FROM lams_qb_question t1
-//	INNER JOIN
-//	(
-//	    SELECT `question_id`, MAX(version) AS max_version
-//	    FROM lams_qb_question as t3
-//			LEFT OUTER JOIN lams_qb_option qboption
-//				ON qboption.qb_question_uid = t3.uid
-//		WHERE REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')
-//	    GROUP BY `question_id`
-//	) t2
-//	    ON t1.`question_id` = t2.`question_id` AND t1.version = t2.max_version;
-
-	StringBuilder bldr = new StringBuilder(SELECT_QUESTIONS);
-	if ("smth_else".equalsIgnoreCase(sortBy)) {
-	    bldr.append(ORDER_BY_SMTH_ELSE);
-	} else {
-	    bldr.append(ORDER_BY_NAME);
-	}
-	bldr.append(sortOrder);
-
-	NativeQuery<?> query = getSession().createNativeQuery(bldr.toString());
-	query.setParameter("questionType", questionType);
-	// support for custom search from a toolbar
-	searchString = searchString == null ? "" : searchString;
-	query.setParameter("searchString", searchString);
-	query.setFirstResult(page * size);
-	query.setMaxResults(size);
-	query.addEntity(QbQuestion.class);
-	List<QbQuestion> queryResults = (List<QbQuestion>) query.list();
-
-	return queryResults;
-    }
-
-    @Override
-    public int getCountQuestions(Integer questionType, String searchString) {
-	final String SELECT_QUESTIONS = "SELECT COUNT(DISTINCT question.uid) count "
-		+ " FROM lams_qb_question question  " + " LEFT OUTER JOIN lams_qb_option qboption "
-		+ "	ON qboption.qb_question_uid = question.uid " + " LEFT JOIN ("//help finding questions with the max available version
-		+ "	SELECT biggerQuestion.* FROM lams_qb_question biggerQuestion "
-		+ " 		LEFT OUTER JOIN lams_qb_option qboption1 "
-		+ "		ON qboption1.qb_question_uid = biggerQuestion.uid "
-		+ "	WHERE biggerQuestion.type = :questionType "
-		+ "	AND (REGEXP_REPLACE(biggerQuestion.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
-		+ " 	OR biggerQuestion.name LIKE CONCAT('%', :searchString, '%') "
-		+ " 	OR REGEXP_REPLACE(qboption1.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) "
-		+ ") AS biggerQuestion ON question.question_id = biggerQuestion.question_id AND question.version < biggerQuestion.version "
-		+ " WHERE biggerQuestion.version is NULL " + " AND question.type = :questionType "
-		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
-		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
-		+ " OR REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) ";
-
-	Query query = getSession().createNativeQuery(SELECT_QUESTIONS).addScalar("count", IntegerType.INSTANCE);
-	;
-	query.setParameter("questionType", questionType);
-	// support for custom search from a toolbar
-	searchString = searchString == null ? "" : searchString;
-	query.setParameter("searchString", searchString);
-	int result = (int) query.getSingleResult();
-	return result;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<Integer, Long> getAnswersForActivity(long activityId, long qbQuestionUid) {
-	List<Object[]> result = this.getSession().createSQLQuery(FIND_ANSWERS_BY_ACTIVITY)
-		.setParameter("activityId", activityId).setParameter("qbQuestionUid", qbQuestionUid).list();
-	Map<Integer, Long> map = new HashMap<>(result.size());
-	for (Object[] answerStat : result) {
-	    map.put(((BigInteger) answerStat[0]).intValue(), ((BigInteger) answerStat[1]).longValue());
-	}
-	return map;
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    public Map<String, Long> getBurningQuestions(long qbQuestionUid) {
-	List<Object[]> result = this.getSession().createQuery(FIND_BURNING_QUESTIONS)
-		.setParameter("qbQuestionUid", qbQuestionUid).list();
-	Map<String, Long> map = new LinkedHashMap<>(result.size());
-	for (Object[] burningQuestion : result) {
-	    map.put((String) burningQuestion[0], (Long) burningQuestion[1]);
-	}
-	return map;
-    }
-
-    @Override
-    public List<QbQuestion> getCollectionQuestions(long collectionUid) {
-	return getCollectionQuestions(collectionUid, null, null, null, null, null);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<QbCollection> getQuestionCollectionsByUid(long qbQuestionUid) {
-	return getSession().createNativeQuery(FIND_QUESTION_COLLECTIONS_BY_UID)
-		.setParameter("qbQuestionUid", qbQuestionUid).addEntity(QbCollection.class).list();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<QbCollection> getQuestionCollectionsByQuestionId(int qbQuestionId) {
-	return getSession().createNativeQuery(FIND_QUESTION_COLLECTIONS_BY_QUESTION_ID)
-		.setParameter("qbQuestionId", qbQuestionId).addEntity(QbCollection.class).list();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public List<QbQuestion> getCollectionQuestions(long collectionUid, Integer offset, Integer limit, String orderBy,
-	    String orderDirection, String search) {
-	Query query = prepareCollectionQuestionsQuery(collectionUid, orderBy, orderDirection, search, false);
-	if (offset != null) {
-	    query.setFirstResult(offset);
-	}
-	if (limit != null) {
-	    query.setMaxResults(limit);
-	}
-	return query.getResultList();
-    }
-
-    @Override
-    public int getCountCollectionQuestions(long collectionUid, String search) {
-	Query query = prepareCollectionQuestionsQuery(collectionUid, null, null, search, true);
-	return ((BigInteger) query.getSingleResult()).intValue();
-    }
-
-    @Override
-    public void addCollectionQuestion(long collectionUid, int qbQuestionId) {
-	if (!questionInCollectionExists(collectionUid, qbQuestionId)) {
-	    getSession().createNativeQuery(ADD_COLLECTION_QUESTION).setParameter("collectionUid", collectionUid)
-		    .setParameter("qbQuestionId", qbQuestionId).executeUpdate();
-	}
-    }
-
-    @Override
-    public void removeCollectionQuestion(long collectionUid, int qbQuestionId) {
-	getSession().createNativeQuery(REMOVE_COLLECTION_QUESTION).setParameter("collectionUid", collectionUid)
-		.setParameter("qbQuestionId", qbQuestionId).executeUpdate();
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public Set<Integer> getCollectionQuestionIdsExcluded(long collectionUid, Collection<Integer> qbQuestionIds) {
-	List<BigInteger> queryResult = getSession().createNativeQuery(FIND_COLLECTION_QUESTIONS_EXCLUDED)
-		.setParameter("collectionUid", collectionUid).setParameterList("qbQuestionIds", qbQuestionIds)
-		.getResultList();
-	Set<Integer> result = new HashSet<>();
-	for (BigInteger questionId : queryResult) {
-	    result.add(questionId.intValue());
-	}
-	return result;
-    }
-
-    private boolean questionInCollectionExists(long collectionUid, int qbQuestionId) {
-	return !getSession().createNativeQuery(EXISTS_COLLECTION_QUESTION).setParameter("collectionUid", collectionUid)
-		.setParameter("qbQuestionId", qbQuestionId).getResultList().isEmpty();
-    }
-
-    private Query prepareCollectionQuestionsQuery(long collectionUid, String orderBy, String orderDirection,
-	    String search, boolean isCount) {
-	StringBuilder queryBuilder = new StringBuilder(FIND_COLLECTION_QUESTIONS);
-
-	if (StringUtils.isNotBlank(search)) {
-	    queryBuilder.append(" AND (q.name LIKE :search OR q.description LIKE :search)");
-	}
-
-	if (!isCount && StringUtils.isNotBlank(orderBy)) {
-	    queryBuilder.append(" ORDER BY ").append(orderBy);
-	    if (StringUtils.isNotBlank(orderDirection)) {
-		queryBuilder.append(" ").append(orderDirection);
-	    }
-	}
-
-	String queryText = queryBuilder.toString();
-	if (isCount) {
-	    queryText = queryText.replace("q.*", "COUNT(*)");
-	}
-
-	Query query = isCount ? getSession().createNativeQuery(queryText)
-		: getSession().createNativeQuery(queryText, QbQuestion.class);
-	query.setParameter("collectionUid", collectionUid);
-	if (StringUtils.isNotBlank(search)) {
-	    query.setParameter("search", "%" + search.trim() + "%");
-	}
-
-	return query;
-    }
+package org.lamsfoundation.lams.qb.dao.hibernate;
+
+import java.math.BigInteger;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.persistence.Query;
+
+import org.apache.commons.lang.StringUtils;
+import org.hibernate.query.NativeQuery;
+import org.hibernate.type.IntegerType;
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.learningdesign.ToolActivity;
+import org.lamsfoundation.lams.qb.dao.IQbDAO;
+import org.lamsfoundation.lams.qb.model.QbCollection;
+import org.lamsfoundation.lams.qb.model.QbQuestion;
+
+public class QbDAO extends LAMSBaseDAO implements IQbDAO {
+
+    private static final String FIND_MAX_QUESTION_ID = "SELECT MAX(questionId) FROM QbQuestion";
+
+    private static final String FIND_MAX_VERSION = "SELECT MAX(version) FROM QbQuestion AS q WHERE q.questionId = :questionId";
+
+    private static final String FIND_QUESTION_ACTIVITIES = "SELECT a FROM ToolActivity AS a, QbToolQuestion AS q "
+	    + "WHERE a.toolContentId = q.toolContentId AND a.learningDesign.lessons IS NOT EMPTY AND q.qbQuestion.uid = :qbQuestionUid";
+
+    private static final String FIND_QUESTION_VERSIONS = "SELECT q FROM QbQuestion AS q, QbQuestion AS r "
+	    + "WHERE q.questionId = r.questionId AND q.uid <> r.uid AND r.uid = :qbQuestionUid";
+
+    private static final String FIND_ANSWER_STATS_BY_QB_QUESTION = "SELECT COALESCE(a.qb_option_uid, aa.question_option_uid) AS opt, COUNT(a.answer_uid) "
+	    + "FROM lams_qb_tool_question AS tq JOIN lams_qb_tool_answer AS a USING (tool_question_uid) "
+	    + "LEFT JOIN tl_lascrt11_answer_log AS sa ON a.answer_uid = sa.uid "
+	    + "LEFT JOIN tl_lascrt11_session AS ss ON sa.session_id = ss.session_id "
+	    + "LEFT JOIN tl_lascrt11_user AS su ON ss.uid = su.session_uid "
+	    + "LEFT JOIN tl_laasse10_option_answer AS aa ON a.answer_uid = aa.question_result_uid AND aa.answer_boolean = 1 "
+	    + "WHERE tq.qb_question_uid = :qbQuestionUid GROUP BY opt HAVING opt IS NOT NULL";
+
+    private static final String FIND_ANSWERS_BY_ACTIVITY = "SELECT COALESCE(mcu.que_usr_id, su.user_id, au.user_id), "
+	    + "COALESCE(a.qb_option_uid, aa.question_option_uid) AS opt "
+	    + "FROM lams_learning_activity AS act JOIN lams_qb_tool_question AS tq USING (tool_content_id) "
+	    + "JOIN lams_qb_tool_answer AS a USING (tool_question_uid) "
+	    + "LEFT JOIN tl_lamc11_usr_attempt AS mca ON a.answer_uid = mca.uid "
+	    + "LEFT JOIN tl_lamc11_que_usr AS mcu ON mca.que_usr_id = mcu.uid "
+	    + "LEFT JOIN tl_lascrt11_answer_log AS sa ON a.answer_uid = sa.uid "
+	    + "LEFT JOIN tl_lascrt11_session AS ss ON sa.session_id = ss.session_id "
+	    + "LEFT JOIN tl_lascrt11_user AS su ON ss.uid = su.session_uid "
+	    + "LEFT JOIN tl_laasse10_option_answer AS aa ON a.answer_uid = aa.question_result_uid AND aa.answer_boolean = 1 "
+	    + "LEFT JOIN tl_laasse10_question_result AS aq ON a.answer_uid = aq.uid "
+	    + "LEFT JOIN tl_laasse10_assessment_result AS ar ON aq.result_uid = ar.uid "
+	    + "LEFT JOIN tl_laasse10_user AS au ON ar.user_uid = au.uid "
+	    + "WHERE act.activity_id = :activityId AND tq.qb_question_uid = :qbQuestionUid HAVING opt IS NOT NULL";
+
+    private static final String FIND_BURNING_QUESTIONS = "SELECT b.question, COUNT(bl.uid) FROM ScratchieBurningQuestion b LEFT OUTER JOIN "
+	    + "BurningQuestionLike AS bl ON bl.burningQuestion = b WHERE b.scratchieItem.qbQuestion.uid = :qbQuestionUid "
+	    + "GROUP BY b.question ORDER BY COUNT(bl.uid) DESC";
+
+    private static final String FIND_COLLECTION_QUESTIONS = "SELECT q.* FROM lams_qb_collection_question AS cq "
+	    + "JOIN lams_qb_question AS q ON cq.qb_question_id = q.question_id WHERE "
+	    + "q.version = (SELECT MAX(version) FROM lams_qb_question WHERE question_id = q.question_id) "
+	    + "AND cq.collection_uid = :collectionUid";
+
+    private static final String FIND_QUESTION_COLLECTIONS_BY_UID = "SELECT c.* FROM lams_qb_collection_question AS cq "
+	    + "JOIN lams_qb_collection AS c ON cq.collection_uid = c.uid JOIN lams_qb_question AS q ON cq.qb_question_id = q.question_id "
+	    + "WHERE q.uid = :qbQuestionUid";
+
+    private static final String FIND_QUESTION_COLLECTIONS_BY_QUESTION_ID = "SELECT c.* FROM lams_qb_collection_question AS cq "
+	    + "JOIN lams_qb_collection AS c ON cq.collection_uid = c.uid WHERE cq.qb_question_id = :qbQuestionId";
+
+    private static final String ADD_COLLECTION_QUESTION = "INSERT INTO lams_qb_collection_question VALUES (:collectionUid, :qbQuestionId)";
+
+    private static final String EXISTS_COLLECTION_QUESTION = "SELECT 1 FROM lams_qb_collection_question WHERE collection_uid = :collectionUid "
+	    + "AND qb_question_id = :qbQuestionId";
+
+    private static final String REMOVE_COLLECTION_QUESTION = "DELETE FROM lams_qb_collection_question WHERE collection_uid = :collectionUid "
+	    + "AND qb_question_id = :qbQuestionId";
+
+    private static final String FIND_COLLECTION_QUESTIONS_EXCLUDED = "SELECT qb_question_id FROM lams_qb_collection_question "
+	    + "WHERE collection_uid = :collectionUid AND qb_question_id NOT IN :qbQuestionIds";
+
+    private static final String FIND_QUESTIONS_BY_TOOL_CONTENT_ID = "SELECT tq.qbQuestion FROM QbToolQuestion AS tq "
+	    + "WHERE tq.toolContentId = :toolContentId";
+
+    @Override
+    public QbQuestion getQuestionByUid(Long qbQuestionUid) {
+	return this.find(QbQuestion.class, qbQuestionUid);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<QbQuestion> getQuestionsByQuestionId(Integer questionId) {
+	final String FIND_QUESTIONS_BY_QUESTION_ID = "FROM " + QbQuestion.class.getName()
+		+ " WHERE questionId = :questionId ORDER BY version DESC";
+
+	Query q = getSession().createQuery(FIND_QUESTIONS_BY_QUESTION_ID, QbQuestion.class);
+	q.setParameter("questionId", questionId);
+	return q.getResultList();
+    }
+
+    @Override
+    public List<QbQuestion> getQuestionsByToolContentId(long toolContentId) {
+	return getSession().createQuery(FIND_QUESTIONS_BY_TOOL_CONTENT_ID, QbQuestion.class)
+		.setParameter("toolContentId", toolContentId).getResultList();
+    }
+
+    @Override
+    public int getMaxQuestionId() {
+	Object result = this.getSession().createQuery(FIND_MAX_QUESTION_ID).uniqueResult();
+	Integer max = (Integer) result;
+	return max == null ? 1 : max + 1;
+    }
+
+    @Override
+    public int getMaxQuestionVersion(Integer qbQuestionId) {
+	Object result = this.getSession().createQuery(FIND_MAX_VERSION).setParameter("questionId", qbQuestionId)
+		.uniqueResult();
+	Integer max = (Integer) result;
+	return max == null ? 1 : max + 1;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<ToolActivity> getQuestionActivities(long qbQuestionUid) {
+	return this.getSession().createQuery(FIND_QUESTION_ACTIVITIES).setParameter("qbQuestionUid", qbQuestionUid)
+		.list();
+    }
+
+    @Override
+    public int getCountQuestionActivitiesByUid(long qbQuestionUid) {
+	return ((Long) getSession().createQuery(FIND_QUESTION_ACTIVITIES.replace("SELECT a", "SELECT COUNT(a)"))
+		.setParameter("qbQuestionUid", qbQuestionUid).getSingleResult()).intValue();
+    }
+
+    @Override
+    public int getCountQuestionActivitiesByQuestionId(int qbQuestionId) {
+	return ((Long) getSession()
+		.createQuery(FIND_QUESTION_ACTIVITIES.replace("SELECT a", "SELECT COUNT(a)")
+			.replace("uid = :qbQuestionUid", "questionId = :qbQuestionId"))
+		.setParameter("qbQuestionId", qbQuestionId).getSingleResult()).intValue();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public List<QbQuestion> getQuestionVersions(long qbQuestionUid) {
+	return this.getSession().createQuery(FIND_QUESTION_VERSIONS).setParameter("qbQuestionUid", qbQuestionUid)
+		.list();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Map<Long, Long> getAnswerStatsForQuestion(long qbQuestionUid) {
+	List<Object[]> result = this.getSession().createSQLQuery(FIND_ANSWER_STATS_BY_QB_QUESTION)
+		.setParameter("qbQuestionUid", qbQuestionUid).list();
+	Map<Long, Long> map = new HashMap<>(result.size());
+	for (Object[] answerStat : result) {
+	    map.put(((BigInteger) answerStat[0]).longValue(), ((BigInteger) answerStat[1]).longValue());
+	}
+	return map;
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<QbQuestion> getPagedQuestions(Integer questionType, int page, int size, String sortBy, String sortOrder,
+	    String searchString) {
+	//we sort of strip out HTML tags from the search by using REGEXP_REPLACE which skips all the content between < >
+	final String SELECT_QUESTIONS = "SELECT DISTINCT question.* " + " FROM lams_qb_question question  "
+		+ " LEFT OUTER JOIN lams_qb_option qboption " + "	ON qboption.qb_question_uid = question.uid "
+		+ " LEFT JOIN ("//help finding questions with the max available version
+		+ "	SELECT biggerQuestion.* FROM lams_qb_question biggerQuestion "
+		+ " 		LEFT OUTER JOIN lams_qb_option qboption1 "
+		+ "		ON qboption1.qb_question_uid = biggerQuestion.uid "
+		+ "	WHERE biggerQuestion.type = :questionType "
+		+ "	AND (REGEXP_REPLACE(biggerQuestion.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
+		+ " 	OR biggerQuestion.name LIKE CONCAT('%', :searchString, '%') "
+		+ " 	OR REGEXP_REPLACE(qboption1.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) "
+		+ ") AS biggerQuestion ON question.question_id = biggerQuestion.question_id AND question.version < biggerQuestion.version "
+		+ " WHERE biggerQuestion.version is NULL " + " AND question.type = :questionType "
+		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
+		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
+		+ " OR REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) ";
+	final String ORDER_BY_NAME = "ORDER BY question.name ";
+	final String ORDER_BY_SMTH_ELSE = "ORDER BY question.question_id ";
+
+	//TODO check the following query with real data. and see maybe it's better than the current (it's unlikely though) [https://stackoverflow.com/a/28090544/10331386 and https://stackoverflow.com/a/612268/10331386]
+//	SELECT t1.*
+//	FROM lams_qb_question t1
+//	INNER JOIN
+//	(
+//	    SELECT `question_id`, MAX(version) AS max_version
+//	    FROM lams_qb_question as t3
+//			LEFT OUTER JOIN lams_qb_option qboption
+//				ON qboption.qb_question_uid = t3.uid
+//		WHERE REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')
+//	    GROUP BY `question_id`
+//	) t2
+//	    ON t1.`question_id` = t2.`question_id` AND t1.version = t2.max_version;
+
+	StringBuilder bldr = new StringBuilder(SELECT_QUESTIONS);
+	if ("smth_else".equalsIgnoreCase(sortBy)) {
+	    bldr.append(ORDER_BY_SMTH_ELSE);
+	} else {
+	    bldr.append(ORDER_BY_NAME);
+	}
+	bldr.append(sortOrder);
+
+	NativeQuery<?> query = getSession().createNativeQuery(bldr.toString());
+	query.setParameter("questionType", questionType);
+	// support for custom search from a toolbar
+	searchString = searchString == null ? "" : searchString;
+	query.setParameter("searchString", searchString);
+	query.setFirstResult(page * size);
+	query.setMaxResults(size);
+	query.addEntity(QbQuestion.class);
+	List<QbQuestion> queryResults = (List<QbQuestion>) query.list();
+
+	return queryResults;
+    }
+
+    @Override
+    public int getCountQuestions(Integer questionType, String searchString) {
+	final String SELECT_QUESTIONS = "SELECT COUNT(DISTINCT question.uid) count "
+		+ " FROM lams_qb_question question  " + " LEFT OUTER JOIN lams_qb_option qboption "
+		+ "	ON qboption.qb_question_uid = question.uid " + " LEFT JOIN ("//help finding questions with the max available version
+		+ "	SELECT biggerQuestion.* FROM lams_qb_question biggerQuestion "
+		+ " 		LEFT OUTER JOIN lams_qb_option qboption1 "
+		+ "		ON qboption1.qb_question_uid = biggerQuestion.uid "
+		+ "	WHERE biggerQuestion.type = :questionType "
+		+ "	AND (REGEXP_REPLACE(biggerQuestion.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
+		+ " 	OR biggerQuestion.name LIKE CONCAT('%', :searchString, '%') "
+		+ " 	OR REGEXP_REPLACE(qboption1.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) "
+		+ ") AS biggerQuestion ON question.question_id = biggerQuestion.question_id AND question.version < biggerQuestion.version "
+		+ " WHERE biggerQuestion.version is NULL " + " AND question.type = :questionType "
+		+ " AND (REGEXP_REPLACE(question.description, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')"
+		+ " OR question.name LIKE CONCAT('%', :searchString, '%') "
+		+ " OR REGEXP_REPLACE(qboption.name, '<[^>]*>+', '') LIKE CONCAT('%', :searchString, '%')) ";
+
+	Query query = getSession().createNativeQuery(SELECT_QUESTIONS).addScalar("count", IntegerType.INSTANCE);
+	;
+	query.setParameter("questionType", questionType);
+	// support for custom search from a toolbar
+	searchString = searchString == null ? "" : searchString;
+	query.setParameter("searchString", searchString);
+	int result = (int) query.getSingleResult();
+	return result;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Map<Integer, Long> getAnswersForActivity(long activityId, long qbQuestionUid) {
+	List<Object[]> result = this.getSession().createSQLQuery(FIND_ANSWERS_BY_ACTIVITY)
+		.setParameter("activityId", activityId).setParameter("qbQuestionUid", qbQuestionUid).list();
+	Map<Integer, Long> map = new HashMap<>(result.size());
+	for (Object[] answerStat : result) {
+	    map.put(((BigInteger) answerStat[0]).intValue(), ((BigInteger) answerStat[1]).longValue());
+	}
+	return map;
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    public Map<String, Long> getBurningQuestions(long qbQuestionUid) {
+	List<Object[]> result = this.getSession().createQuery(FIND_BURNING_QUESTIONS)
+		.setParameter("qbQuestionUid", qbQuestionUid).list();
+	Map<String, Long> map = new LinkedHashMap<>(result.size());
+	for (Object[] burningQuestion : result) {
+	    map.put((String) burningQuestion[0], (Long) burningQuestion[1]);
+	}
+	return map;
+    }
+
+    @Override
+    public List<QbQuestion> getCollectionQuestions(long collectionUid) {
+	return getCollectionQuestions(collectionUid, null, null, null, null, null);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<QbCollection> getQuestionCollectionsByUid(long qbQuestionUid) {
+	return getSession().createNativeQuery(FIND_QUESTION_COLLECTIONS_BY_UID)
+		.setParameter("qbQuestionUid", qbQuestionUid).addEntity(QbCollection.class).list();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<QbCollection> getQuestionCollectionsByQuestionId(int qbQuestionId) {
+	return getSession().createNativeQuery(FIND_QUESTION_COLLECTIONS_BY_QUESTION_ID)
+		.setParameter("qbQuestionId", qbQuestionId).addEntity(QbCollection.class).list();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public List<QbQuestion> getCollectionQuestions(long collectionUid, Integer offset, Integer limit, String orderBy,
+	    String orderDirection, String search) {
+	Query query = prepareCollectionQuestionsQuery(collectionUid, orderBy, orderDirection, search, false);
+	if (offset != null) {
+	    query.setFirstResult(offset);
+	}
+	if (limit != null) {
+	    query.setMaxResults(limit);
+	}
+	return query.getResultList();
+    }
+
+    @Override
+    public int getCountCollectionQuestions(long collectionUid, String search) {
+	Query query = prepareCollectionQuestionsQuery(collectionUid, null, null, search, true);
+	return ((BigInteger) query.getSingleResult()).intValue();
+    }
+
+    @Override
+    public void addCollectionQuestion(long collectionUid, int qbQuestionId) {
+	if (!questionInCollectionExists(collectionUid, qbQuestionId)) {
+	    getSession().createNativeQuery(ADD_COLLECTION_QUESTION).setParameter("collectionUid", collectionUid)
+		    .setParameter("qbQuestionId", qbQuestionId).executeUpdate();
+	}
+    }
+
+    @Override
+    public void removeCollectionQuestion(long collectionUid, int qbQuestionId) {
+	getSession().createNativeQuery(REMOVE_COLLECTION_QUESTION).setParameter("collectionUid", collectionUid)
+		.setParameter("qbQuestionId", qbQuestionId).executeUpdate();
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public Set<Integer> getCollectionQuestionIdsExcluded(long collectionUid, Collection<Integer> qbQuestionIds) {
+	List<BigInteger> queryResult = getSession().createNativeQuery(FIND_COLLECTION_QUESTIONS_EXCLUDED)
+		.setParameter("collectionUid", collectionUid).setParameterList("qbQuestionIds", qbQuestionIds)
+		.getResultList();
+	Set<Integer> result = new HashSet<>();
+	for (BigInteger questionId : queryResult) {
+	    result.add(questionId.intValue());
+	}
+	return result;
+    }
+
+    private boolean questionInCollectionExists(long collectionUid, int qbQuestionId) {
+	return !getSession().createNativeQuery(EXISTS_COLLECTION_QUESTION).setParameter("collectionUid", collectionUid)
+		.setParameter("qbQuestionId", qbQuestionId).getResultList().isEmpty();
+    }
+
+    private Query prepareCollectionQuestionsQuery(long collectionUid, String orderBy, String orderDirection,
+	    String search, boolean isCount) {
+	StringBuilder queryBuilder = new StringBuilder(FIND_COLLECTION_QUESTIONS);
+
+	if (StringUtils.isNotBlank(search)) {
+	    queryBuilder.append(" AND (q.name LIKE :search OR q.description LIKE :search)");
+	}
+
+	if (!isCount && StringUtils.isNotBlank(orderBy)) {
+	    queryBuilder.append(" ORDER BY ").append(orderBy);
+	    if (StringUtils.isNotBlank(orderDirection)) {
+		queryBuilder.append(" ").append(orderDirection);
+	    }
+	}
+
+	String queryText = queryBuilder.toString();
+	if (isCount) {
+	    queryText = queryText.replace("q.*", "COUNT(*)");
+	}
+
+	Query query = isCount ? getSession().createNativeQuery(queryText)
+		: getSession().createNativeQuery(queryText, QbQuestion.class);
+	query.setParameter("collectionUid", collectionUid);
+	if (StringUtils.isNotBlank(search)) {
+	    query.setParameter("search", "%" + search.trim() + "%");
+	}
+
+	return query;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
===================================================================
diff -u -re6b461918b2b8c7e791407b868c5f5b1991c7744 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision e6b461918b2b8c7e791407b868c5f5b1991c7744)
+++ lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java	(.../QbQuestion.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,416 +1,425 @@
-package org.lamsfoundation.lams.qb.model;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
-
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
-import org.hibernate.annotations.Fetch;
-import org.hibernate.annotations.FetchMode;
-
-/**
- * A question in Question Bank.
- *
- * @author Marcin Cieslak
- */
-@Entity
-@Table(name = "lams_qb_question")
-public class QbQuestion implements Serializable, Cloneable {
-    private static final long serialVersionUID = -6287273838239262151L;
-
-    // questions can be of different type
-    // not all tools can produce/consume all question types
-    public static final int TYPE_MULTIPLE_CHOICE = 1;
-    public static final int TYPE_MATCHING_PAIRS = 2;
-    public static final int TYPE_SHORT_ANSWER = 3;
-    public static final int TYPE_NUMERICAL = 4;
-    public static final int TYPE_TRUE_FALSE = 5;
-    public static final int TYPE_ESSAY = 6;
-    public static final int TYPE_ORDERING = 7;
-    public static final int TYPE_MARK_HEDGING = 8;
-
-    // primary key
-    // another candidate is questionId + version, but single uid can be searched faster
-    @Id
-    @Column
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long uid;
-
-    // one of question types
-    @Column
-    private Integer type;
-
-    // "tracking ID" for a question
-    // multiple versions can share the same question ID so their stats are aggregated
-    @Column(name = "question_id")
-    private Integer questionId;
-
-    // the same question can have multiple versions
-    @Column
-    private Integer version = 1;
-
-    @Column(name = "create_date")
-    private Date createDate = new Date();
-
-    // text of the question
-    @Column
-    private String name;
-
-    @Column
-    private String description;
-
-    @Column(name = "max_mark")
-    private Integer maxMark;
-
-    @Column
-    private String feedback;
-
-    @Column(name = "penalty_factor")
-    private float penaltyFactor;
-
-    @Column(name = "answer_required")
-    private boolean answerRequired;
-
-    @Column(name = "multiple_answers_allowed")
-    private boolean multipleAnswersAllowed;
-
-    @Column(name = "incorrect_answer_nullifies_mark")
-    private boolean incorrectAnswerNullifiesMark;
-
-    @Column(name = "feedback_on_correct")
-    private String feedbackOnCorrect;
-
-    @Column(name = "feedback_on_partially_correct")
-    private String feedbackOnPartiallyCorrect;
-
-    @Column(name = "feedback_on_incorrect")
-    private String feedbackOnIncorrect;
-
-    // only one of shuffle and prefixAnswersWithLetters should be on. Both may be off
-    @Column
-    private boolean shuffle;
-    
-    @Column(name = "prefix_answers_with_letters")
-    private boolean prefixAnswersWithLetters;
-
-    @Column(name = "case_sensitive")
-    private boolean caseSensitive;
-
-    @Column(name = "correct_answer")
-    private boolean correctAnswer;
-
-    @Column(name = "allow_rich_editor")
-    private boolean allowRichEditor;
-
-    // only for essay type of question
-    @Column(name = "max_words_limit")
-    private int maxWordsLimit;
-    
-    // only for essay type of question
-    @Column(name = "min_words_limit")
-    private int minWordsLimit;
-
-    // only for hedging maxMark type of question
-    @Column(name = "hedging_justification_enabled")
-    private boolean hedgingJustificationEnabled;
-
-    @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
-    @Fetch(value = FetchMode.SUBSELECT)
-    private List<QbOption> qbOptions = new ArrayList<>();
-    
-    @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
-    @Fetch(value = FetchMode.SUBSELECT)
-    private List<QbQuestionUnit> units = new ArrayList<>();
-
-    // compares if current question data and the other one (probably modified with new data) are the same
-    // it detects if question is the same or should another question/version be created
-    public boolean isModified(QbQuestion modifiedQuestion) {
-	return !equals(modifiedQuestion);
-    }
-
-    // checks if important parts of another question are the same as current question's
-    @Override
-    public boolean equals(Object o) {
-	QbQuestion other = (QbQuestion) o;
-	// options are also checked if they are equal
-	return new EqualsBuilder().append(name, other.name).append(description, other.description)
-		.append(feedback, other.feedback).append(maxMark, other.maxMark)
-		.append(qbOptions.toArray(), other.getQbOptions().toArray())
-		.append(units.toArray(), other.getUnits().toArray()).isEquals();
-    }
-
-    @Override
-    public int hashCode() {
-	return new HashCodeBuilder().append(name).append(description).append(feedback).append(maxMark).toHashCode();
-    }
-
-    @Override
-    public QbQuestion clone() {
-	QbQuestion clone = null;
-	try {
-	    clone = (QbQuestion) super.clone();
-	} catch (CloneNotSupportedException e) {
-	    // it should never happen
-	    e.printStackTrace();
-	}
-	// make a deep copy of options
-	List<QbOption> optionsClone = new ArrayList<>(qbOptions.size());
-	clone.setQbOptions(optionsClone);
-	for (QbOption option : qbOptions) {
-	    QbOption optionClone = option.clone();
-	    optionClone.setQbQuestion(clone);
-	    optionsClone.add(optionClone);
-	}
-	// make a deep copy of units
-	List<QbQuestionUnit> unitsClone = new ArrayList<>(units.size());
-	clone.setUnits(unitsClone);
-	for (QbQuestionUnit unit : units) {
-	    QbQuestionUnit unitClone = unit.clone();
-	    unitClone.setQbQuestion(clone);
-	    unitsClone.add(unitClone);
-	}
-	return clone;
-    }
-
-    public void clearID() {
-	this.uid = null;
-	for (QbOption option : qbOptions) {
-	    option.uid = null;
-	}
-	for (QbQuestionUnit unit : units) {
-	    unit.uid = null;
-	}
-    }
-
-    public Long getUid() {
-	return uid;
-    }
-
-    public Integer getType() {
-	return type;
-    }
-
-    public void setType(Integer type) {
-	this.type = type;
-    }
-
-    public Integer getQuestionId() {
-	return questionId;
-    }
-
-    public void setQuestionId(Integer questionId) {
-	this.questionId = questionId;
-    }
-
-    public Integer getVersion() {
-	return version;
-    }
-
-    public void setVersion(Integer version) {
-	this.version = version;
-    }
-
-    public Date getCreateDate() {
-	return createDate;
-    }
-
-    public void setCreateDate(Date createDate) {
-	this.createDate = createDate;
-    }
-
-    public String getName() {
-	return name;
-    }
-
-    public void setName(String name) {
-	this.name = StringUtils.isBlank(name) ? null : name.trim();
-    }
-
-    public String getDescription() {
-	return description;
-    }
-
-    public void setDescription(String description) {
-	this.description = description;
-    }
-
-    public Integer getMaxMark() {
-	return maxMark;
-    }
-
-    public void setMaxMark(Integer maxMark) {
-	this.maxMark = maxMark;
-    }
-
-    public String getFeedback() {
-	return feedback;
-    }
-
-    public void setFeedback(String feedback) {
-	this.feedback = StringUtils.isBlank(feedback) ? null : feedback.trim();
-    }
-    
-
-    public float getPenaltyFactor() {
-	return penaltyFactor;
-    }
-
-    public void setPenaltyFactor(float penaltyFactor) {
-	this.penaltyFactor = penaltyFactor;
-    }
-
-    public boolean isAnswerRequired() {
-	return answerRequired;
-    }
-
-    public void setAnswerRequired(boolean answerRequired) {
-	this.answerRequired = answerRequired;
-    }
-
-    public boolean isMultipleAnswersAllowed() {
-	return multipleAnswersAllowed;
-    }
-
-    public void setMultipleAnswersAllowed(boolean multipleAnswersAllowed) {
-	this.multipleAnswersAllowed = multipleAnswersAllowed;
-    }
-
-    public boolean isIncorrectAnswerNullifiesMark() {
-	return incorrectAnswerNullifiesMark;
-    }
-
-    public void setIncorrectAnswerNullifiesMark(boolean incorrectAnswerNullifiesMark) {
-	this.incorrectAnswerNullifiesMark = incorrectAnswerNullifiesMark;
-    }
-
-    public String getFeedbackOnCorrect() {
-	return feedbackOnCorrect;
-    }
-
-    public void setFeedbackOnCorrect(String feedbackOnCorrect) {
-	this.feedbackOnCorrect = feedbackOnCorrect;
-    }
-
-    public String getFeedbackOnPartiallyCorrect() {
-	return feedbackOnPartiallyCorrect;
-    }
-
-    public void setFeedbackOnPartiallyCorrect(String feedbackOnPartiallyCorrect) {
-	this.feedbackOnPartiallyCorrect = feedbackOnPartiallyCorrect;
-    }
-
-    public String getFeedbackOnIncorrect() {
-	return feedbackOnIncorrect;
-    }
-
-    public void setFeedbackOnIncorrect(String feedbackOnIncorrect) {
-	this.feedbackOnIncorrect = feedbackOnIncorrect;
-    }
-
-    public boolean isShuffle() {
-	return shuffle;
-    }
-
-    public void setShuffle(boolean shuffle) {
-	this.shuffle = shuffle;
-    }
-
-    public boolean isCaseSensitive() {
-	return caseSensitive;
-    }
-
-    public void setCaseSensitive(boolean caseSensitive) {
-	this.caseSensitive = caseSensitive;
-    }
-
-    public boolean getCorrectAnswer() {
-	return correctAnswer;
-    }
-
-    public void setCorrectAnswer(boolean correctAnswer) {
-	this.correctAnswer = correctAnswer;
-    }
-
-    public boolean isAllowRichEditor() {
-	return allowRichEditor;
-    }
-
-    public void setAllowRichEditor(boolean allowRichEditor) {
-	this.allowRichEditor = allowRichEditor;
-    }
-
-    /**
-     * maxWordsLimit set in author. Used only for essay type of questions
-     */
-    public int getMaxWordsLimit() {
-	return maxWordsLimit;
-    }
-
-    /**
-     * @param maxWordsLimit
-     *            set in author. Used only for essay type of questions
-     */
-    public void setMaxWordsLimit(int maxWordsLimit) {
-	this.maxWordsLimit = maxWordsLimit;
-    }
-
-    /**
-     * minWordsLimit set in author. Used only for essay type of questions
-     */
-    public int getMinWordsLimit() {
-	return minWordsLimit;
-    }
-
-    /**
-     * @param minWordsLimit
-     *            set in author. Used only for essay type of questions
-     */
-    public void setMinWordsLimit(int minWordsLimit) {
-	this.minWordsLimit = minWordsLimit;
-    }
-
-    public boolean isHedgingJustificationEnabled() {
-	return hedgingJustificationEnabled;
-    }
-
-    public void setHedgingJustificationEnabled(boolean hedgingJustificationEnabled) {
-	this.hedgingJustificationEnabled = hedgingJustificationEnabled;
-    }
-
-    public boolean isPrefixAnswersWithLetters() {
-        return prefixAnswersWithLetters;
-    }
-
-    public void setPrefixAnswersWithLetters(boolean prefixAnswersWithLetters) {
-        this.prefixAnswersWithLetters = prefixAnswersWithLetters;
-    }
-
-    public List<QbOption> getQbOptions() {
-	return qbOptions;
-    }
-
-    public void setQbOptions(List<QbOption> options) {
-	this.qbOptions = options;
-    }
-    
-    public List<QbQuestionUnit> getUnits() {
-	return units;
-    }
-
-    public void setUnits(List<QbQuestionUnit> units) {
-	this.units = units;
-    }
+package org.lamsfoundation.lams.qb.model;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToMany;
+import javax.persistence.Table;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.hibernate.annotations.Fetch;
+import org.hibernate.annotations.FetchMode;
+import org.lamsfoundation.lams.outcome.Outcome;
+
+/**
+ * A question in Question Bank.
+ *
+ * @author Marcin Cieslak
+ */
+@Entity
+@Table(name = "lams_qb_question")
+public class QbQuestion implements Serializable, Cloneable {
+    private static final long serialVersionUID = -6287273838239262151L;
+
+    // questions can be of different type
+    // not all tools can produce/consume all question types
+    public static final int TYPE_MULTIPLE_CHOICE = 1;
+    public static final int TYPE_MATCHING_PAIRS = 2;
+    public static final int TYPE_SHORT_ANSWER = 3;
+    public static final int TYPE_NUMERICAL = 4;
+    public static final int TYPE_TRUE_FALSE = 5;
+    public static final int TYPE_ESSAY = 6;
+    public static final int TYPE_ORDERING = 7;
+    public static final int TYPE_MARK_HEDGING = 8;
+
+    // primary key
+    // another candidate is questionId + version, but single uid can be searched faster
+    @Id
+    @Column
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long uid;
+
+    // one of question types
+    @Column
+    private Integer type;
+
+    // "tracking ID" for a question
+    // multiple versions can share the same question ID so their stats are aggregated
+    @Column(name = "question_id")
+    private Integer questionId;
+
+    // the same question can have multiple versions
+    @Column
+    private Integer version = 1;
+
+    @Column(name = "create_date")
+    private Date createDate = new Date();
+
+    // text of the question
+    @Column
+    private String name;
+
+    @Column
+    private String description;
+
+    @Column(name = "max_mark")
+    private Integer maxMark;
+
+    @Column
+    private String feedback;
+
+    @Column(name = "penalty_factor")
+    private float penaltyFactor;
+
+    @Column(name = "answer_required")
+    private boolean answerRequired;
+
+    @Column(name = "multiple_answers_allowed")
+    private boolean multipleAnswersAllowed;
+
+    @Column(name = "incorrect_answer_nullifies_mark")
+    private boolean incorrectAnswerNullifiesMark;
+
+    @Column(name = "feedback_on_correct")
+    private String feedbackOnCorrect;
+
+    @Column(name = "feedback_on_partially_correct")
+    private String feedbackOnPartiallyCorrect;
+
+    @Column(name = "feedback_on_incorrect")
+    private String feedbackOnIncorrect;
+
+    // only one of shuffle and prefixAnswersWithLetters should be on. Both may be off
+    @Column
+    private boolean shuffle;
+
+    @Column(name = "prefix_answers_with_letters")
+    private boolean prefixAnswersWithLetters;
+
+    @Column(name = "case_sensitive")
+    private boolean caseSensitive;
+
+    @Column(name = "correct_answer")
+    private boolean correctAnswer;
+
+    @Column(name = "allow_rich_editor")
+    private boolean allowRichEditor;
+
+    // only for essay type of question
+    @Column(name = "max_words_limit")
+    private int maxWordsLimit;
+
+    // only for essay type of question
+    @Column(name = "min_words_limit")
+    private int minWordsLimit;
+
+    // only for hedging maxMark type of question
+    @Column(name = "hedging_justification_enabled")
+    private boolean hedgingJustificationEnabled;
+
+    @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
+    @Fetch(FetchMode.SUBSELECT)
+    private List<QbOption> qbOptions = new ArrayList<>();
+
+    @OneToMany(mappedBy = "qbQuestion", fetch = FetchType.EAGER, cascade = CascadeType.ALL, orphanRemoval = true)
+    @Fetch(FetchMode.SUBSELECT)
+    private List<QbQuestionUnit> units = new ArrayList<>();
+
+    // read-only collection of learning outcomes
+    @ManyToMany(fetch = FetchType.LAZY)
+    @Fetch(FetchMode.SUBSELECT)
+    @JoinTable(name = "lams_outcome_mapping", joinColumns = @JoinColumn(name = "qb_question_id", referencedColumnName = "question_id", updatable = false, insertable = false), inverseJoinColumns = @JoinColumn(name = "outcome_id"))
+    private List<Outcome> outcomes = new ArrayList<>();
+
+    // compares if current question data and the other one (probably modified with new data) are the same
+    // it detects if question is the same or should another question/version be created
+    public boolean isModified(QbQuestion modifiedQuestion) {
+	return !equals(modifiedQuestion);
+    }
+
+    // checks if important parts of another question are the same as current question's
+    @Override
+    public boolean equals(Object o) {
+	QbQuestion other = (QbQuestion) o;
+	// options are also checked if they are equal
+	return new EqualsBuilder().append(name, other.name).append(description, other.description)
+		.append(feedback, other.feedback).append(maxMark, other.maxMark)
+		.append(qbOptions.toArray(), other.getQbOptions().toArray())
+		.append(units.toArray(), other.getUnits().toArray()).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(name).append(description).append(feedback).append(maxMark).toHashCode();
+    }
+
+    @Override
+    public QbQuestion clone() {
+	QbQuestion clone = null;
+	try {
+	    clone = (QbQuestion) super.clone();
+	} catch (CloneNotSupportedException e) {
+	    // it should never happen
+	    e.printStackTrace();
+	}
+	// make a deep copy of options
+	List<QbOption> optionsClone = new ArrayList<>(qbOptions.size());
+	clone.setQbOptions(optionsClone);
+	for (QbOption option : qbOptions) {
+	    QbOption optionClone = option.clone();
+	    optionClone.setQbQuestion(clone);
+	    optionsClone.add(optionClone);
+	}
+	// make a deep copy of units
+	List<QbQuestionUnit> unitsClone = new ArrayList<>(units.size());
+	clone.setUnits(unitsClone);
+	for (QbQuestionUnit unit : units) {
+	    QbQuestionUnit unitClone = unit.clone();
+	    unitClone.setQbQuestion(clone);
+	    unitsClone.add(unitClone);
+	}
+	return clone;
+    }
+
+    public void clearID() {
+	this.uid = null;
+	for (QbOption option : qbOptions) {
+	    option.uid = null;
+	}
+	for (QbQuestionUnit unit : units) {
+	    unit.uid = null;
+	}
+    }
+
+    public Long getUid() {
+	return uid;
+    }
+
+    public Integer getType() {
+	return type;
+    }
+
+    public void setType(Integer type) {
+	this.type = type;
+    }
+
+    public Integer getQuestionId() {
+	return questionId;
+    }
+
+    public void setQuestionId(Integer questionId) {
+	this.questionId = questionId;
+    }
+
+    public Integer getVersion() {
+	return version;
+    }
+
+    public void setVersion(Integer version) {
+	this.version = version;
+    }
+
+    public Date getCreateDate() {
+	return createDate;
+    }
+
+    public void setCreateDate(Date createDate) {
+	this.createDate = createDate;
+    }
+
+    public String getName() {
+	return name;
+    }
+
+    public void setName(String name) {
+	this.name = StringUtils.isBlank(name) ? null : name.trim();
+    }
+
+    public String getDescription() {
+	return description;
+    }
+
+    public void setDescription(String description) {
+	this.description = description;
+    }
+
+    public Integer getMaxMark() {
+	return maxMark;
+    }
+
+    public void setMaxMark(Integer maxMark) {
+	this.maxMark = maxMark;
+    }
+
+    public String getFeedback() {
+	return feedback;
+    }
+
+    public void setFeedback(String feedback) {
+	this.feedback = StringUtils.isBlank(feedback) ? null : feedback.trim();
+    }
+
+    public float getPenaltyFactor() {
+	return penaltyFactor;
+    }
+
+    public void setPenaltyFactor(float penaltyFactor) {
+	this.penaltyFactor = penaltyFactor;
+    }
+
+    public boolean isAnswerRequired() {
+	return answerRequired;
+    }
+
+    public void setAnswerRequired(boolean answerRequired) {
+	this.answerRequired = answerRequired;
+    }
+
+    public boolean isMultipleAnswersAllowed() {
+	return multipleAnswersAllowed;
+    }
+
+    public void setMultipleAnswersAllowed(boolean multipleAnswersAllowed) {
+	this.multipleAnswersAllowed = multipleAnswersAllowed;
+    }
+
+    public boolean isIncorrectAnswerNullifiesMark() {
+	return incorrectAnswerNullifiesMark;
+    }
+
+    public void setIncorrectAnswerNullifiesMark(boolean incorrectAnswerNullifiesMark) {
+	this.incorrectAnswerNullifiesMark = incorrectAnswerNullifiesMark;
+    }
+
+    public String getFeedbackOnCorrect() {
+	return feedbackOnCorrect;
+    }
+
+    public void setFeedbackOnCorrect(String feedbackOnCorrect) {
+	this.feedbackOnCorrect = feedbackOnCorrect;
+    }
+
+    public String getFeedbackOnPartiallyCorrect() {
+	return feedbackOnPartiallyCorrect;
+    }
+
+    public void setFeedbackOnPartiallyCorrect(String feedbackOnPartiallyCorrect) {
+	this.feedbackOnPartiallyCorrect = feedbackOnPartiallyCorrect;
+    }
+
+    public String getFeedbackOnIncorrect() {
+	return feedbackOnIncorrect;
+    }
+
+    public void setFeedbackOnIncorrect(String feedbackOnIncorrect) {
+	this.feedbackOnIncorrect = feedbackOnIncorrect;
+    }
+
+    public boolean isShuffle() {
+	return shuffle;
+    }
+
+    public void setShuffle(boolean shuffle) {
+	this.shuffle = shuffle;
+    }
+
+    public boolean isCaseSensitive() {
+	return caseSensitive;
+    }
+
+    public void setCaseSensitive(boolean caseSensitive) {
+	this.caseSensitive = caseSensitive;
+    }
+
+    public boolean getCorrectAnswer() {
+	return correctAnswer;
+    }
+
+    public void setCorrectAnswer(boolean correctAnswer) {
+	this.correctAnswer = correctAnswer;
+    }
+
+    public boolean isAllowRichEditor() {
+	return allowRichEditor;
+    }
+
+    public void setAllowRichEditor(boolean allowRichEditor) {
+	this.allowRichEditor = allowRichEditor;
+    }
+
+    /**
+     * maxWordsLimit set in author. Used only for essay type of questions
+     */
+    public int getMaxWordsLimit() {
+	return maxWordsLimit;
+    }
+
+    /**
+     * @param maxWordsLimit
+     *            set in author. Used only for essay type of questions
+     */
+    public void setMaxWordsLimit(int maxWordsLimit) {
+	this.maxWordsLimit = maxWordsLimit;
+    }
+
+    /**
+     * minWordsLimit set in author. Used only for essay type of questions
+     */
+    public int getMinWordsLimit() {
+	return minWordsLimit;
+    }
+
+    /**
+     * @param minWordsLimit
+     *            set in author. Used only for essay type of questions
+     */
+    public void setMinWordsLimit(int minWordsLimit) {
+	this.minWordsLimit = minWordsLimit;
+    }
+
+    public boolean isHedgingJustificationEnabled() {
+	return hedgingJustificationEnabled;
+    }
+
+    public void setHedgingJustificationEnabled(boolean hedgingJustificationEnabled) {
+	this.hedgingJustificationEnabled = hedgingJustificationEnabled;
+    }
+
+    public boolean isPrefixAnswersWithLetters() {
+	return prefixAnswersWithLetters;
+    }
+
+    public void setPrefixAnswersWithLetters(boolean prefixAnswersWithLetters) {
+	this.prefixAnswersWithLetters = prefixAnswersWithLetters;
+    }
+
+    public List<QbOption> getQbOptions() {
+	return qbOptions;
+    }
+
+    public void setQbOptions(List<QbOption> options) {
+	this.qbOptions = options;
+    }
+
+    public List<QbQuestionUnit> getUnits() {
+	return units;
+    }
+
+    public void setUnits(List<QbQuestionUnit> units) {
+	this.units = units;
+    }
 }
\ No newline at end of file
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r66cee69cb7746aa2567532847ae9743a82f8f24c -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 66cee69cb7746aa2567532847ae9743a82f8f24c)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -203,7 +203,7 @@
 	    }
 
 	    List<OutcomeMapping> outcomeMappings = outcomeService.getOutcomeMappings(null, activity.getToolContentId(),
-		    null);
+		    null, null);
 	    if (!outcomeMappings.isEmpty()) {
 		ArrayNode outcomeMappingsJSON = JsonNodeFactory.instance.arrayNode();
 		for (OutcomeMapping outcomeMapping : outcomeMappings) {
Index: lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -1,358 +1,359 @@
-appName = assessment 
-#language code: en 
-#locale code: AU 
-
- # Exported from the LAMS Community by Ernie Ghiglione on Fri Dec 28 09:17:35 CST 2018 
- 
-#=================== labels for Assessment =================# 
-
-appName  =Assessment Tool
-activity.description  =Tool for assessing learners
-activity.helptext  =Create questions to assess learners.
-tool.display.name  =Assessment Tool
-tool.description  =Tool for assessing learners.
-label.authoring.heading  =Assessment Authoring
-label.author.title  =Assessment
-label.authoring.heading.basic  =Basic
-label.authoring.heading.basic.desc  =Basic input information for assessment tool
-label.authoring.heading.advance.desc  =Please input advance options for assessment tool
-label.authoring.basic.title  =Title
-label.authoring.basic.question.name  =Question name
-label.authoring.basic.question.text  =Question text
-label.authoring.basic.default.question.grade  =Default question grade
-label.authoring.basic.penalty.factor  =Penalty factor
-label.authoring.basic.general.feedback  =General feedback
-label.authoring.basic.shuffle.the.choices  =Shuffle answers?
-label.authoring.basic.add.question  =Add question
-label.authoring.basic.question.list.title  =Question list
-label.authoring.basic.list.header.type  =Type
-label.authoring.basic.list.header.question  =Question
-label.authoring.basic.type.multiple.choice  =Multiple choice
-label.authoring.basic.type.matching.pairs  =Matching pairs
-label.authoring.basic.type.short.answer  =Short answer
-label.authoring.basic.type.numerical  =Numerical
-label.authoring.basic.type.true.false  =True/False
-label.authoring.basic.type.essay  =Essay
-label.authoring.basic.type.ordering  =Ordering
-label.authoring.basic.edit  =Edit
-label.authoring.basic.delete  =Delete
-label.authoring.basic.down  =Move down
-label.authoring.basic.up  =Move Up
-label.authoring.basic.option.answer  =Answer
-label.authoring.basic.option.question  =Question
-label.authoring.basic.option.grade  =Grade
-label.authoring.basic.option.feedback  =Feedback
-label.authoring.basic.option.accepted.error  =Accepted error
-label.authoring.basic.unit.unit  =Unit
-label.authoring.basic.unit.multiplier  =Multiplier
-label.authoring.basic.none  =None
-label.authoring.choice.add.multiple.choice  =Add multiple choice
-label.authoring.choice.field.required  =This field is required.
-label.authoring.choice.enter.integer  =Please enter an integer.
-label.authoring.choice.enter.float  =Please enter a floating point number.
-label.authoring.choice.one.multiple.answers  =One or multiple answers?
-label.authoring.choice.one.answer  =One answer only
-label.authoring.choice.multiple.answers  =Multiple answers allowed
-label.authoring.choice.overall.feedback  =Overall feedback
-label.authoring.choice.feedback.on.correct  =For any correct response
-label.authoring.choice.feedback.on.partially.correct  =For any partially correct response
-label.authoring.choice.feedback.on.incorrect  =For any incorrect response
-label.authoring.choice.add.option  =Add another answer
-label.authoring.matching.pairs.add.matching.pairs  =Add question
-label.authoring.matching.pairs.matching.pairs  =Matching pairs
-label.authoring.matching.pairs.error.one.matching.pair  =You should provide at least 1 matching pair.
-label.authoring.matching.pairs.add.matching.pair  =Add another
-label.authoring.short.answer.no.case.unimportant  =No, case is unimportant
-label.authoring.short.answer.yes.case.must.match  =Yes, case must match
-label.authoring.short.answer.case.sensitivity  =Case sensitivity
-label.authoring.short.answer.answers  =Answers
-label.authoring.short.answer.add.answer  =Add another answer
-label.authoring.short.answer.add.short.answer  =Add question
-label.authoring.true.false.question  =True/False question
-label.authoring.true.false.correct.answer  =Correct answer
-label.authoring.true.false.false  =False
-label.authoring.true.false.true  =True
-label.authoring.true.false.feedback.on.true  =Feedback for the response 'True'.
-label.authoring.true.false.feedback.on.false  =Feedback for the response 'False'.
-label.authoring.true.false.add.true.false  =Add question
-label.authoring.numerical.question  =Numerical question
-label.authoring.numerical.answers  =Answers
-label.authoring.numerical.units  =Units
-label.authoring.numerical.error.answer  =You should provide at least one possible answer.
-label.authoring.numerical.add.answer  =Add another answer
-label.authoring.numerical.add.numerical  =Add question
-label.authoring.numerical.add.unit  =Add another unit
-label.authoring.essay.add.essay  =Add question
-label.authoring.ordering.add.ordering  =Add question
-label.authoring.advance.allow.students.overall.feedback  =Display overall feedback at the end of each attempt
-label.authoring.advance.time.limit  =Time limit (minutes)
-label.authoring.advance.questions.per.page  =Questions per page
-label.authoring.advance.all.in.one.page  =All in one page
-label.authoring.advance.shuffle.questions  =Shuffle questions
-label.authoring.advance.attempts.allowed  =Attempts allowed
-label.authoring.advance.unlimited  =Unlimited
-label.authoring.advance.allow.students.question.feedback  =Allow learners to see question feedback after each question
-label.authoring.advance.allow.students.right.wrong.answers  =Allow learners to see right/wrong answers
-label.authoring.advance.allow.students.grades  =Allow learners to see grades at the end of each attempt
-label.authoring.advance.allow.students.history.responses  =Allow learners to see history of responses at the end of each attempt
-label.authoring.advance.overall.feedback  =Overall feedback
-label.authoring.advance.grade.boundary  =Grade boundary
-label.authoring.advance.feedback  =Feedback
-label.authoring.advance.add.feedback.field  =Add feedback
-label.authoring.cancel.button  =Cancel
-label.authoring.basic.answer.options  =Answer options
-label.authoring.basic.instruction  =Instructions
-error.default.grade.wrong.format  =Default question grade should be of numeric format
-error.penalty.factor.wrong.format  =Penalty factor should be of float format
-error.question.name.blank  =Question name can not be blank.
-error.question.text.blank  =Question text can not be blank.
-error.msg.default.content.not.find  =Could not retrieve default content record for this tool.
-error.monitoring.export.excel  =Export assessment report failed because of this reason: {0}
-authoring.msg.cancel.save  =Do you want to close this window without saving?
-authoring.msg.one.question.to.be.saved  =There must be at least one question to be saved.
-label.learning.page  =Page:
-label.learning.title  =Assessment
-label.learning.choose.one.answer  =Choose one of the following answers.
-label.learning.choose.at.least.one.answer  =Choose at least one answer.
-label.learning.matching.pairs.pick.up  =Pick up the corresponding answers
-label.learning.matching.pairs.choose  =Choose
-label.learning.short.answer.answer  =Answer:
-label.learning.true.false.true  =True
-label.learning.true.false.false  =False
-label.learning.ordering.sort.answers  =Sort answers in the right order
-label.learning.marks  =Marks for this submission: {0}/{1}.
-label.learning.penalty  =This submission attracted a penalty of {0}.
-label.learning.finish.test  =Finish
-label.learning.submit.all  =Submit all
-label.learning.next.activity  =Next Activity
-label.learning.resubmit  =Resubmit
-label.learning.summary.started.on  =Started on
-label.learning.summary.completed.on  =Completed on
-label.learning.summary.time.taken  =Time taken (minutes)
-label.learning.summary.hours  =hour(s)
-label.learning.summary.minutes  =minutes
-label.learning.summary.grade  =Grade
-label.learning.summary.out.of.maximum  =out of a maximum of
-label.learning.summary.feedback  =Feedback
-label.learning.question.summary.history.responces  =History of responses:
-label.learning.question.summary.response  =Response
-label.learning.question.summary.grade  =Grade
-label.learning.countdown.time.left  =Time left
-label.learning.blockui.time.is.over  =Time is over. Processing your answers...
-label.learning.blockui.are.you.ready  =You are going to participate in activity that has time limitation. Are you ready to start?
-monitoring.tab.summary  =Summary
-monitoring.tab.statistics  =Stats
-monitoring.tab.edit.activity  =Edit Activity
-monitoring.label.group  =Group
-monitoring.label.user.name  =Name
-label.monitoring.edit.activity.edit  =Edit
-label.monitoring.summary.summary  =Summary
-label.monitoring.summary.double.click  =Double click on learner's name to get full individual report.
-label.monitoring.summary.report.by.question  =Report by question
-label.monitoring.summary.export.summary  =Export summary
-label.monitoring.summary.results.question  =Detailed question results
-label.monitoring.summary.choose  =Choose...
-label.monitoring.summary.user.name  =Name
-label.monitoring.summary.total  =Total
-label.monitoring.summary.learner.summary  =Learner summary
-label.monitoring.user.summary.history.responses  =History of responses
-label.monitoring.user.summary.user.name  =Username
-label.monitoring.user.summary.number.attempts  =Number of attempts
-label.monitoring.user.summary.time.last.attempt  =Time in the last attempt
-label.monitoring.user.summary.last.attempt.grade  =Last attempt grade
-label.monitoring.user.summary.attempt  =Attempt
-label.monitoring.user.summary.time  =Time
-label.monitoring.user.summary.response  =Response
-label.monitoring.user.summary.grade  =Grade
-label.monitoring.user.summary.title  =Title:
-label.monitoring.user.summary.question  =Question:
-label.monitoring.user.summary.ok  =Ok
-label.monitoring.question.summary.history.responses  =Responses for the question
-label.monitoring.question.summary.title  =Title
-label.monitoring.question.summary.question  =Question
-label.monitoring.question.summary.default.mark  =Default mark
-label.monitoring.question.summary.penalty  =Penalty
-label.monitoring.question.summary.average.mark  =Average mark
-label.monitoring.question.summary.group  =Group:
-label.monitoring.question.summary.ok  =Ok
-output.desc.learner.total.score  =Last total score
-output.desc.learner.time.taken  =Time taken
-output.desc.learner.number.of.attempts  =Number of attempts
-output.user.score.for.question  =Score for the question:
-error.form.validation.error  =You have 1 error in a form. It has been highlighted
-error.form.validation.errors  =You have {0} errors in a form. They have been highlighted
-error.form.validation.hundred.score  =One of the answers should have a grade of 100% so it is possible to get full marks for this question.
-error.form.validation.positive.accepted.errors  =All the accepted errors should be positive.
-message.monitoring.summary.no.session  =No learners yet
-label.cancel  =Cancel
-define.later.message  =Please wait for the instructor to complete the contents of this activity.
-button.try.again  =Try again
-activity.title  =Assessment
-label.authoring.save.button  =Save
-label.authoring.heading.advance  =Advanced
-label.down  =Move down
-label.finished  =Next Activity
-label.finish  =Finished
-label.on  =On
-label.off  =Off
-monitor.summary.th.advancedSettings  =Advanced settings
-label.authoring.advanced.notify.on.attempt.completion  =Notify instructor when learner completes attempt
-event.learner.completes.attempt.subject  =LAMS: Learner completed attempt in Assessment tool
-event.learner.completes.attempt.body  =The learner {0} completed attempt in Assessment tool.\n\nThis message was send automatically, following tool''''s advanced settings.
-message.alertContentEdit  =Note: One or more learners have accessed this activity and it cannot longer be modified.
-warning.msg.authoring.do.you.want.to.delete  =Do you really want to delete this question?
-label.export.exported.on  =Exported on:
-label.export.question.summary  =Question summary
-label.export.user.summary  =Learner summary
-label.export.date.attempted  =Date attempted
-label.export.mark  =Mark
-label.export.time.taken  =Time taken from activity start (seconds)
-label.export.average  =Average
-label.export.summary.by.user  =Summary by learner
-lable.export.summary.by.question  =Summary by question
-label.export.user.id  =Username
-label.authoring.basic.allow.learners.rich.editor  =Allow learners to use rich text editor
-label.authoring.advance.allow.students.right.answers  =Indicate choice(s) that have been answered correctly.
-label.authoring.advance.allow.students.wrong.answers  =Indicate choice(s) that have been answered incorrectly.
-monitor.summary.date.restriction  =Deadline
-monitor.summary.when.date.restriction.is.set  =Learners will not be able to take this assessment after the set date and time.
-monitor.summary.after.date  =Date/time:
-monitor.summary.set.restriction  =Set restriction
-monitor.summary.unset.restriction  =Remove restriction
-authoring.info.teacher.set.restriction  =For this activity, the instructor fixed a deadline until {0}. After this time this activity will not be available.
-monitor.summary.notification  =Notification
-monitor.summary.date.restriction.set  =Deadline has been set
-monitor.summary.date.restriction.removed  =Deadline has been removed
-label.authoring.advance.passing.mark  =Assessment passing mark
-label.authoring.advance.choose.restriction  =Choose restriction:
-label.authoring.advance.passing.mark.none  =None
-label.learning.havent.reached.passing.mark  =Sorry, you haven''t scored {0} required to pass the activity. Please, try one more time.
-label.authoring.basic.add.question.to.pool  =Add question
-label.authoring.basic.add.question.to.list  =Add question to list
-label.authoring.basic.question.bank.title  =Question bank
-label.authoring.basic.list.header.mark  =Mark
-label.authoring.basic.type.random.question  =Random question
-label.authoring.basic.select.random.question  =Random question from pool
-label.authoring.basic.random.question  =Question
-label.authoring.basic.warning.too.many.questions  =Too many questions in a list. Please, remove some of them.
-authoring.import.result  =Import tool content result
-authoring.title.import  =Import questions
-authoring.import.instruction  =Please choose questions to import.
-button.select.importfile  =Select file to import
-msg.import.file.format  =The import file must be .xml file exported from assessment tool and not exceed size of {0}
-label.import.file  =Import xml file
-button.import  =Import
-label.authoring.basic.import.questions  =Import
-label.authoring.basic.export.questions  =Export
-label.authoring.advance.display.summary  =Display all questions and answers once the learner finishes.
-label.authoring.basic.import.qti  =Import IMS QTI
-advanced.reflectOnActivity  =Add a notebook at end of Assessment with the following instructions:
-monitor.summary.td.addNotebook  =Add a notebook at end of Assessment
-monitor.summary.td.notebookInstructions  =Notebook instructions
-label.export.reflection  =Notebook Entries
-label.continue  =Continue
-label.edit  =Edit
-label.submit  =Finish
-label.authoring.advance.numbered.questions  =Enable questions' numbering
-label.learning.draft.autosaved  =Draft autosaved
-label.waiting.for.leader  =Please, wait while somebody will become a group leader
-label.users.from.group  =Other learners participating in current group:
-label.use.select.leader.tool.output  =Use leaders from Select Leader tool
-label.group.leader  =Group leader: {0}
-label.refresh  =Refresh
-label.display.name.column  =Display name column
-label.authoring.answer.required  =Answer required?
-warn.answers.required  =Please, answer highlighted questions in order to continue.
-label.authoring.basic.export.qti  =Export IMS QTI
-label.monitoring.heading  =Assessment Monitoring
-label.maximum.number.words  =Maximum number of words
-label.minimum.number.words  =Minimum number of words
-label.info.maximum.number.words  =This answer must have a maximum of {0} words.
-label.info.minimum.number.words  =This answer must have a minimum of {0} words.
-label.info.max.and.min.number.words  =This answer must have a minimal of {0} and maximum of {1} words.
-warn.answers.word.requirements.limit  =In order to continue, please note the word limit restrictions.
-label.words  =Words:
-message.no.reflection.available  =No notebook entry has been added.
-label.authoring.basic.type.mark.hedging  =Mark hedging
-label.option.correct  =Correct?
-label.assign.hedging.mark  =Assign marks to answers. Max possible mark: {0}
-label.learning.submit  =Submit
-warn.mark.hedging.wrong.total  =In order to continue, all mark hedging questions should have all available marks assigned.
-label.incorrect.answer.nullifies.mark  =Assigns full mark only when the correct answers are selected.
-label.export.summary  =Summary
-label.justify.hedging.marks  =Please, justify your mark allocation.
-label.select.leader  =Leader selection
-label.question.options  =Question options
-label.activity.completion  =End of activity
-label.notifications  =Notifications
-label.ask.for.hedging.justification  =Ask for hedging justification?
-label.number.learners.per.session  =Number of learners per session
-label.tool.output  =Tool Output
-output.desc.best.score  =Best score
-label.tool.output.has.been.changed  =Tool Output has been changed
-output.desc.first.score  =First score
-output.desc.average.score  =Average score
-label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until he/she commences it.
-label.waiting.for.leader.finish  =Time limit set by teacher is over. Please wait until a group leader submits all answers.
-warn.mark.hedging.wrong.justification  =Justification cannot be left blank
-error.import.file.format  =The import file is not an .xml file.
-label.file  =File
-errors.maxfilesize  =File exceeds maximum file size {0}
-label.summary.downloaded  =Summary downloaded
-label.not.answered  =Not Answered
-label.other  =Other
-label.graph.help  =In the graph(s) below, click on a bar in the graph and then use your mouse wheel to zoom in and out of the graph. Once you zoom in, the grey selection in the bottom graph can be dragged left or right to show a different set of marks.
-label.lowest.mark  =Lowest mark:
-label.highest.mark  =Highest mark:
-label.number.learners  =Number of learners
-label.percentage  =Percentage
-label.operation.failed  =Operation failed.
-label.number.groups.finished  =Number of groups finished
-label.marks  =Marks
-label.number.learners.in.mark.range  =Number of learners in mark range
-label.number.groups.in.mark.range  =Number of groups in mark range
-label.average.mark  =Average mark
-label.error  =Error
-error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
-label.ok  =OK
-message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that when a student has already answer, the marks will be recalculated based on the changes.
-label.enable.confidence.levels  =Enable confidence level
-label.what.is.your.confidence.level  =How confident are you of your answer?
-label.confidence  =Confidence
-label.no.question.references  =No questions have been added to the question list. Do you still want to proceed with no questions?
-label.hide.name.column  =Hide name column
-label.ae.questions.marks  =AE Questions & Marks
-label.ira.questions.marks  =iRA Questions & Marks
-label.attendance  =Attendance
-label.show.students.choices  =Show students' choices
-label.hide.students.choices  =Hide students' choices
-label.print  =Print
-label.excel.export  =Excel export
-label.teams  =Teams
-label.no.questions.in.question.bank  =No questions have been added to the question list. Do you still want to proceed with no questions?
-label.authoring.advance.disclose.answers  =Disclose learner's and other groups' answers in monitor
-label.learning.summary.other.team.answers  =Other teams' answers
-label.learning.summary.selected.by  =Selected by:
-label.disclose.correct.answers  =Disclose correct answers
-label.disclose.groups.answers  =Disclose groups' answers
-label.disclose.all.correct.answers  =Disclose all correct answers
-label.disclose.all.groups.answers  =Disclose all groups' answers
-label.prefix.sequential.letters.for.each.answer  =Prefix sequential letters for each answer
-label.edit.in.monitor.warning  =Attention: while you edit this assessment students don't have access to it. You must save your changes so students can re-attempt this assessment again.
-outcome.authoring.title  =Learning outcomes
-outcome.authoring.input  =Search and select by outcome name or code
-outcome.authoring.existing  =Added outcomes
-outcome.authoring.existing.none  =none
-authoring.fla.branch.mapping.ordered.asc  =Start with branches mapped to highest ordered answers
-warn.tool.output.change.none  =This will delete all existing marks for this activity. Are you sure?
-output.desc.none  =No score
-output.ordered.answers.for.question  =Ordered answers for the question:
-label.answer.required  =Answer required
-outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
-label.qb.stats =Question indexes
-label.qb.participant.count =Test participant count
-label.qb.difficulty.index =Difficulty index
-label.qb.discrimination.index =Discrimination index
-label.qb.point.biserial =Point biserial
-
-#======= End labels: Exported 337 labels for en AU =====
+appName = assessment 
+#language code: en 
+#locale code: AU 
+
+ # Exported from the LAMS Community by Ernie Ghiglione on Fri Dec 28 09:17:35 CST 2018 
+ 
+#=================== labels for Assessment =================# 
+
+appName  =Assessment Tool
+activity.description  =Tool for assessing learners
+activity.helptext  =Create questions to assess learners.
+tool.display.name  =Assessment Tool
+tool.description  =Tool for assessing learners.
+label.authoring.heading  =Assessment Authoring
+label.author.title  =Assessment
+label.authoring.heading.basic  =Basic
+label.authoring.heading.basic.desc  =Basic input information for assessment tool
+label.authoring.heading.advance.desc  =Please input advance options for assessment tool
+label.authoring.basic.title  =Title
+label.authoring.basic.question.name  =Question name
+label.authoring.basic.question.text  =Question text
+label.authoring.basic.default.question.grade  =Default question grade
+label.authoring.basic.penalty.factor  =Penalty factor
+label.authoring.basic.general.feedback  =General feedback
+label.authoring.basic.shuffle.the.choices  =Shuffle answers?
+label.authoring.basic.add.question  =Add question
+label.authoring.basic.question.list.title  =Question list
+label.authoring.basic.list.header.type  =Type
+label.authoring.basic.list.header.question  =Question
+label.authoring.basic.type.multiple.choice  =Multiple choice
+label.authoring.basic.type.matching.pairs  =Matching pairs
+label.authoring.basic.type.short.answer  =Short answer
+label.authoring.basic.type.numerical  =Numerical
+label.authoring.basic.type.true.false  =True/False
+label.authoring.basic.type.essay  =Essay
+label.authoring.basic.type.ordering  =Ordering
+label.authoring.basic.edit  =Edit
+label.authoring.basic.delete  =Delete
+label.authoring.basic.down  =Move down
+label.authoring.basic.up  =Move Up
+label.authoring.basic.option.answer  =Answer
+label.authoring.basic.option.question  =Question
+label.authoring.basic.option.grade  =Grade
+label.authoring.basic.option.feedback  =Feedback
+label.authoring.basic.option.accepted.error  =Accepted error
+label.authoring.basic.unit.unit  =Unit
+label.authoring.basic.unit.multiplier  =Multiplier
+label.authoring.basic.none  =None
+label.authoring.choice.add.multiple.choice  =Add multiple choice
+label.authoring.choice.field.required  =This field is required.
+label.authoring.choice.enter.integer  =Please enter an integer.
+label.authoring.choice.enter.float  =Please enter a floating point number.
+label.authoring.choice.one.multiple.answers  =One or multiple answers?
+label.authoring.choice.one.answer  =One answer only
+label.authoring.choice.multiple.answers  =Multiple answers allowed
+label.authoring.choice.overall.feedback  =Overall feedback
+label.authoring.choice.feedback.on.correct  =For any correct response
+label.authoring.choice.feedback.on.partially.correct  =For any partially correct response
+label.authoring.choice.feedback.on.incorrect  =For any incorrect response
+label.authoring.choice.add.option  =Add another answer
+label.authoring.matching.pairs.add.matching.pairs  =Add question
+label.authoring.matching.pairs.matching.pairs  =Matching pairs
+label.authoring.matching.pairs.error.one.matching.pair  =You should provide at least 1 matching pair.
+label.authoring.matching.pairs.add.matching.pair  =Add another
+label.authoring.short.answer.no.case.unimportant  =No, case is unimportant
+label.authoring.short.answer.yes.case.must.match  =Yes, case must match
+label.authoring.short.answer.case.sensitivity  =Case sensitivity
+label.authoring.short.answer.answers  =Answers
+label.authoring.short.answer.add.answer  =Add another answer
+label.authoring.short.answer.add.short.answer  =Add question
+label.authoring.true.false.question  =True/False question
+label.authoring.true.false.correct.answer  =Correct answer
+label.authoring.true.false.false  =False
+label.authoring.true.false.true  =True
+label.authoring.true.false.feedback.on.true  =Feedback for the response 'True'.
+label.authoring.true.false.feedback.on.false  =Feedback for the response 'False'.
+label.authoring.true.false.add.true.false  =Add question
+label.authoring.numerical.question  =Numerical question
+label.authoring.numerical.answers  =Answers
+label.authoring.numerical.units  =Units
+label.authoring.numerical.error.answer  =You should provide at least one possible answer.
+label.authoring.numerical.add.answer  =Add another answer
+label.authoring.numerical.add.numerical  =Add question
+label.authoring.numerical.add.unit  =Add another unit
+label.authoring.essay.add.essay  =Add question
+label.authoring.ordering.add.ordering  =Add question
+label.authoring.advance.allow.students.overall.feedback  =Display overall feedback at the end of each attempt
+label.authoring.advance.time.limit  =Time limit (minutes)
+label.authoring.advance.questions.per.page  =Questions per page
+label.authoring.advance.all.in.one.page  =All in one page
+label.authoring.advance.shuffle.questions  =Shuffle questions
+label.authoring.advance.attempts.allowed  =Attempts allowed
+label.authoring.advance.unlimited  =Unlimited
+label.authoring.advance.allow.students.question.feedback  =Allow learners to see question feedback after each question
+label.authoring.advance.allow.students.right.wrong.answers  =Allow learners to see right/wrong answers
+label.authoring.advance.allow.students.grades  =Allow learners to see grades at the end of each attempt
+label.authoring.advance.allow.students.history.responses  =Allow learners to see history of responses at the end of each attempt
+label.authoring.advance.overall.feedback  =Overall feedback
+label.authoring.advance.grade.boundary  =Grade boundary
+label.authoring.advance.feedback  =Feedback
+label.authoring.advance.add.feedback.field  =Add feedback
+label.authoring.cancel.button  =Cancel
+label.authoring.basic.answer.options  =Answer options
+label.authoring.basic.instruction  =Instructions
+error.default.grade.wrong.format  =Default question grade should be of numeric format
+error.penalty.factor.wrong.format  =Penalty factor should be of float format
+error.question.name.blank  =Question name can not be blank.
+error.question.text.blank  =Question text can not be blank.
+error.msg.default.content.not.find  =Could not retrieve default content record for this tool.
+error.monitoring.export.excel  =Export assessment report failed because of this reason: {0}
+authoring.msg.cancel.save  =Do you want to close this window without saving?
+authoring.msg.one.question.to.be.saved  =There must be at least one question to be saved.
+label.learning.page  =Page:
+label.learning.title  =Assessment
+label.learning.choose.one.answer  =Choose one of the following answers.
+label.learning.choose.at.least.one.answer  =Choose at least one answer.
+label.learning.matching.pairs.pick.up  =Pick up the corresponding answers
+label.learning.matching.pairs.choose  =Choose
+label.learning.short.answer.answer  =Answer:
+label.learning.true.false.true  =True
+label.learning.true.false.false  =False
+label.learning.ordering.sort.answers  =Sort answers in the right order
+label.learning.marks  =Marks for this submission: {0}/{1}.
+label.learning.penalty  =This submission attracted a penalty of {0}.
+label.learning.finish.test  =Finish
+label.learning.submit.all  =Submit all
+label.learning.next.activity  =Next Activity
+label.learning.resubmit  =Resubmit
+label.learning.summary.started.on  =Started on
+label.learning.summary.completed.on  =Completed on
+label.learning.summary.time.taken  =Time taken (minutes)
+label.learning.summary.hours  =hour(s)
+label.learning.summary.minutes  =minutes
+label.learning.summary.grade  =Grade
+label.learning.summary.out.of.maximum  =out of a maximum of
+label.learning.summary.feedback  =Feedback
+label.learning.question.summary.history.responces  =History of responses:
+label.learning.question.summary.response  =Response
+label.learning.question.summary.grade  =Grade
+label.learning.countdown.time.left  =Time left
+label.learning.blockui.time.is.over  =Time is over. Processing your answers...
+label.learning.blockui.are.you.ready  =You are going to participate in activity that has time limitation. Are you ready to start?
+monitoring.tab.summary  =Summary
+monitoring.tab.statistics  =Stats
+monitoring.tab.edit.activity  =Edit Activity
+monitoring.label.group  =Group
+monitoring.label.user.name  =Name
+label.monitoring.edit.activity.edit  =Edit
+label.monitoring.summary.summary  =Summary
+label.monitoring.summary.double.click  =Double click on learner's name to get full individual report.
+label.monitoring.summary.report.by.question  =Report by question
+label.monitoring.summary.export.summary  =Export summary
+label.monitoring.summary.results.question  =Detailed question results
+label.monitoring.summary.choose  =Choose...
+label.monitoring.summary.user.name  =Name
+label.monitoring.summary.total  =Total
+label.monitoring.summary.learner.summary  =Learner summary
+label.monitoring.user.summary.history.responses  =History of responses
+label.monitoring.user.summary.user.name  =Username
+label.monitoring.user.summary.number.attempts  =Number of attempts
+label.monitoring.user.summary.time.last.attempt  =Time in the last attempt
+label.monitoring.user.summary.last.attempt.grade  =Last attempt grade
+label.monitoring.user.summary.attempt  =Attempt
+label.monitoring.user.summary.time  =Time
+label.monitoring.user.summary.response  =Response
+label.monitoring.user.summary.grade  =Grade
+label.monitoring.user.summary.title  =Title:
+label.monitoring.user.summary.question  =Question:
+label.monitoring.user.summary.ok  =Ok
+label.monitoring.question.summary.history.responses  =Responses for the question
+label.monitoring.question.summary.title  =Title
+label.monitoring.question.summary.question  =Question
+label.monitoring.question.summary.default.mark  =Default mark
+label.monitoring.question.summary.penalty  =Penalty
+label.monitoring.question.summary.average.mark  =Average mark
+label.monitoring.question.summary.group  =Group:
+label.monitoring.question.summary.ok  =Ok
+output.desc.learner.total.score  =Last total score
+output.desc.learner.time.taken  =Time taken
+output.desc.learner.number.of.attempts  =Number of attempts
+output.user.score.for.question  =Score for the question:
+error.form.validation.error  =You have 1 error in a form. It has been highlighted
+error.form.validation.errors  =You have {0} errors in a form. They have been highlighted
+error.form.validation.hundred.score  =One of the answers should have a grade of 100% so it is possible to get full marks for this question.
+error.form.validation.positive.accepted.errors  =All the accepted errors should be positive.
+message.monitoring.summary.no.session  =No learners yet
+label.cancel  =Cancel
+define.later.message  =Please wait for the instructor to complete the contents of this activity.
+button.try.again  =Try again
+activity.title  =Assessment
+label.authoring.save.button  =Save
+label.authoring.heading.advance  =Advanced
+label.down  =Move down
+label.finished  =Next Activity
+label.finish  =Finished
+label.on  =On
+label.off  =Off
+monitor.summary.th.advancedSettings  =Advanced settings
+label.authoring.advanced.notify.on.attempt.completion  =Notify instructor when learner completes attempt
+event.learner.completes.attempt.subject  =LAMS: Learner completed attempt in Assessment tool
+event.learner.completes.attempt.body  =The learner {0} completed attempt in Assessment tool.\n\nThis message was send automatically, following tool''''s advanced settings.
+message.alertContentEdit  =Note: One or more learners have accessed this activity and it cannot longer be modified.
+warning.msg.authoring.do.you.want.to.delete  =Do you really want to delete this question?
+label.export.exported.on  =Exported on:
+label.export.question.summary  =Question summary
+label.export.user.summary  =Learner summary
+label.export.date.attempted  =Date attempted
+label.export.mark  =Mark
+label.export.time.taken  =Time taken from activity start (seconds)
+label.export.average  =Average
+label.export.summary.by.user  =Summary by learner
+lable.export.summary.by.question  =Summary by question
+label.export.user.id  =Username
+label.authoring.basic.allow.learners.rich.editor  =Allow learners to use rich text editor
+label.authoring.advance.allow.students.right.answers  =Indicate choice(s) that have been answered correctly.
+label.authoring.advance.allow.students.wrong.answers  =Indicate choice(s) that have been answered incorrectly.
+monitor.summary.date.restriction  =Deadline
+monitor.summary.when.date.restriction.is.set  =Learners will not be able to take this assessment after the set date and time.
+monitor.summary.after.date  =Date/time:
+monitor.summary.set.restriction  =Set restriction
+monitor.summary.unset.restriction  =Remove restriction
+authoring.info.teacher.set.restriction  =For this activity, the instructor fixed a deadline until {0}. After this time this activity will not be available.
+monitor.summary.notification  =Notification
+monitor.summary.date.restriction.set  =Deadline has been set
+monitor.summary.date.restriction.removed  =Deadline has been removed
+label.authoring.advance.passing.mark  =Assessment passing mark
+label.authoring.advance.choose.restriction  =Choose restriction:
+label.authoring.advance.passing.mark.none  =None
+label.learning.havent.reached.passing.mark  =Sorry, you haven''t scored {0} required to pass the activity. Please, try one more time.
+label.authoring.basic.add.question.to.pool  =Add question
+label.authoring.basic.add.question.to.list  =Add question to list
+label.authoring.basic.question.bank.title  =Question bank
+label.authoring.basic.list.header.mark  =Mark
+label.authoring.basic.type.random.question  =Random question
+label.authoring.basic.select.random.question  =Random question from pool
+label.authoring.basic.random.question  =Question
+label.authoring.basic.warning.too.many.questions  =Too many questions in a list. Please, remove some of them.
+authoring.import.result  =Import tool content result
+authoring.title.import  =Import questions
+authoring.import.instruction  =Please choose questions to import.
+button.select.importfile  =Select file to import
+msg.import.file.format  =The import file must be .xml file exported from assessment tool and not exceed size of {0}
+label.import.file  =Import xml file
+button.import  =Import
+label.authoring.basic.import.questions  =Import
+label.authoring.basic.export.questions  =Export
+label.authoring.advance.display.summary  =Display all questions and answers once the learner finishes.
+label.authoring.basic.import.qti  =Import IMS QTI
+advanced.reflectOnActivity  =Add a notebook at end of Assessment with the following instructions:
+monitor.summary.td.addNotebook  =Add a notebook at end of Assessment
+monitor.summary.td.notebookInstructions  =Notebook instructions
+label.export.reflection  =Notebook Entries
+label.continue  =Continue
+label.edit  =Edit
+label.submit  =Finish
+label.authoring.advance.numbered.questions  =Enable questions' numbering
+label.learning.draft.autosaved  =Draft autosaved
+label.waiting.for.leader  =Please, wait while somebody will become a group leader
+label.users.from.group  =Other learners participating in current group:
+label.use.select.leader.tool.output  =Use leaders from Select Leader tool
+label.group.leader  =Group leader: {0}
+label.refresh  =Refresh
+label.display.name.column  =Display name column
+label.authoring.answer.required  =Answer required?
+warn.answers.required  =Please, answer highlighted questions in order to continue.
+label.authoring.basic.export.qti  =Export IMS QTI
+label.monitoring.heading  =Assessment Monitoring
+label.maximum.number.words  =Maximum number of words
+label.minimum.number.words  =Minimum number of words
+label.info.maximum.number.words  =This answer must have a maximum of {0} words.
+label.info.minimum.number.words  =This answer must have a minimum of {0} words.
+label.info.max.and.min.number.words  =This answer must have a minimal of {0} and maximum of {1} words.
+warn.answers.word.requirements.limit  =In order to continue, please note the word limit restrictions.
+label.words  =Words:
+message.no.reflection.available  =No notebook entry has been added.
+label.authoring.basic.type.mark.hedging  =Mark hedging
+label.option.correct  =Correct?
+label.assign.hedging.mark  =Assign marks to answers. Max possible mark: {0}
+label.learning.submit  =Submit
+warn.mark.hedging.wrong.total  =In order to continue, all mark hedging questions should have all available marks assigned.
+label.incorrect.answer.nullifies.mark  =Assigns full mark only when the correct answers are selected.
+label.export.summary  =Summary
+label.justify.hedging.marks  =Please, justify your mark allocation.
+label.select.leader  =Leader selection
+label.question.options  =Question options
+label.activity.completion  =End of activity
+label.notifications  =Notifications
+label.ask.for.hedging.justification  =Ask for hedging justification?
+label.number.learners.per.session  =Number of learners per session
+label.tool.output  =Tool Output
+output.desc.best.score  =Best score
+label.tool.output.has.been.changed  =Tool Output has been changed
+output.desc.first.score  =First score
+output.desc.average.score  =Average score
+label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until he/she commences it.
+label.waiting.for.leader.finish  =Time limit set by teacher is over. Please wait until a group leader submits all answers.
+warn.mark.hedging.wrong.justification  =Justification cannot be left blank
+error.import.file.format  =The import file is not an .xml file.
+label.file  =File
+errors.maxfilesize  =File exceeds maximum file size {0}
+label.summary.downloaded  =Summary downloaded
+label.not.answered  =Not Answered
+label.other  =Other
+label.graph.help  =In the graph(s) below, click on a bar in the graph and then use your mouse wheel to zoom in and out of the graph. Once you zoom in, the grey selection in the bottom graph can be dragged left or right to show a different set of marks.
+label.lowest.mark  =Lowest mark:
+label.highest.mark  =Highest mark:
+label.number.learners  =Number of learners
+label.percentage  =Percentage
+label.operation.failed  =Operation failed.
+label.number.groups.finished  =Number of groups finished
+label.marks  =Marks
+label.number.learners.in.mark.range  =Number of learners in mark range
+label.number.groups.in.mark.range  =Number of groups in mark range
+label.average.mark  =Average mark
+label.error  =Error
+error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
+label.ok  =OK
+message.monitoring.edit.activity.warning  =Warning: if you edit and modify a question or change an answer that when a student has already answer, the marks will be recalculated based on the changes.
+label.enable.confidence.levels  =Enable confidence level
+label.what.is.your.confidence.level  =How confident are you of your answer?
+label.confidence  =Confidence
+label.no.question.references  =No questions have been added to the question list. Do you still want to proceed with no questions?
+label.hide.name.column  =Hide name column
+label.ae.questions.marks  =AE Questions & Marks
+label.ira.questions.marks  =iRA Questions & Marks
+label.attendance  =Attendance
+label.show.students.choices  =Show students' choices
+label.hide.students.choices  =Hide students' choices
+label.print  =Print
+label.excel.export  =Excel export
+label.teams  =Teams
+label.no.questions.in.question.bank  =No questions have been added to the question list. Do you still want to proceed with no questions?
+label.authoring.advance.disclose.answers  =Disclose learner's and other groups' answers in monitor
+label.learning.summary.other.team.answers  =Other teams' answers
+label.learning.summary.selected.by  =Selected by:
+label.disclose.correct.answers  =Disclose correct answers
+label.disclose.groups.answers  =Disclose groups' answers
+label.disclose.all.correct.answers  =Disclose all correct answers
+label.disclose.all.groups.answers  =Disclose all groups' answers
+label.prefix.sequential.letters.for.each.answer  =Prefix sequential letters for each answer
+label.edit.in.monitor.warning  =Attention: while you edit this assessment students don't have access to it. You must save your changes so students can re-attempt this assessment again.
+outcome.authoring.title  =Learning outcomes
+outcome.authoring.input  =Search and select by outcome name or code
+outcome.authoring.existing  =Added outcomes
+outcome.authoring.existing.none  =none
+authoring.fla.branch.mapping.ordered.asc  =Start with branches mapped to highest ordered answers
+warn.tool.output.change.none  =This will delete all existing marks for this activity. Are you sure?
+output.desc.none  =No score
+output.ordered.answers.for.question  =Ordered answers for the question:
+label.answer.required  =Answer required
+outcome.authoring.remove.confirm  =Are you sure you want to remove this learning outcome?
+label.qb.stats =Question indexes
+label.qb.participant.count =Test participant count
+label.qb.difficulty.index =Difficulty index
+label.qb.discrimination.index =Discrimination index
+label.qb.point.biserial =Point biserial
+outcome.authoring.create.new = [create new]
+
+#======= End labels: Exported 337 labels for en AU =====
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r78ae88b9a7c79f31eb1f795d084be7d283963885 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 78ae88b9a7c79f31eb1f795d084be7d283963885)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -3,10 +3,8 @@
 <%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
-<%@ attribute name="placeholder" required="false" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
 <%@ attribute name="toolbarSet" required="false" rtexprvalue="true"%>
-<%@ attribute name="classes" required="false" rtexprvalue="true"%>
 <%@ attribute name="height" required="false" rtexprvalue="true"%>
 <%@ attribute name="width" required="false" rtexprvalue="true"%>
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
@@ -41,18 +39,8 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<c:if test="${not empty placeholder}">
-	<c:set var="classes" value="placeholder-shown ${classes}" />
-	<div class="cke-div">
-</c:if>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
-
-<c:if test="${not empty placeholder}">
-		<label for="${id}" class="cke-label-floating">${placeholder}</label>
-	</div>
-</c:if>
-
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
@@ -81,7 +69,6 @@
 				width                         : "${width}",
 				height                        : "${height}",
 				toolbar                       : "${toolbarSet}",
-				classes                       : "${classes}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
 				toolbarStartupExpanded        : ${displayExpanded},
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
===================================================================
diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java	(.../McUsrAttemptDAO.java)	(revision 394f403c289f0fd7808c228840bead5c4e7d5d32)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java	(.../McUsrAttemptDAO.java)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -173,7 +173,7 @@
     @Override
     public boolean isMcContentAttempted(Long mcContentUid) {
 	final String IS_USER_ATTEMPT_EXIST_BY_MC_CONTENT = "select COUNT(*) > 0 FROM " + McUsrAttempt.class.getName()
-		+ " AS attempt WHERE attempt.mcQueContent.mcContent.uid=:mcContentUid";
+		+ " AS attempt WHERE attempt.qbToolQuestion.uid=:mcContentUid";
 
 	Query<Boolean> q = getSession().createQuery(IS_USER_ATTEMPT_EXIST_BY_MC_CONTENT, Boolean.class);
 	q.setParameter("mcContentUid", mcContentUid);
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -rba2b4e0d8f708d647ab75bf4db71559dfb249e07 -r67db3e1b2ada0d59ff98c807a54282783797c5e6
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision ba2b4e0d8f708d647ab75bf4db71559dfb249e07)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision 67db3e1b2ada0d59ff98c807a54282783797c5e6)
@@ -16,6 +16,7 @@
 <%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
 <%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
 <%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+<%@ attribute name="qbQuestionId" required="false" rtexprvalue="true" %>
 
 <%-- Support for multiple tags on one page --%>
 <c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
@@ -43,7 +44,8 @@
 	var outcomeData${outcomeTagId} = {
 			lessonId : '${lessonId}',
 			toolContentId : '${toolContentId}',
-			itemId : '${itemId}'
+			itemId : '${itemId}',
+			qbQuestionId : '${qbQuestionId}'
 		},
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
@@ -56,7 +58,7 @@
 	
 	$(document).ready(function(){
 		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
-			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do?organisationIds=${organisations}",
+			'source' : "<lams:LAMSURL/>outcome/outcomeSearch.do",
 			'delay'  : 700,
 			'minLength' : 2,
 			'response' : function(event, ui) {
@@ -91,6 +93,7 @@
 				var input = $(this);
 				$.ajax({
 					'url' : '<lams:LAMSURL/>outcome/outcomeMap.do',
+					'dataType' : 'text',
 					'data': $.extend({
 						'outcomeId' : ui.item.value,
 						// if value is null, then it is a new outcome to create; remove ' [create new]' part before sending
@@ -116,9 +119,11 @@
 	 * Loads existing mappings
 	 */
 	function refreshOutcomeMappings(outcomeTagId) {
+		var outcomeData = outcomeData${outcomeTagId};
+		
 		$.ajax({
 			'url' 	   : '<lams:LAMSURL/>outcome/outcomeGetMappings.do',
-			'data'	   : outcomeData${outcomeTagId},
+			'data'	   : outcomeData,
 			'cache'    : false,
 			'dataType' : 'json',
 			'success'  : function(outcomeMappings) {
@@ -134,13 +139,17 @@
 						// cache already mapped outcomes
 						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
 						// add a label with outcome information
-						var outcomeButton = $('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />').attr('mappingId', this.mappingId)
-												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
-						outcomeButton.click(function(){
-							if (confirm(outcomeMappingRemoveConfirm)) {
-								removeOutcomeMapping(this);
-							}
-						});
+						var qbMapping = !outcomeData.qbQuestionId && outcomeData.toolContentId && this.qbMapping;
+						$('<button type="button" class="roffset10 btn btn-xs btn-info outcomeButton" />')
+							.attr('mappingId', this.mappingId)
+							.html(this.label + (qbMapping ? '' : outcomeMappingRemoveButton))
+							.prop('disabled', qbMapping)
+							.appendTo(mappingDiv)
+							.click(function(){
+								if (confirm(outcomeMappingRemoveConfirm)) {
+									removeOutcomeMapping(this);
+								}
+							});
 					});
 				}
 			}