Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rf0a07161503850e9dcdb4b69b4a37be03744743b -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision f0a07161503850e9dcdb4b69b4a37be03744743b)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -627,6 +627,9 @@
 config.smtp.auth.security  =SMTP authentication security
 config.server.country  =Country
 admin.outcome.title =Outcomes management
+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
 
-
 #======= End labels: Exported 620 labels for en AU =====
Index: lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_admin/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_admin/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_central/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r846f7b4c76f01650ce4a2df946772bafc4228dcf -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 846f7b4c76f01650ce4a2df946772bafc4228dcf)
+++ lams_central/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -878,6 +878,10 @@
 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
 
 #=================== Specific to Team Based Learning (TBL) =========================#	
 authoring.tbl.template.title=Team Based Learning	
Index: lams_central/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_central/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_central/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_central/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_gradebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -raf839eeb85f37cf68092401ad23a4613ca7cd001 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_gradebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision af839eeb85f37cf68092401ad23a4613ca7cd001)
+++ lams_gradebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -121,5 +121,8 @@
 label.activity.marks.weighted  =(Activity Marks Weighted)
 gradebook.export.max.time.taken.seconds  =Maximum time taken (seconds)
 gradebook.export.min.time.taken.seconds  =Minimum time taken (seconds)
-
+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
 #======= End labels: Exported 112 labels for en AU =====
Index: lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4aa374ab461a88cba0563af0814ec442041a76a0 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4aa374ab461a88cba0563af0814ec442041a76a0)
+++ lams_learning/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -186,6 +186,9 @@
 audit.activity.started  =Learner {0} ({1}) started activity {2} ({3})
 audit.activity.stopped  =Learner {0} ({1}) stopped activity {2} ({3})
 audit.learner.lesson.complete  =Learner {0} ({1}) completed lesson {2} ({3})
+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
 
-
 #======= End labels: Exported 179 labels for en AU =====
Index: lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_learning/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_monitoring/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r28360b21c9f90c01d1d615a9c77c5f651e789469 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 28360b21c9f90c01d1d615a9c77c5f651e789469)
+++ lams_monitoring/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -474,4 +474,8 @@
 lesson.end=End:
 error.lesson.end.date.must.be.after.start.date=Scheduled end date must be after the start date.
 
+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
 #======= End labels: Exported 451 labels for en AU =====
Index: lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_monitoring/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_assessment/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6fa531a730e4c685bcec3569ae46c98ea9f51571 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6fa531a730e4c685bcec3569ae46c98ea9f51571)
+++ lams_tool_assessment/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -340,6 +340,9 @@
 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
+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
 
-
 #======= End labels: Exported 332 labels for en AU =====
Index: lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_assessment/web/pages/authoring/advance.jsp
===================================================================
diff -u -r992a44ddcfb288b1170625aa08c3f5acf2a69ae1 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 992a44ddcfb288b1170625aa08c3f5acf2a69ae1)
+++ lams_tool_assessment/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -238,6 +238,8 @@
 </iframe>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.assessment.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">
Index: lams_tool_chat/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b036e6dd6d2afe9c0e0b9143c9be3af1d53a1e0e)
+++ lams_tool_chat/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -118,6 +118,9 @@
 label.activity.completion  =End of activity
 label.notifications  =Notifications
 output.desc.learner.number.of.posts  =Number of posts
+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
 
-
 #======= End labels: Exported 113 labels for en AU =====
Index: lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_chat/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_chat/web/pages/authoring/advanced.jsp
===================================================================
diff -u -rc7ba52ee01e6e67a6cd7ccf4d8b24f01203eb3a1 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision c7ba52ee01e6e67a6cd7ccf4d8b24f01203eb3a1)
+++ lams_tool_chat/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -13,6 +13,8 @@
 </div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
 	<label for="lockOnFinished">
Index: lams_tool_daco/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_daco/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_daco/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -255,6 +255,9 @@
 error.attachment.executable  =Uploaded file is executable
 error.attachment.must.be.image  =Allowed file formats: JPG, GIF or PNG.
 label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
+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
 
-
 #======= End labels: Exported 249 labels for en AU =====
