Index: lams_gradebook/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r4a0fbb2ddb1262c8a0bb6257ad76aa4e0d7222b8 -r468d69b9c1d4817c71e5449ce78f919ea9aa6234
--- lams_gradebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 4a0fbb2ddb1262c8a0bb6257ad76aa4e0d7222b8)
+++ lams_gradebook/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 468d69b9c1d4817c71e5449ce78f919ea9aa6234)
@@ -38,6 +38,7 @@
 gradebook.columntitle.attempt =Attempt #
 gradebook.columntitle.lesson.mark =Lesson mark
 gradebook.columntitle.attempts =Previous attempts
+gradebook.columntitle.outcome =Learning outcomes
 gradebook.function.window.showColumns  =Show/Hide columns
 gradebook.function.error.enterNumber  =Please enter a number value
 gradebook.function.search.title  =Search grid
@@ -121,5 +122,10 @@
 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
+outcome.result.not.set =not set
+outcome.result.error =Error!
 #======= End labels: Exported 112 labels for en AU =====
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
diff -u -r4a0fbb2ddb1262c8a0bb6257ad76aa4e0d7222b8 -r468d69b9c1d4817c71e5449ce78f919ea9aa6234
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 4a0fbb2ddb1262c8a0bb6257ad76aa4e0d7222b8)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	(.../GradebookService.java)	(revision 468d69b9c1d4817c71e5449ce78f919ea9aa6234)
@@ -37,6 +37,9 @@
 import java.util.TreeSet;
 
 import org.apache.log4j.Logger;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivity;
 import org.lamsfoundation.lams.gradebook.GradebookUserActivityArchive;
@@ -76,6 +79,11 @@
 import org.lamsfoundation.lams.lesson.service.ILessonService;
 import org.lamsfoundation.lams.logevent.LogEvent;
 import org.lamsfoundation.lams.logevent.service.ILogEventService;
+import org.lamsfoundation.lams.outcome.Outcome;
+import org.lamsfoundation.lams.outcome.OutcomeMapping;
+import org.lamsfoundation.lams.outcome.OutcomeResult;
+import org.lamsfoundation.lams.outcome.OutcomeScaleItem;
+import org.lamsfoundation.lams.outcome.service.IOutcomeService;
 import org.lamsfoundation.lams.tool.ToolOutput;
 import org.lamsfoundation.lams.tool.ToolOutputValue;
 import org.lamsfoundation.lams.tool.ToolSession;
@@ -107,7 +115,6 @@
  *
  */
 public class GradebookService implements IGradebookService {
-
     private static Logger logger = Logger.getLogger(GradebookService.class);
 
     private static final ExcelCell[] EMPTY_ROW = new ExcelCell[4];
@@ -128,9 +135,11 @@
     private MessageService messageService;
     private ILogEventService logEventService;
     private static ICoreLearnerService learnerService;
+    private IOutcomeService outcomeService;
 
     @Override
-    public List<GradebookGridRowDTO> getGBActivityRowsForLearner(Long lessonId, Integer userId, TimeZone userTimezone) {
+    public List<GradebookGridRowDTO> getGBActivityRowsForLearner(Long lessonId, Integer userId, TimeZone userTimezone)
+	    throws JSONException {
 	GradebookService.logger.debug("Getting gradebook user data for lesson: " + lessonId + ". For user: " + userId);
 
 	Lesson lesson = lessonService.getLesson(lessonId);
@@ -189,6 +198,30 @@
 		}
 	    }
 
+	    List<OutcomeMapping> outcomeMappings = outcomeService.getOutcomeMappings(null, activity.getToolContentId(),
+		    null);
+	    if (!outcomeMappings.isEmpty()) {
+		JSONArray outcomeMappingsJSON = new JSONArray();
+		for (OutcomeMapping outcomeMapping : outcomeMappings) {
+		    JSONObject outcomeMappingJSON = new JSONObject();
+		    Outcome outcome = outcomeMapping.getOutcome();
+		    outcomeMappingJSON.put("mappingId", outcomeMapping.getMappingId());
+		    outcomeMappingJSON.put("name", outcome.getName());
+		    outcomeMappingJSON.put("code", outcome.getCode());
+		    JSONArray possibleValues = new JSONArray();
+		    for (OutcomeScaleItem possibleValue : outcome.getScale().getItems()) {
+			possibleValues.put(possibleValue.getName());
+		    }
+		    outcomeMappingJSON.put("possibleValues", possibleValues);
+		    OutcomeResult result = outcomeService.getOutcomeResult(userId, outcomeMapping.getMappingId());
+		    if (result != null) {
+			outcomeMappingJSON.put("value", result.getValue());
+		    }
+		    outcomeMappingsJSON.put(outcomeMappingJSON);
+		}
+		activityDTO.setOutcomes(outcomeMappingsJSON.toString());
+	    }
+
 	    gradebookActivityDTOs.add(activityDTO);
 	}
 
