Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java =================================================================== diff -u -rcf4f5ac67d5e9485f04091aeacfb8403d9b71289 -ra7f0b09e9c93e4c320db9034c850c91ffd591032 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision cf4f5ac67d5e9485f04091aeacfb8403d9b71289) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (.../LearningDesignService.java) (revision a7f0b09e9c93e4c320db9034c850c91ffd591032) @@ -563,6 +563,7 @@ return verifyNextActivityFitsTbl(firstActivity, "Grouping", iRatToolContentId, tRatToolContentId); } + @Override public Map getAvailableTBLActivityTypes(Long learningDesignId) { Map result = new HashMap<>(); @@ -597,15 +598,11 @@ Long toolActivityId = toolActivity.getActivityId(); String toolTitle = toolActivity.getTitle(); - //count only the first MCQ or Assessmnet as iRA - if (!iraPassed && (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature) - || isScratchieAvailable && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature))) { + //count only the first Assessmnet as iRA + if (!iraPassed && isScratchieAvailable + && CommonConstants.TOOL_SIGNATURE_ASSESSMENT.equals(toolSignature)) { iraPassed = true; - if (CommonConstants.TOOL_SIGNATURE_MCQ.equals(toolSignature)) { - result.put("isIraMcqAvailable", true); - } else { - result.put("isIraAssessmentAvailable", true); - } + result.put("isIraAvailable", true); result.put("iraToolContentId", toolContentId); result.put("iraToolActivityId", toolActivityId);