Index: lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_daco/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_daco/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r0978f4c3fff33f106dc928704ad6249815cd131c -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_daco/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 0978f4c3fff33f106dc928704ad6249815cd131c)
+++ lams_tool_daco/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -47,6 +47,8 @@
 </div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.daco.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
 <label for="lockOnFinished"><html:checkbox property="daco.lockOnFinished" styleId="lockOnFinished" />
Index: lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
===================================================================
diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9)
+++ lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties	(.../ApplicationResources_en_AU.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -88,4 +88,8 @@
 label.time.left  =Time left
 label.time.is.over  =Time is over. No more editing is allowed.
 
+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
 #======= End labels: Exported 164 labels for en AU =====
Index: lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_doku/web/pages/authoring/advance.jsp
===================================================================
diff -u -r7a4b493a0008b281e8c3ec7aafbd325165085ed9 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 7a4b493a0008b281e8c3ec7aafbd325165085ed9)
+++ lams_tool_doku/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -57,6 +57,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.dokumaran.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_forum/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_forum/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -245,6 +245,9 @@
 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.
+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
 
-
 #======= End labels: Exported 239 labels for en AU =====
Index: lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_forum/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_forum/web/jsps/authoring/advance.jsp
===================================================================
diff -u -rbe48c7dd8438a3e7f038876851f7a3b740c8f4f4 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision be48c7dd8438a3e7f038876851f7a3b740c8f4f4)
+++ lams_tool_forum/web/jsps/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -147,6 +147,8 @@
 	</div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${forumForm.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="lockWhenFinished"><html:checkbox
Index: lams_tool_gmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5)
+++ lams_tool_gmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -108,6 +108,9 @@
 label.search  =Search...
 monitoring.user.fullname  =Name
 monitoring.user.reflection  =Notebook entry
+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
 
-
 #======= End labels: Exported 102 labels for en AU =====
Index: lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_gmap/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r7e36808f988eacadf9b5d82b450dcf6518ed49d9 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 7e36808f988eacadf9b5d82b450dcf6518ed49d9)
+++ lams_tool_gmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -89,6 +89,8 @@
 	</div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">	
 	<div class="checkbox">
 		<label for="lockOnFinished">
Index: lams_tool_images/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_images/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_images/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -152,6 +152,9 @@
 label.comment.textarea.tip  =Type your comment here then click on the green tick
 warning.minimum.number.words  =There is a minimum required number of words in a comment is {0}
 label.upload.info  =Uploaded file must not exceed size of {0}
+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
 
-
 #======= End labels: Exported 146 labels for en AU =====
Index: lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_images/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_images/web/pages/authoring/advance.jsp
===================================================================
diff -u -r91b889b2799b29b15df18c661e46cd1532eb5251 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 91b889b2799b29b15df18c661e46cd1532eb5251)
+++ lams_tool_images/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -95,6 +95,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.imageGallery.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">
Index: lams_tool_imscc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7e5ebaceffd43ff691062c0de86f16125d3c3425 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_imscc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7e5ebaceffd43ff691062c0de86f16125d3c3425)
+++ lams_tool_imscc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -134,6 +134,9 @@
 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}
+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
 
-
 #======= End labels: Exported 128 labels for en AU =====
Index: lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_imscc/web/pages/authoring/advance.jsp
===================================================================
diff -u -r392e4ecb5a9c54f89d14b9a32b309280060e68c9 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_imscc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 392e4ecb5a9c54f89d14b9a32b309280060e68c9)
+++ lams_tool_imscc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -38,6 +38,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.commonCartridge.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 <div class="checkbox">
Index: lams_tool_lamc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6fa531a730e4c685bcec3569ae46c98ea9f51571 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6fa531a730e4c685bcec3569ae46c98ea9f51571)
+++ lams_tool_lamc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -230,6 +230,9 @@
 label.monitoring.yesDisplayFeedbackOnly  =Learners are able to see the feedback but no answers or scores for the questions.
 label.monitoring.noDisplayFeedbackOnly1  =Learners are not able to see the feedback for the questions
 label.monitoring.noDisplayFeedbackOnly2  =Do you want to allow learners to see the feedback now?
+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
 
-
 #======= End labels: Exported 222 labels for en AU =====