@@ -2548,5 +2581,9 @@
     public void setMessageService(MessageService messageService) {
 	this.messageService = messageService;
     }
+
+    public void setOutcomeService(IOutcomeService outcomeService) {
+	this.outcomeService = outcomeService;
+    }
     // -------------------------------------------------------------------------
 }
\ No newline at end of file
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
diff -u -r668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1 -r468d69b9c1d4817c71e5449ce78f919ea9aa6234
--- lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1)
+++ lams_gradebook/web/gradebookMonitor.jsp	(.../gradebookMonitor.jsp)	(revision 468d69b9c1d4817c71e5449ce78f919ea9aa6234)
@@ -14,6 +14,8 @@
 	
 	<lams:css/>
 	<link type="text/css" href="<lams:LAMSURL />gradebook/includes/css/gradebook.css" rel="stylesheet" />
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable.css">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/x-editable-lams.css"> 
 	<lams:css suffix="chart"/>
 	
 	<jsp:include page="includes/jsp/jqGridIncludes.jsp"></jsp:include>
@@ -23,6 +25,7 @@
 	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/d3.js"></script>
  	<script type="text/javascript" src="<lams:LAMSURL />includes/javascript/chart.js"></script>
 	<script type="text/javascript" src="<lams:LAMSURL />gradebook/includes/javascript/blockexportbutton.js"></script>
+	<script type="text/javascript" src="<lams:LAMSURL/>includes/javascript/x-editable.js"></script>
 	
 	<script type="text/javascript">
 	
@@ -155,6 +158,7 @@
 			    height: "100%",
 			    width: jqgridWidth,
 				shrinkToFit: false,
+				cmTemplate: { title: false },
 			    cellEdit: true,
 			    viewrecords: true,
 			    sortorder: "asc", 
