Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java =================================================================== diff -u -re7cbd533f52ac2a431c09e7272b1f31769258022 -rb436dbb8397cdcbacaab50eec68b6427a5c6e1e9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java (.../IMcUsrAttemptDAO.java) (revision e7cbd533f52ac2a431c09e7272b1f31769258022) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java (.../IMcUsrAttemptDAO.java) (revision b436dbb8397cdcbacaab50eec68b6427a5c6e1e9) @@ -119,7 +119,7 @@ /** * Checks whether anyone has attempted this assessment. */ - boolean isMcContentAttempted(Long mcContentUid); + boolean isMcContentAttempted(long toolContentId); /** * Calculate what is the total mark scored by user in this activity. Only responseFinalised is taken into account. Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java =================================================================== diff -u -re7cbd533f52ac2a431c09e7272b1f31769258022 -rb436dbb8397cdcbacaab50eec68b6427a5c6e1e9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision e7cbd533f52ac2a431c09e7272b1f31769258022) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java (.../McUsrAttemptDAO.java) (revision b436dbb8397cdcbacaab50eec68b6427a5c6e1e9) @@ -171,12 +171,12 @@ } @Override - public boolean isMcContentAttempted(Long mcContentUid) { - final String IS_USER_ATTEMPT_EXIST_BY_MC_CONTENT = "select COUNT(*) > 0 FROM " + McUsrAttempt.class.getName() - + " AS attempt WHERE attempt.qbToolQuestion.uid=:mcContentUid"; + public boolean isMcContentAttempted(long toolContentId) { + final String IS_USER_ATTEMPT_EXIST_BY_TOOL_CONTENT = "select COUNT(*) > 0 FROM " + McUsrAttempt.class.getName() + + " AS attempt WHERE attempt.qbToolQuestion.toolContentId=:toolContentId"; - Query q = getSession().createQuery(IS_USER_ATTEMPT_EXIST_BY_MC_CONTENT, Boolean.class); - q.setParameter("mcContentUid", mcContentUid); + Query q = getSession().createQuery(IS_USER_ATTEMPT_EXIST_BY_TOOL_CONTENT, Boolean.class); + q.setParameter("toolContentId", toolContentId); return q.uniqueResult(); } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java =================================================================== diff -u -r8e97adb8dda2f984a9b43f71eacd9a5033244bff -rb436dbb8397cdcbacaab50eec68b6427a5c6e1e9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java (.../McController.java) (revision 8e97adb8dda2f984a9b43f71eacd9a5033244bff) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java (.../McController.java) (revision b436dbb8397cdcbacaab50eec68b6427a5c6e1e9) @@ -141,7 +141,7 @@ sessionMap.put(McAppConstants.LIST_DELETED_QUESTION_DTOS, listDeletedQuestionDTOs); boolean isMcContentAttempted = mcContent.getUid() == null ? false - : mcService.isMcContentAttempted(mcContent.getUid()); + : mcService.isMcContentAttempted(mcContent.getMcContentId()); sessionMap.put(McAppConstants.ATTR_IS_AUTHORING_RESTRICTED, isMcContentAttempted && mode.isTeacher()); return "authoring/AuthoringTabsHolder";