Index: lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_lamc/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r2dca74ca01cdce55ea691b9784f19ac9f528f104 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 2dca74ca01cdce55ea691b9784f19ac9f528f104)
+++ lams_tool_lamc/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -1,5 +1,6 @@
 <%@ include file="/common/taglibs.jsp"%>
 <c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+<c:set var="sessionMap" value="${sessionScope[sessionMapId]}" />
 
 <lams:SimplePanel titleKey="label.select.leader">
 	<div class="checkbox">
@@ -92,6 +93,8 @@
 	
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="reflect">
Index: lams_tool_laqa/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_laqa/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -257,6 +257,9 @@
 label.allow.review.other.responses  =Allow review other responses?
 label.username  =Username
 label.fullname  =Fullname
+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
 
-
 #======= End labels: Exported 251 labels for en AU =====
Index: lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -r110fa726a5bde19d707fcf5367de6b5e29e81b66 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision 110fa726a5bde19d707fcf5367de6b5e29e81b66)
+++ lams_tool_laqa/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -135,6 +135,8 @@
 	
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="lockWhenFinished">
Index: lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r46d050a790a72bf6284ae27bdd5eee443c0c4ae7 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 46d050a790a72bf6284ae27bdd5eee443c0c4ae7)
+++ lams_tool_larsrc/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -181,6 +181,9 @@
 label.error  =Error
 error.loaderror  =There was an error loading the grid. If this problem persists, please contact your system administrator.
 label.ok  =OK
+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
 
-
 #======= End labels: Exported 176 labels for en AU =====
Index: lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_larsrc/web/pages/authoring/advance.jsp
===================================================================
diff -u -r17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 17b8d4d2fa5dffd734e4a62d06cb92dfdc6ca9bf)
+++ lams_tool_larsrc/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -65,6 +65,8 @@
 	
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.resource.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_leader/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r0f99980c5bef5116e79eedc704bf04df52083e95 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 0f99980c5bef5116e79eedc704bf04df52083e95)
+++ lams_tool_leader/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -59,6 +59,9 @@
 monitoring.label.group  =Group
 label.no.leader.yet.title  =No leader has been chosen yet
 label.no.leader.yet.body  =Once a leader is selected, you will be able to continue to the next activity
+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
 
-
 #======= End labels: Exported 53 labels for en AU =====
Index: lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_leader/web/pages/authoring/basic.jsp
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_leader/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -13,3 +13,5 @@
     <label for="instructions"><fmt:message key="label.authoring.basic.instructions" /></label>
     <lams:CKEditor id="instructions" value="${formBean.instructions}" contentFolderID="${sessionMap.contentFolderID}"></lams:CKEditor>
 </div>
+
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
\ No newline at end of file
Index: lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rd85ccdd5499a10df5f92ad27e27de51bb70fac1b -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision d85ccdd5499a10df5f92ad27e27de51bb70fac1b)
+++ lams_tool_mindmap/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -103,6 +103,9 @@
 label.delete.idea  =Delete Idea
 label.expand.collapse.idea  =Expand/Collapse Idea
 label.no.changes.can.be.made.reloading.ideas  =No changes can be made to the mindmap. Reloading ideas.
+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
 
-
 #======= End labels: Exported 97 labels for en AU =====
Index: lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_mindmap/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r017d7545cab486a7d901af349a9a1015f7f387b6 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_mindmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 017d7545cab486a7d901af349a9a1015f7f387b6)
+++ lams_tool_mindmap/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -13,6 +13,8 @@
 	
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_nb/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re115c75d683baa2f10fcac9bcbed88ea21784f5a -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_nb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision e115c75d683baa2f10fcac9bcbed88ea21784f5a)
+++ lams_tool_nb/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -61,8 +61,8 @@
 advanced.comment.header  =Comments options
 label.activity.completion  =End of activity
 advanced.enable.anonymous.posts =Enable anonymous posts
-advanced.outcome.title =Learning outcomes
-advanced.outcome.input =Search and select by outcome name or code
-advanced.outcome.existing =Added outcomes
-advanced.outcome.existing.none =none
+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
 #======= End labels: Exported 54 labels for en AU =====
Index: lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u -re115c75d683baa2f10fcac9bcbed88ea21784f5a -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision e115c75d683baa2f10fcac9bcbed88ea21784f5a)
+++ lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag	(.../OutcomeAuthor.tag)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -49,7 +49,7 @@
 		// keep mapped outcome IDs for search result filtering
 		outcomeMappingIds${outcomeTagId} = [],
 		
