Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5101 Fix stats link.

    • -2
    • +2
    ./pages/authoring/parts/questionlist.jsp
  1. … 1 more file in changeset.
LDEV-5009 Fix Assessment monitoring if there are no questions added

    • -0
    • +3
    ./pages/monitoring/parts/mcqStudentChoices.jsp
LDEV-5097 Skip empty sessions for rating calculation

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -40
    • +109
    ./pages/authoring/parts/questionlist.jsp
  1. … 28 more files in changeset.
LDEV-5097 Skip empty sessions for rating calculation

  1. … 1 more file in changeset.
LDEV-5129 Move VSA allocation boxes to top

    • -7
    • +7
    ./pages/monitoring/parts/questionsummary.jsp
LDEV-5120 Allow hiding criteria titles in Rating.tag

  1. … 31 more files in changeset.
LDEV-5127 Adjust reported pad height when toolbar is not displayed

  1. … 32 more files in changeset.
LDEV-5127 Fix pad resizing

  1. … 32 more files in changeset.
LDEV-5124, LDEV-2169 Put correct time and answer in learner history

    • -1
    • +2
    ./pages/monitoring/parts/usersummary.jsp
  1. … 3 more files in changeset.
LDEV-5101 Enhacing tooltips assessment

    • -6
    • +6
    ./pages/authoring/parts/questionlist.jsp
LDEV-5101 Fix header in question list in Assessment

    • -1
    • +1
    ./pages/authoring/parts/questionlist.jsp
LDEV-5123 Log learner interaction with questions in Assessment

    • -2
    • +4
    ./pages/learning/parts/multiplechoice.jsp
  1. … 6 more files in changeset.
Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

  1. … 9 more files in changeset.
LDEV-5025 Reset rating permission before each question

Otherwise subsequent questions also allow rating while they should not

yet.

LDEV-5111 Change chart title if it displays groups and not students

  1. … 1 more file in changeset.
LDEV-5101 Allow question version change in Assessment tool

    • -36
    • +89
    ./pages/authoring/parts/questionlist.jsp
  1. … 2 more files in changeset.
LDEV-5111 Display groups instead of students in chart when needed

If Assessment activity uses a leader, then only he gets his answers auto

saved. He counts as one student. But when he finishes the activity, his

answers get copied to other group members. Suddenly instead of 1 student

we get, say, 5 with same answers. This makes the answered questions

chart go crazy.

Now when leader selection is in use, group count is displayed instead of

student count in the chart.

  1. … 4 more files in changeset.
LDEV-5101 Allow global question change initiation from Assessment

    • -1
    • +17
    ./pages/authoring/parts/questionlist.jsp
  1. … 1 more file in changeset.
LDEV-5107: adding MS word imports to Assessment authoring

  1. … 2 more files in changeset.
LDEV-5100 Hide refresh button for TBL monitor in Assessment essay rating

LDEV-5097 removing results view from monitoring

LDEV-5095 Add completion charts to TBL monitor

    • -1
    • +21
    ./pages/tblmonitoring/assessment.jsp
LDEV-5095 Move chart code to separate JS file for reuse in another spot

    • -0
    • +182
    ./includes/javascript/chart.js
    • -22
    • +41
    ./pages/monitoring/monitoring.jsp
LDEV-5095 Make charts more responsive and add some padding

LDEV-5097 Do not show confidence level in TBL monitoring iRAT

    • -13
    • +15
    ./pages/learning/results/allquestions.jsp
LDEV-5095 Add Answered Questions chart and periodic refresh

    • -19
    • +137
    ./pages/monitoring/summary.jsp
  1. … 6 more files in changeset.
LDEV-5095 Calculate Possible Learners correctly

Merge branch 'v4.0' into LDEV-5095

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 2 more files in changeset.
LDEV-5097 Embed teacher's view of Assessment result in TBL monitoring

    • -3
    • +107
    ./pages/learning/results/allquestions.jsp
    • -172
    • +40
    ./pages/tblmonitoring/assessment.jsp
  1. … 1 more file in changeset.