Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r330b0d5f8fa4a8deb6d7454f92bdbd289e89cb82 -r9ba7879cb08a303afef12758e4faee709d6567fb --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 330b0d5f8fa4a8deb6d7454f92bdbd289e89cb82) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 9ba7879cb08a303afef12758e4faee709d6567fb) @@ -410,7 +410,6 @@ }, success : function(response) { - // update lesson state label lessonStateId = +response.lessonStateID; var label = null, @@ -478,9 +477,8 @@ lessonFinishDateSpan = $('#lessonFinishDateSpan'), lessonStateChanger = $('#lessonStateChanger'), stateLabel = $('#lessonStateLabel'); - switch (lessonStateId) { - // created but not started lesson + //created but not started lesson case 1: scheduleControls.css('display','inline'); if ( response.finishDate ) { @@ -2431,12 +2429,12 @@ $('.accordion-button', itemHeader) .attr('data-bs-target', '#' + itemCollapseId) .attr('aria-controls', itemCollapseId) - .prepend('' + learner.lastName + ' ' + learner.firstName + '') + .prepend('' + learner.lastName + ', ' + learner.firstName + '') .prepend(portraitSmall); $('.accordion-completed-activity-count', itemHeader).text(learner.completedActivityCount).tooltip(); $('.accordion-completed-lesson', itemHeader).toggle(learner.completedLesson).tooltip(); - $('.learners-accordion-name', item).text(learner.lastName + ' ' + learner.firstName); + $('.learners-accordion-name', item).text(learner.lastName + ', ' + learner.firstName); $('.learners-accordion-login', item).html('' + learner.login); $('.learners-accordion-email', item).html('' + learner.email + ''); Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java =================================================================== diff -u -rd0f4c3bdd871e236755472c8443c337b2b96e48c -r9ba7879cb08a303afef12758e4faee709d6567fb --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision d0f4c3bdd871e236755472c8443c337b2b96e48c) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java (.../AssessmentResultDAOHibernate.java) (revision 9ba7879cb08a303afef12758e4faee709d6567fb) @@ -124,7 +124,7 @@ + " (type = 7 AND mark > 0) OR " + " (type = 8 AND answer_int > 0)" + " ,1, 0)) AS answered_question_count FROM" - + " (SELECT u.user_id, BIN_TO_UUID(u.portrait_uuid) AS portrait_uuid, CONCAT(u.last_name, ' ', u.first_name) AS user_name," + + " (SELECT u.user_id, BIN_TO_UUID(u.portrait_uuid) AS portrait_uuid, CONCAT(u.last_name, ', ', u.first_name) AS user_name," + " s.session_name AS group_name, qbq.type, qr.mark, qbta.answer, oa.answer_boolean, oa.answer_int" + " FROM tl_laasse10_assessment AS a" + " JOIN tl_laasse10_assessment_result AS ar ON a.uid = ar.assessment_uid" @@ -145,7 +145,7 @@ + " GROUP BY qr.uid, u.user_id) AS answered_questions GROUP BY user_id ORDER BY user_name"; private static final String FINISHED_LEARNERS_FOR_COMPLETION_CHART = - "SELECT u.user_id, BIN_TO_UUID(u.portrait_uuid) AS portrait_uuid, CONCAT(u.last_name, ' ', u.first_name) AS user_name, " + "SELECT u.user_id, BIN_TO_UUID(u.portrait_uuid) AS portrait_uuid, CONCAT(u.last_name, ', ', u.first_name) AS user_name, " + " s.session_name AS group_name" + " FROM tl_laasse10_assessment AS a" + " JOIN tl_laasse10_assessment_result AS ar ON a.uid = ar.assessment_uid" Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java =================================================================== diff -u -r56ecfc5d9060efa9fe3dab2de70b2fdc50a380c3 -r9ba7879cb08a303afef12758e4faee709d6567fb --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java (.../AssessmentUserDAOHibernate.java) (revision 56ecfc5d9060efa9fe3dab2de70b2fdc50a380c3) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java (.../AssessmentUserDAOHibernate.java) (revision 9ba7879cb08a303afef12758e4faee709d6567fb) @@ -84,7 +84,7 @@ private static final String FIND_LEARNERS_BY_CONTENT_ID_FOR_COMPLETION_CHART = "SELECT u.user_id, BIN_TO_UUID(u.portrait_uuid) AS portrait_uuid, " - + " CONCAT(u.last_name, ' ', u.first_name) AS user_name, s.session_name AS group_name" + + " CONCAT(u.last_name, ', ', u.first_name) AS user_name, s.session_name AS group_name" + " FROM tl_laasse10_assessment AS a" + " JOIN tl_laasse10_session AS s ON s.assessment_uid = a.uid" + " JOIN tl_laasse10_user AS au ON au.session_uid = s.uid"