-		outcomeExistingNoneLabel = '<fmt:message key="advanced.outcome.existing.none" />',
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
 		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
 	
 	$(document).ready(function(){
@@ -143,13 +143,13 @@
 	}
 </script>
 
-<lams:SimplePanel titleKey="advanced.outcome.title">
+<lams:SimplePanel titleKey="outcome.authoring.title">
 	<div class="input-group">
 	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
 	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
-	    	   placeholder='<fmt:message key="advanced.outcome.input" />'></input>
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
 	</div>
 	<div class="voffset10">
-		<fmt:message key="advanced.outcome.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
 	</div>
 </lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_notebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rc42bcefca986365cbe681c165e45a3f1d2409f47 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision c42bcefca986365cbe681c165e45a3f1d2409f47)
+++ lams_tool_notebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -123,6 +123,9 @@
 basic.forceResponse  =Response required?
 message.learner.blank.alertforceResponse  =Response is required
 advanced.enable.anonymous.posts  =Enable anonymous posts
+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
 
-
 #======= End labels: Exported 117 labels for en AU =====
Index: lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_notebook/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r7712648410bc57755e64aa3cc3488d3070d67aa4 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_notebook/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 7712648410bc57755e64aa3cc3488d3070d67aa4)
+++ lams_tool_notebook/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -12,6 +12,8 @@
 </div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
 	<label for="lockOnFinished">
Index: lams_tool_pixlr/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r86ef92a253621f61329261d8f129e329b2ddd8f7 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 86ef92a253621f61329261d8f129e329b2ddd8f7)
+++ lams_tool_pixlr/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -106,6 +106,9 @@
 label.activity.completion  =End of activity
 errors.maxfilesize  =Uploaded file exceeded maximum size of {0}
 label.upload.info  =Uploaded file must not be executable and not exceed size of {0}
+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
 
-
 #======= End labels: Exported 100 labels for en AU =====
Index: lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_pixlr/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r6eaaff81c675b592c0efa20bf13dacc7863f460b -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_pixlr/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 6eaaff81c675b592c0efa20bf13dacc7863f460b)
+++ lams_tool_pixlr/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -11,6 +11,8 @@
 	</div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="lock-when-finished">
Index: lams_tool_preview/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_preview/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -188,6 +188,9 @@
 button.preview.results  =View / email results
 label.hide  =Hide
 label.email.send.failed.preview.wrong  =Sending failed - preview cannot be sent. Please create a new preview.
+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
 
-
 #======= End labels: Exported 182 labels for en AU =====
Index: lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
diff -u -rc1f2aa0761a3d79b04018fb752e069f366ccd15b -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision c1f2aa0761a3d79b04018fb752e069f366ccd15b)
+++ lams_tool_preview/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -51,6 +51,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.peerreview.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 	<label for="lockWhenFinished"><html:checkbox property="peerreview.lockWhenFinished" styleId="lockWhenFinished" />
Index: lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2d20cd764b9f78cf3d349dc62735bcc86d356795 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2d20cd764b9f78cf3d349dc62735bcc86d356795)
+++ lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -162,6 +162,9 @@
 label.select.leader  =Leader selection
 label.waiting.for.leader.launch.time.limit  =Leader has not started the activity. Please wait until the leader commences it.
 label.use.select.leader.tool.output  =Use leaders from Leader tool
+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
 
-
 #======= End labels: Exported 156 labels for en AU =====
Index: lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_sbmt/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_sbmt/web/authoring/advance.jsp
===================================================================
diff -u -r9cb5ff9445a12587a4462629f66a273c56520e7f -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision 9cb5ff9445a12587a4462629f66a273c56520e7f)
+++ lams_tool_sbmt/web/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -59,6 +59,8 @@
 </div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 <div class="checkbox">
 	<label for="lockOnFinished">
Index: lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5)
+++ lams_tool_scratchie/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -223,6 +223,9 @@
 label.print  =Print
 label.teams.notuppercase  =Teams
 label.authoring.advanced.show.scratchies.in.results  =Show results to learners after completion
+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
 
-
 #======= End labels: Exported 217 labels for en AU =====
