Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
===================================================================
diff -u -r7913826df20868a8bf035076a14ac89d5e615b46 -r710cfecde2c1064dc34197c9219afb9011d2c4e9
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java	(.../TblMonitoringAction.java)	(revision 7913826df20868a8bf035076a14ac89d5e615b46)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java	(.../TblMonitoringAction.java)	(revision 710cfecde2c1064dc34197c9219afb9011d2c4e9)
@@ -358,6 +358,19 @@
     }
 
     private void setupAvailableActivityTypes(HttpServletRequest request, List<Activity> activities) {
+	
+	//check if there is Scratchie activity. It's used only in case of LKC TBL monitoring, when all assessment are treated as AEs
+	boolean isScratchieAvailable = false;
+	for (Activity activity : activities) {
+	    if (activity instanceof ToolActivity) {
+		ToolActivity toolActivity = (ToolActivity) activity;
+		String toolSignature = toolActivity.getTool().getToolSignature();
+		if (CentralConstants.TOOL_SIGNATURE_SCRATCHIE.equals(toolSignature)) {
+		    isScratchieAvailable = true;
+		    break;
+		}
+	    }
+	}
 
 	boolean scratchiePassed = false;
 	boolean iraPassed = false;
@@ -373,7 +386,7 @@
 
 		//count only the first MCQ or Assessmnet as iRA
 		if (!iraPassed && (CentralConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)
-			|| CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) {
+			|| isScratchieAvailable && CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) {
 		    iraPassed = true;
 		    if (CentralConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) {
 			request.setAttribute("isIraMcqAvailable", true);
@@ -387,8 +400,8 @@
 		    continue;
 		}
 
-		//aes are counted only after Scratchie activity
-		if (scratchiePassed && CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
+		//aes are counted only after Scratchie activity, or for LKC TBL monitoring
+		if ((scratchiePassed || !isScratchieAvailable) && CentralConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) {
 		    request.setAttribute("isAeAvailable", true);
 		    //prepare assessment details to be passed to Assessment tool
 		    assessmentToolContentIds += toolContentId + ",";