@@ -176,19 +180,23 @@
 			    ],
 			    colModel:[
 			      {name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
-			      {name:'rowNamer',index:'rowName', sortable:true, editable:false, autoencode:true, formatter:userNameFormatter},
-			      {name:'status',index:'status', sortable:false, editable:false, search:false, width:50, align:"center"},
-			      {name:'timeTaken',index:'timeTaken', sortable:true, editable:false, search:false, width:80, align:"center"},
-			      {name:'startDate',index:'startDate', sortable:true, editable:false, hidden:false, search:false, width:85, align:"left"},
-			      {name:'finishDate',index:'finishDate', sortable:false, editable:false, hidden:false, search:false, width:85, align:"left"},
+			      {name:'rowNamer',index:'rowName', sortable:true, editable:false, autoencode:true, width: 150, formatter:userNameFormatter},
+			      {name:'status',index:'status', sortable:false, editable:false, search:false, width:30, align:"center"},
+				  {name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:50, align:"center",
+						cellattr: function(rowID, val, rawObject, cm, rdata) {
+				    	    return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
+				    	}
+			      },
+				  {name:'startDate',index:'startDate', width:0, hidden: true},
+				  {name:'finishDate',index:'finishDate', width:0, hidden: true},
 			      {name:'feedback',index:'feedback', sortable:true, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, search:false },
 			      {name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"},
 			      {name:'portraitId', index:'portraitId', width:0, hidden: true},
 			      {name:'hasArchivedMarks', index:'hasArchivedMarks', width:0, hidden: true}
 			      ],
 			    loadError: function(xhr,st,err) {
-				    	jQuery("#userView").clearGridData();
-				    	alert("<fmt:message key="gradebook.error.loaderror"/>");
+				    jQuery("#userView").clearGridData();
+				   	alert("<fmt:message key="gradebook.error.loaderror"/>");
 			    },
 			    subGrid: true,
 				subGridRowExpanded: function(subgrid_id, row_id) {
@@ -205,6 +213,7 @@
 						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID,
 						     height: "100%",
 						     autowidth:true,
+						     cmTemplate: { title: false },
 						     cellEdit:true,
 						     pager: subgrid_table_id + "_pager",
 						     rowList:[10,20,30,40,50,100],
@@ -219,21 +228,31 @@
 						    	"<fmt:message key="gradebook.columntitle.startDate"/>", 
 						    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
 						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
+						     	"<fmt:message key="gradebook.columntitle.outcome"/>",
 						     	"<fmt:message key="gradebook.columntitle.mark"/>"
 						     ],
 						     colModel: [
 						       	{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
 						       	{name:'marksAvailable',index:'marksAvailable', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
-								{name:'rowName',  index:'rowName', sortable:false, editable: false},
-								{name:'status',  index:'status', sortable:false, editable:false, width:50, align:"center"},
-								{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:80, align:"center"},
-							    {name:'startDate',index:'startDate', sortable:true, editable:false, search:false, width:85, align:"left"},
-							    {name:'finishDate',index:'finishDate', sortable:false, editable:false, search:false, width:85, align:"left"},
+								{name:'rowName',  index:'rowName', sortable:false, editable: false, width: 150},
+								{name:'status',  index:'status', sortable:false, editable:false, width:30, align:"center"},
+								{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:51, align:"center",
+									cellattr: function(rowID, val, rawObject, cm, rdata) {
+							    	    return 'title="' + rdata.startDate + ' - ' + rdata.finishDate;
+							    	}
+						    	},
+							    {name:'startDate',index:'startDate', width:0, hidden: true},
+							    {name:'finishDate',index:'finishDate', width:0, hidden: true},
 								{name:'feedback',  index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, width:200, hidden:true},
-								{name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" }
+								{name:'outcome', index:'outcome', sortable:false, editable: false,
+									cellattr: function(rowID, val, rawObject, cm, rdata) {
+							    	    return 'style="text-align:' + (rdata.outcome.startsWith('[') ? 'left"' : 'center"');
+							    	}
+						    	},
+								{name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:49, align:"center" }
 						     ],
 						     loadError: function(xhr,st,err) {
-						    		jQuery("#"+subgrid_table_id).clearGridData();
+						    	jQuery("#"+subgrid_table_id).clearGridData();
 						 	 	alert("<fmt:message key="gradebook.error.loaderror"/>");
 						     },
 						     formatCell: function(rowid, cellname,value, iRow, iCol) {
@@ -282,7 +301,6 @@
 					    	 	}
 					    	 },
 						     afterSaveCell: function(rowid, cellname,value, iRow, iCol) {
-						     	
 						     	var currRowData = jQuery("#"+subgrid_table_id).getRowData(rowid);
 						     	if (cellname == "mark") {
 							     	
@@ -305,8 +323,70 @@
 						     	alert("<fmt:message key="error.cellsave"/>");
 						     },
 							 gridComplete: function(){
-							 	toolTip($(".jqgrow"), "jqgridTooltip");
 							 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
+
+							 	// if there are outcomes mapped to this activity, make them editable
+							 	var subgrid = $(this);
+							 	$('tr[role="row"]', subgrid).each(function(){
+								 	// find out row ID
+								 	var row = $(this),
+								 		id = row.attr('id');
+							 		// first row does not have ID
+								 	if (id) {
+									 	// content is JSON code sent from server
+								 		var content = $(subgrid).jqGrid('getCell', id, 'outcome');
+										if (content && content.startsWith('[')) {
+											var outcomes = JSON.parse(content),
+												outcomeValues = {},
+												result = '';
+											// go through each JSON item
+											$.each(outcomes, function() {
+												// assign values 0..n to ordered value names
+												var editablePossibleValues = this.possibleValues.map(function(value, index){
+													return {
+														value : index,
+														text  : value
+													}
+												});
+												// add a marker for unsetting result
+												editablePossibleValues.unshift({
+													value : -1,
+													text  : '<fmt:message key="outcome.result.not.set"/>'
+												});
+												outcomeValues[this.mappingId] = editablePossibleValues;
+												// build HTML code for x-editable
+												result += '<span title="' + this.code + '">' + this.name + 
+														': <a href="#" class="outcome" mappingId="' + this.mappingId + '"></a></span><br />';
+											});
+											// set HTML to the cell
+											$(subgrid).jqGrid('setCell', id, 'outcome', result);
+
+											// enable editable for each outcome
+											$('.outcome', row).each(function() {
+												var editable = $(this),
+													mappingId = editable.attr('mappingId');
+												editable.editable({
+												    type: 'select',
+												    emptytext : '<fmt:message key="outcome.result.error"/>',
+												    pk : mappingId,
+												    // a trick to send extra param to the server
+												    name : userID,
+												    url : '<lams:LAMSURL/>outcome.do?method=outcomeSetResult',
+												    mode : 'inline',
+												    source : outcomeValues[mappingId],
+												    // sending -1 removes the result
+												    value : typeof this.value == 'undefined' ? -1 : this.value,
+												    success: function(response, newValue) {
+													    if (response != "OK"){
+														    // it will set the value to empty and display emptytext, i.e. "ERROR!"
+														    return {'newValue' : null}
+														}
+													}
+												});
+											});
+										}
+							 		}
+								 });
 							 },
 							 subGrid : hasArchivedMarks,
 							 subGridRowExpanded: function(subgrid_id, row_id) {
@@ -339,9 +419,13 @@
 									       	{name:'id', index:'id',  sortable:false, editable: false ,width:70, align:"right"},
 											{name:'lessonMark',  index:'lessonMark', sortable:false, editable: false, width:80, align:"center" },
 											{name:'status',  index:'status', sortable:false, editable:false, width:50, align:"center"},
-											{name:'timeTaken',index:'timeTaken', sortable:false, editable: false, width:80, align:"center"},
-										    {name:'startDate',index:'startDate', sortable:false, editable:false, search:false, width:85, align:"left"},
-										    {name:'finishDate',index:'finishDate', sortable:false, editable:false, search:false, width:85, align:"left"},
+											{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:51, align:"center",
+												cellattr: function(rowID, val, rawObject, cm, rdata) {
+										    	    return 'title="' + rdata.startDate + ' - ' + rdata.finishDate;
+										    	}
+									    	},
+										    {name:'startDate',index:'startDate', width:0, hidden: true},
+										    {name:'finishDate',index:'finishDate', width:0, hidden: true},
 											{name:'feedback',  index:'feedback', sortable:false, editable: false, width:200, hidden:true},
 											{name:'mark', index:'mark', sortable:false, editable: false, width:50, align:"center" }
 									     ],
@@ -384,7 +468,6 @@
 					  
 					},
 					gridComplete: function(){
-						toolTip($(".jqgrow"), "jqgridTooltip");  // Allow tooltips for this grid	
 				   	 	initializePortraitPopover('<lams:LAMSURL/>');
 						// Load dates shown but hide straight away as all columns needed initially so that subgrid is displayed properly LDEV-4289
 						processLessonDateFields( lessonDatesHidden );
@@ -403,10 +486,11 @@
 				    height: "100%",
 				    width: jqgridWidth,
 				    shrinkToFit: false,
+				    cmTemplate: { title: false },
 				    cellEdit: true,
 				    pager: "activityViewPager",
 				    rowList:[10,20,30,40,50,100],
-				    	rowNum:10,
+				    rowNum:10,
 				    sortorder: "asc", 
 				    sortname: "activityId", 
 				    colNames:[
@@ -426,9 +510,9 @@
 				      {name:'avgMark',index:'avgMark', sortable:true, editable:false, width:50, align:"center"}
 				    ],
 				    loadError: function(xhr,st,err) {
-			    			jQuery("#activityView").clearGridData();
-			    			alert("<fmt:message key="gradebook.error.loaderror"/>");
-			    		},
+			    		jQuery("#activityView").clearGridData();
+			    		alert("<fmt:message key="gradebook.error.loaderror"/>");
+			    	},
 				    subGrid: true,
 					subGridRowExpanded: function(subgrid_id, row_id) {
 					   var subgrid_table_id;
@@ -445,6 +529,7 @@
 						     url: "<lams:LAMSURL />/gradebook/gradebook.do?dispatch=getUserGridData&view=monActivityView&lessonID=${lessonDetails.lessonID}&activityID=" + activityID + "&groupId=" + groupID,
 						     height: "100%",
 						     autowidth:true,
+						     cmTemplate: { title: false },
 						     cellEdit:true,
 						     cellurl: "<lams:LAMSURL />/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradebookData&lessonID=${lessonDetails.lessonID}&view=monActivityView&activityID=" + activityID,
 						     sortorder: "asc", 
@@ -462,17 +547,21 @@
 						    	"<fmt:message key="gradebook.columntitle.completeDate"/>", 
 						     	"<fmt:message key="gradebook.columntitle.activityFeedback"/>", 
 						     	"<fmt:message key="gradebook.columntitle.mark"/>",
-							    	'portraitId',
+							    'portraitId',
 						     	'activityURL'
 						     ],
 						     colModel:[
 						     	{name:'id', index:'id', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 						     	{name:'marksAvailable',index:'marksAvailable', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
 						     	{name:'rowName',index:'rowName', sortable:true, editable:false, formatter:userNameFormatterActivity},
 						      	{name:'status', index:'status', sortable:false, editable:false, search:false, width:30, align:"center"},
-						      	{name:'timeTaken', index:'timeTaken', sortable:true, editable: false, search:false, width:80, align:"center"},
-							    {name:'startDate',index:'startDate', sortable:true, editable:false, search:false, width:85, align:"left"},
-							    {name:'finishDate',index:'finishDate', sortable:false, editable:false, search:false, width:85, align:"left"},
+								{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:51, align:"center",
+									cellattr: function(rowID, val, rawObject, cm, rdata) {
+							    	    return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
+							    	}
+						    	},
+							    {name:'startDate',index:'startDate', width:0, hidden: true},
+							    {name:'finishDate',index:'finishDate', width:0, hidden: true},
 						     	{name:'feedback',index:'feedback', sortable:false, editable:true, edittype:'textarea', editoptions:{rows:'4',cols:'20'} , search:false, width:200, hidden:true},
 						     	{name:'mark',index:'mark', sortable:true, editable:true, editrules:{number:true}, search:false, width:50, align:"center"},
 						     	{name:'portraitId', index:'portraitId', width:0, hidden: true},
@@ -546,7 +635,6 @@
 						     	alert("<fmt:message key="error.cellsave"/>");
 						     },
 							 gridComplete: function(){
-							 	toolTip($(".jqgrow"), "jqgridTooltip");	// applying tooltips for this grid
 						   	 	initializePortraitPopover('<lams:LAMSURL/>');
 						   	 	fixPagerInCenter(subgrid_table_id+"_pager", 1);
 							 }
@@ -555,7 +643,6 @@
 
 					},
 					 gridComplete: function(){
-					 	toolTip($(".jqgrow"), "jqgridTooltip");	// enable tooltips for grid
 					 	fixPagerInCenter('activityViewPager', 0);
 					 }	 
 				}).navGrid("#activityViewPager", {edit:false,add:false,del:false,search:false}); // enable refresh button
@@ -807,10 +894,7 @@
 				<br />
 				
 				<table id="activityView" class="scroll" ></table>
-				<div id="activityViewPager" class="scroll" ></div>	
-				
-				<%-- not #tooltip as it conflicts with the learner progress tooltip --%>
-				<div class="tooltip-lg" id="jqgridTooltip"></div> 
+				<div id="activityViewPager" class="scroll" ></div>
 			</div>
 	 
 	<c:if test="not isInTabs">