Index: lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_scratchie/web/pages/authoring/advance.jsp
===================================================================
diff -u -r46c5a097bc772365634d0846864cb2f121c354ef -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 46c5a097bc772365634d0846864cb2f121c354ef)
+++ lams_tool_scratchie/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -121,6 +121,8 @@
 	</div>
 </lams:AdvancedAccordian>
 
+<lams:OutcomeAuthor toolContentId="${formBean.scratchie.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="reflect-on">
Index: lams_tool_scribe/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r7fbf7550557eaabec484e7dd148f768cd5bd4ebc -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_scribe/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 7fbf7550557eaabec484e7dd148f768cd5bd4ebc)
+++ lams_tool_scribe/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -102,6 +102,9 @@
 label.scribe.options  =Options
 label.activity.completion  =End of activity
 advanced.showAggregatedReportsNote  =Note: this will only work when groups are assigned to this activity.
+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
 
-
 #======= End labels: Exported 96 labels for en AU =====
Index: lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_scribe/web/pages/authoring/advanced.jsp
===================================================================
diff -u -re2b3506dbe5f060fe62cedcbe142cbe32226fb48 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_scribe/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision e2b3506dbe5f060fe62cedcbe142cbe32226fb48)
+++ lams_tool_scribe/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -29,6 +29,8 @@
 	</div>
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 	<div class="checkbox">
 		<label for="reflectOnActivity">
Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rca10d5f847158b365d5dec170b298f29a9b2ace7 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision ca10d5f847158b365d5dec170b298f29a9b2ace7)
+++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -117,5 +117,8 @@
 label.spreadsheet.options  =Options
 label.activity.completion  =End of activity
 message.spreadsheet.marked  =You cannot change the spreadsheet as it has been marked.
-
+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
 #======= End labels: Exported 110 labels for en AU =====
Index: lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_spreadsheet/web/pages/authoring/advance.jsp
===================================================================
diff -u -r4cef43ff9f318cfb92259c5d25b2e97e6e732a83 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_spreadsheet/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 4cef43ff9f318cfb92259c5d25b2e97e6e732a83)
+++ lams_tool_spreadsheet/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -37,6 +37,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.spreadsheet.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_survey/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5)
+++ lams_tool_survey/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -184,6 +184,9 @@
 label.notifications  =Notifications
 label.summary.downloaded=  =Report Downloaded
 label.timestamp  =Date/time
+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
 
-
 #======= End labels: Exported 178 labels for en AU =====
Index: lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_survey/web/pages/authoring/advance.jsp
===================================================================
diff -u -r1c9c204c7d6fad2a083eac4250d68aabce949b53 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 1c9c204c7d6fad2a083eac4250d68aabce949b53)
+++ lams_tool_survey/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -32,6 +32,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${formBean.survey.contentId}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_task/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r125488b240966768429db725f4eaa19c425d8964 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 125488b240966768429db725f4eaa19c425d8964)
+++ lams_tool_task/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -170,6 +170,9 @@
 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}
+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
 
-
 #======= End labels: Exported 164 labels for en AU =====
Index: lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_task/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_task/web/pages/authoring/advance.jsp
===================================================================
diff -u -r9bde0c194f5868e0e9e1dd133aefd38416574b1b -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_task/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision 9bde0c194f5868e0e9e1dd133aefd38416574b1b)
+++ lams_tool_task/web/pages/authoring/advance.jsp	(.../advance.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -54,6 +54,8 @@
 	</div>
 
 </lams:SimplePanel>
+
+<lams:OutcomeAuthor toolContentId="${formBean.taskList.contentId}" />
 	
 <lams:SimplePanel titleKey="label.activity.completion">
 
Index: lams_tool_vote/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4c51f9c8b6fab7efa4d5296f1ee60c1c3bd207e5)
+++ lams_tool_vote/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -161,6 +161,9 @@
 js.error.validate.number  =There is an error with the minimum and/or maximum number of votes. Please check and try again.
 label.search  =Search...
 message.monitoring.edit.activity.warning  =Warning: if you edit and modify a nomination that has already been selected, it would be reseted to zero -as the nomination has changed.
+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
 
-
 #======= End labels: Exported 155 labels for en AU =====
