Index: lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js (.../jquery.jqGrid.confidence-level-formattter.js) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_central/web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js (.../jquery.jqGrid.confidence-level-formattter.js) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -1,8 +1,10 @@ //confidence level column formatter function for jqGrid function gradientNumberFormatter (cellvalue) { var MIN_DATA_VALUE = 0, - MAX_DATA_VALUE = 10; - + MAX_DATA_VALUE = 10, + //default CONFIDENCE_LEVELS_TYPE to 1 + type = confidenceLevelsSettings ? confidenceLevelsSettings.type : '1'; + var dataAsNumber = parseInt(cellvalue, 10); if (dataAsNumber == -1) { return ""; @@ -26,9 +28,44 @@ gradientClass = "gradient-green"; break; } - + + var text = ""; + switch (type) { + case '1': + return '
' + + '
' + + '
' + (dataAsNumber * 10) + '%
' + + '
'; + break; + + case '2': + switch (dataAsNumber) { + case 0: + text = confidenceLevelsSettings.LABEL_NOT_CONFIDENT; + break; + case 5: + text = confidenceLevelsSettings.LABEL_CONFIDENT; + break; + case 10: + text = confidenceLevelsSettings.LABEL_VERY_CONFIDENT; + } + break; + + case '3': + switch (dataAsNumber) { + case 0: + text = confidenceLevelsSettings.LABEL_NOT_SURE; + break; + case 5: + text = confidenceLevelsSettings.LABEL_SURE; + break; + case 10: + text = confidenceLevelsSettings.LABEL_VERY_SURE; + } + } + return '
' + - '
' + - '
' + (dataAsNumber * 10) + '%
' + - '
'; + '
' + + '
' + text + '
' + + ''; }; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java =================================================================== diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java (.../ConfidenceLevelDTO.java) (revision 394f403c289f0fd7808c228840bead5c4e7d5d32) +++ lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java (.../ConfidenceLevelDTO.java) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -1,6 +1,11 @@ package org.lamsfoundation.lams.confidencelevel; public class ConfidenceLevelDTO { + + // confidence levels can be of different types: + public static final int CONFIDENCE_LEVELS_TYPE_0_TO_100 = 1; + public static final int CONFIDENCE_LEVELS_TYPE_CONFIDENT = 2; + public static final int CONFIDENCE_LEVELS_TYPE_SURE = 3; private Integer userId; @@ -10,6 +15,9 @@ private int level; + //confidenceLevel's type: 1)0 to 100, 2)Confident or 3)Sure + private int type; + private Long qbQuestionUid; private Long qbOptionUid; @@ -54,6 +62,14 @@ return this.level; } + public Integer getType() { + return type; + } + + public void setType(Integer type) { + this.type = type; + } + /** */ public void setQbQuestionUid(Long qbQuestionUid) { Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -ra9f95a26e562a58b55c99f2c18e253c151ef457a -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision a9f95a26e562a58b55c99f2c18e253c151ef457a) +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -305,6 +305,13 @@ label.close=Close label.export.time.attempted =Time attempted +label.0.to.100 =0 to 100% +label.scale =Scale +label.not.confident =Not confident +label.confident =Confident +label.very.confident =Very confident +label.not.sure =Not sure +label.sure =Sure +label.very.sure =Very sure - #======= End labels: Exported 337 labels for en AU ===== Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql =================================================================== diff -u --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql (revision 0) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -0,0 +1,15 @@ +-- Turn off autocommit, so nothing is committed if there is an error +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; +----------------------Put all sql statements below here------------------------- + +-- LDEV-4880 Confidence level variations +ALTER TABLE tl_laasse10_assessment ADD COLUMN confidence_levels_type TINYINT DEFAULT 1; +UPDATE lams_tool SET tool_version='20191120' WHERE tool_signature='laasse10'; + +----------------------Put all sql statements above here------------------------- + +-- If there were no errors, commit and restore autocommit to on +COMMIT; +SET AUTOCOMMIT = 1; +SET FOREIGN_KEY_CHECKS=1; \ No newline at end of file Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java =================================================================== diff -u -r114a48edf9af0975b8d67d3240ae2de2a773de46 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 114a48edf9af0975b8d67d3240ae2de2a773de46) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java (.../Assessment.java) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -117,6 +117,9 @@ @Column(name = "enable_confidence_levels") private boolean enableConfidenceLevels; + @Column(name = "confidence_levels_type") + private Integer confidenceLevelsType; + @Column(name = "allow_history_responses") private boolean allowHistoryResponses; @@ -544,7 +547,15 @@ public void setEnableConfidenceLevels(boolean enableConfidenceLevels) { this.enableConfidenceLevels = enableConfidenceLevels; } + + public Integer getConfidenceLevelsType() { + return confidenceLevelsType; + } + public void setConfidenceLevelsType(Integer confidenceLevelsType) { + this.confidenceLevelsType = confidenceLevelsType; + } + public boolean isAllowHistoryResponses() { return allowHistoryResponses; } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java =================================================================== diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java (.../AssessmentImportContentVersionFilter.java) (revision e8a7110708b15579af2c6b31ac52a6da427fef6d) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java (.../AssessmentImportContentVersionFilter.java) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -297,4 +297,8 @@ } }); } + + public void up20191016To20191120() { + this.addField(Assessment.class, "confidenceLevelsType", "1"); + } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java =================================================================== diff -u -r02ce40b60524aa33d326fbda824dcd43f566ab94 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 02ce40b60524aa33d326fbda824dcd43f566ab94) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java (.../AssessmentServiceImpl.java) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -3037,6 +3037,7 @@ confidenceLevelDto.setUserName(userName); confidenceLevelDto.setPortraitUuid(portraitUuid); confidenceLevelDto.setLevel(questionResult.getConfidenceLevel()); + confidenceLevelDto.setType(assessment.getConfidenceLevelsType()); confidenceLevelDto.setQbQuestionUid(qbQuestion.getUid()); confidenceLevelDto.setQbOptionUid(optionUid); @@ -3121,6 +3122,7 @@ confidenceLevelDto.setUserName(userName); confidenceLevelDto.setPortraitUuid(portraitUuid); confidenceLevelDto.setLevel(questionResult.getConfidenceLevel()); + confidenceLevelDto.setType(assessment.getConfidenceLevelsType()); vsaAnswerDTO.getConfidenceLevels().add(confidenceLevelDto); } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java =================================================================== diff -u -r8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 8eefd9a2f57ce5b05eb75908e36bb042c5fe7fce) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -25,7 +25,6 @@ import javax.servlet.http.HttpServletRequest; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.assessment.model.Assessment; /** @@ -34,10 +33,6 @@ * @author Andrey Balan */ public class AssessmentForm { - - private static Logger logger = Logger.getLogger(AssessmentForm.class.getName()); - - // Forum fields private String sessionMapID; private String contentFolderID; private int currentTab; Index: lams_tool_assessment/web/pages/authoring/advance.jsp =================================================================== diff -u -r80821e9537b4e30c38b9ca656076f09d9bcbf316 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 80821e9537b4e30c38b9ca656076f09d9bcbf316) +++ lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -1,4 +1,5 @@ <%@ include file="/common/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.confidencelevel.ConfidenceLevelDTO"%> @@ -69,19 +77,19 @@
@@ -214,6 +222,23 @@ +
+ + Index: lams_tool_assessment/web/pages/learning/learning.jsp =================================================================== diff -u -r02ce40b60524aa33d326fbda824dcd43f566ab94 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 02ce40b60524aa33d326fbda824dcd43f566ab94) +++ lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -28,6 +28,11 @@ + Index: lams_tool_assessment/web/pages/learning/parts/confidencelevel.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/learning/parts/confidencelevel.jsp (.../confidencelevel.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/web/pages/learning/parts/confidencelevel.jsp (.../confidencelevel.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -1,13 +1,35 @@ <%@ include file="/common/taglibs.jsp"%> + + + ["", "", ""] + + + ["", "", ""] + + + ["0", "50", "100%"] + +
data-slider-value="${question.confidenceLevel}" + data-slider-ticks-labels='${confidenceLabels}' + + + data-slider-ticks="[0, 5, 10]" data-slider-step="5" + + + data-slider-ticks="[0, 5, 10]" data-slider-step="5" + + + data-slider-ticks="[0, 5, 10]" + + />
\ No newline at end of file Index: lams_tool_assessment/web/pages/learning/results.jsp =================================================================== diff -u -r3bb7e0141ae1cc15ccd737c95d90b5762a34ad61 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/learning/results.jsp (.../results.jsp) (revision 3bb7e0141ae1cc15ccd737c95d90b5762a34ad61) +++ lams_tool_assessment/web/pages/learning/results.jsp (.../results.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -15,6 +15,9 @@ tr.selected-by-groups span { font-weight: bold; } + .slider.slider-horizontal { + margin-left: 40px; + } Index: lams_tool_assessment/web/pages/learning/results/confidencelevel.jsp =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/learning/results/confidencelevel.jsp (.../confidencelevel.jsp) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_assessment/web/pages/learning/results/confidencelevel.jsp (.../confidencelevel.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -1,13 +1,35 @@ <%@ include file="/common/taglibs.jsp"%> + + + ["", "", ""] + + + ["", "", ""] + + + ["0", "50", "100%"] + +
data-slider-value="${question.confidenceLevel}" + data-slider-ticks-labels='${confidenceLabels}' + + + data-slider-ticks="[0, 5, 10]" data-slider-step="5" + + + data-slider-ticks="[0, 5, 10]" data-slider-step="5" + + + data-slider-ticks="[0, 5, 10]" + + />
\ No newline at end of file Index: lams_tool_assessment/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -rb745384874257ea8327d82156fec0455e4232ad6 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision b745384874257ea8327d82156fec0455e4232ad6) +++ lams_tool_assessment/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -3,6 +3,7 @@ <%@ page import="org.lamsfoundation.lams.tool.assessment.AssessmentConstants"%> + @@ -31,6 +32,15 @@ messageNotification: '', messageRestrictionSet: '', messageRestrictionRemoved: '' + }, + confidenceLevelsSettings = { + type: "${assessment.confidenceLevelsType}", + LABEL_NOT_CONFIDENT : '', + LABEL_CONFIDENT : '', + LABEL_VERY_CONFIDENT : '', + LABEL_NOT_SURE : '', + LABEL_SURE : '', + LABEL_VERY_SURE : '' }; Index: lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp =================================================================== diff -u -re8a7110708b15579af2c6b31ac52a6da427fef6d -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision e8a7110708b15579af2c6b31ac52a6da427fef6d) +++ lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp (.../questionsummary.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -20,6 +20,18 @@ } + Index: lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp =================================================================== diff -u -r394f403c289f0fd7808c228840bead5c4e7d5d32 -r6b89d0c84a5695fb1ad02d5525eb240a9f4d3134 --- lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 394f403c289f0fd7808c228840bead5c4e7d5d32) +++ lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp (.../usersummary.jsp) (revision 6b89d0c84a5695fb1ad02d5525eb240a9f4d3134) @@ -11,6 +11,18 @@ +