Index: lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_vote/web/authoring/AdvancedContent.jsp
===================================================================
diff -u -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf)
+++ lams_tool_vote/web/authoring/AdvancedContent.jsp	(.../AdvancedContent.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -64,6 +64,8 @@
 
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${voteGeneralAuthoringDTO.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -rb70677e341b8af354930837f3d9ee98663f43c57 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b70677e341b8af354930837f3d9ee98663f43c57)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -150,6 +150,9 @@
 monitor.summary.notification  =Notification
 monitor.summary.date.restriction.set  =Deadline has been set
 monitor.summary.date.restriction.removed  =Deadline has been removed
+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
 
-
 #======= End labels: Exported 144 labels for en AU =====
Index: lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_wiki/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
+++ lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -68,6 +68,8 @@
 	
 </lams:SimplePanel>
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox">
Index: lams_tool_zoom/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
+++ lams_tool_zoom/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -66,5 +66,8 @@
 error.api.none.configured =There are no Zoom API keys configured by the administrator. You are not able to create a Zoom meeting.
 error.api.reuse =All configured API keys are in use at the moment. If you decide to start your meeting, another teacher's meeting will be stopped.
 sysadmin.maintain= Back to admin panel
-
+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
 #======= End labels: Exported 64 labels for en AU =====
Index: lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="outcome.authoring.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="outcome.authoring.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="outcome.authoring.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="outcome.authoring.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2cf1e086b82a29fae22136351fc7a44821181323)
+++ lams_tool_zoom/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>
Index: lams_tool_zoom/web/pages/authoring/advanced.jsp
===================================================================
diff -u -r6c62e5beb70cd0b72dcec44eaf80ba489a442fb4 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 6c62e5beb70cd0b72dcec44eaf80ba489a442fb4)
+++ lams_tool_zoom/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -5,6 +5,8 @@
 
 <!-- ========== Advanced Tab ========== -->
 
+<lams:OutcomeAuthor toolContentId="${sessionMap.toolContentID}" />
+
 <lams:SimplePanel titleKey="label.activity.completion">
 
 	<div class="checkbox voffset10">
Index: lams_www/web/WEB-INF/tags/OutcomeAuthor.tag
===================================================================
diff -u
--- lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(revision 0)
+++ lams_www/web/WEB-INF/tags/OutcomeAuthor.tag	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -0,0 +1,155 @@
+<% 
+ /**
+  * Outcome.tag
+  *	Author: Marcin Cieslak
+  *	Description: Outcome selection in authoring
+  */
+ %>
+<%@ tag body-content="scriptless" %>
+<%@ taglib uri="tags-core" prefix="c" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<%@ taglib uri="tags-html" prefix="html" %>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<c:set var="lams"><lams:LAMSURL/></c:set>
+
+<%-- Optional attributes. Must provide at either lessonId or toolContentId --%>
+<%@ attribute name="lessonId" required="false" rtexprvalue="true" %>
+<%@ attribute name="toolContentId" required="false" rtexprvalue="true" %>
+<%@ attribute name="itemId" required="false" rtexprvalue="true" %>
+
+<%-- Support for multiple tags on one page --%>
+<c:set var="outcomeTagId" value="${empty outcomeTagId ? 1 : outcomeTagId + 1}" />
+
+<%-- ---------------------------------------%>
+<style type="text/css">
+	.outcomeMappings {
+		display: inline-block;
+	}
+	
+	.outcomeButton {
+		padding-top: 2px;
+		padding-bottom: 2px;
+	}
+</style>
+
+<script type="text/javascript">
+	// Adding jquery-ui.js if it hasn't been loaded already
+	if (!jQuery.ui) {
+		document.write('<link href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" rel="stylesheet" type="text/css" />');
+		document.write('<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/jquery-ui.js"><\/script>');
+	}
+
+	// create own set of IDs for Ajax calls
+	var outcomeData${outcomeTagId} = {
+			lessonId : '${lessonId}',
+			toolContentId : '${toolContentId}',
+			itemId : '${itemId}'
+		},
+		// keep mapped outcome IDs for search result filtering
+		outcomeMappingIds${outcomeTagId} = [],
+		
+		outcomeExistingNoneLabel = '<fmt:message key="advanced.outcome.existing.none" />',
+		outcomeMappingRemoveButton = '<i class="fa fa-remove loffset5"></i>';
+	
+	$(document).ready(function(){
+		$('#outcomeSearchInput${outcomeTagId}').autocomplete({
+			'source' : "<lams:LAMSURL/>outcome.do?method=outcomeSearch&organisationIds=${organisations}",
+			'delay'  : 700,
+			'minLength' : 2,
+			'response' : function(event, ui) {
+				// filter out already mapped outcomes
+				var index = ui.content.length;
+				while(index--) {
+					if (outcomeMappingIds${outcomeTagId}.includes(ui.content[index].value)){
+						ui.content.splice(index, 1);
+					}
+				}
+			},
+			'select' : function(event, ui){
+				var input = $(this);
+				$.ajax({
+					'url' : '<lams:LAMSURL/>outcome.do',
+					'data': $.extend({
+						'method' : 'outcomeMap',
+						'outcomeId' : ui.item.value
+					}, outcomeData${outcomeTagId}),
+					'method' : 'post',
+					'cache' : false,
+					'success' : function() {
+						// if add was successful, refresh added mappings
+						input.val("");
+						refreshOutcomeMappings('${outcomeTagId}');
+					}
+				});
+				return false;
+			}
+		});
+
+		// on start load existing mappings
+		refreshOutcomeMappings('${outcomeTagId}');
+	});
+
+	/**
+	 * Loads existing mappings
+	 */
+	function refreshOutcomeMappings(outcomeTagId) {
+		$.ajax({
+			'url' 	   : '<lams:LAMSURL/>outcome.do',
+			'data'	   : $.extend({
+							'method' : 'outcomeGetMappings'
+						 }, outcomeData${outcomeTagId}),
+			'cache'    : false,
+			'dataType' : 'json',
+			'success'  : function(outcomeMappings) {
+				// clear mappings list
+				var mappingDiv = $('#outcomeMappings' + outcomeTagId).empty();
+				// clear cached outcome IDs
+				outcomeMappingIds${outcomeTagId} = [];
+				if (outcomeMappings.length == 0) {
+					// display "none" label
+					$(mappingDiv).append(outcomeExistingNoneLabel);
+				} else {
+					$.each(outcomeMappings, function(){
+						// cache already mapped outcomes
+						outcomeMappingIds${outcomeTagId}.push(this.outcomeId);
+						// add a label with outcome information
+						var outcomeButton = $('<button type="button" class="roffset10 btn btn-primary outcomeButton" />').attr('mappingId', this.mappingId)
+												.html(this.label + outcomeMappingRemoveButton).appendTo(mappingDiv);
+						outcomeButton.click(function(){
+							removeOutcomeMapping(this);
+						});
+					});
+				}
+			}
+		});
+	}
+
+	/**
+	 * Removes an existing mapping
+	 */
+	function removeOutcomeMapping(button) {
+		$.ajax({
+			'url' : '<lams:LAMSURL/>outcome.do',
+			'data': {
+					'method' 	: 'outcomeRemoveMapping',
+					'mappingId' :  $(button).attr('mappingId')
+				}, 
+			'cache' : false,
+			'success' : function() {
+				refreshOutcomeMappings('${outcomeTagId}');
+			}
+		});
+	}
+</script>
+
+<lams:SimplePanel titleKey="advanced.outcome.title">
+	<div class="input-group">
+	    <span class="input-group-addon"><i class="fa fa-search"></i></span>
+	    <input type="text" id="outcomeSearchInput${outcomeTagId}" class="ui-autocomplete-input form-control" 
+	    	   placeholder='<fmt:message key="advanced.outcome.input" />'></input>
+	</div>
+	<div class="voffset10">
+		<fmt:message key="advanced.outcome.existing" />: <div id="outcomeMappings${outcomeTagId}" class="outcomeMappings"></div>
+	</div>
+</lams:SimplePanel>
\ No newline at end of file
Index: lams_www/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -r60d9a173d5590295376322fc3e857ae2dca37717 -rb67bc25f161fa3bf350e4c89696c24620674c8ef
--- lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 60d9a173d5590295376322fc3e857ae2dca37717)
+++ lams_www/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b67bc25f161fa3bf350e4c89696c24620674c8ef)
@@ -524,6 +524,10 @@
    	<tag-file>
 	    <name>LeaderDisplay</name>
 		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file> 
+   	<tag-file>
+       <name>OutcomeAuthor</name>
+       <path>/WEB-INF/tags/OutcomeAuthor.tag</path>
    	</tag-file>  
    	<tag>
     <name>textarea</name>