Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5260 Rewrite polling to producer-subscriber model

Till now we had "are-learners-answers-updated" polling on controller

level.

It was rewritten to following scenario:

- method which stores learner answers is aware whether answers have

changed, i.e. it knows if charts need to be updated

- it flushes latest data to DB and puts tool content ID to Sink

- Sink notifies all interested Fluxes (currently only charts updating

one, but in the future other ones like updating table with answer % too)

- FluxMap holds a map of tool content ID -> interested hot publisher

Flux

- the Flux checks if it is interested in the tool content ID from the

Sink

- if so, it fetches data from DB and emits it to all subscribers, i.e.

opened monitoring windows with charts displayed

- data is cached so it is immediately available on for the next

subscriber

- data is throttled so calls to DB are not made too often

- if all subscribers are gone, the hot publisher Flux is still active; a

timeout is added which removes it from FluxMap when there were not emits

for the given time

  1. … 6 more files in changeset.
LDEV-5260 Initial implementation of EventSource-powered chart

  1. … 2 more files in changeset.
LDEV-5251 Add proper tooltip for leader-based Assessments

  1. … 1 more file in changeset.
LDEV-5251 Add tooltip with list of students in answered questions chart

  1. … 6 more files in changeset.
LDEV-5200 Remove output CSS files

SCSS generates them on each build.

  1. … 1 more file in changeset.
LDEV-5200 Adjusting icons colours and svg optimisation

Adjust icons and activity colours according to new colour scheme. Optimise SVG compression and pngs.

Adding .DS_Store to .gitignore files

    • -0
    • +39
    ./css/addQuestion.css
    • -0
    • +110
    ./css/assessment.css
  1. … 49 more files in changeset.
LDEV-5187 Combine Mark Hedging and Assessment justifications

Mark Hedging questions have own settings for justification. We should

have a consistent user experience in Assessment, not matter where

justification is set up: on Assessment activity level or on Mark Hedging

question level.

  1. … 9 more files in changeset.
LDEV-5111 Change chart title if it displays groups and not students

  1. … 3 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. … 9 more files in changeset.
LDEV-5095 Move chart code to separate JS file for reuse in another spot

    • -0
    • +182
    ./javascript/chart.js
  1. … 2 more files in changeset.
LDEV-5081 Allow proper saving of redesigned Assessment authoring

  1. … 2 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

    • -135
    • +0
    ./javascript/authoring-options.js
  1. … 72 more files in changeset.
Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# 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/service/McService.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

  1. … 54 more files in changeset.
LDEV-4746 Migrate Assessment to QB

  1. … 79 more files in changeset.
LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

  1. … 11 more files in changeset.
LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

  1. … 7 more files in changeset.
LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

    • -0
    • +28
    ./css/bootstrap-toggle.scss
    • -0
    • +9
    ./javascript/bootstrap-toggle.js
  1. … 11 more files in changeset.
LDEV-4765 UI improvements

* Show CKEditor placeholder properly in cases when it's initially not

blank

* Proper transition on expanding/collapsing options

  1. … 3 more files in changeset.
LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

  1. … 16 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

  1. … 7 more files in changeset.
LDEV-4762 Add drag and drop for answers in ordering question type

  1. … 7 more files in changeset.
LDEV-4765 Fixed essay's slider CSS and validation

  1. … 1 more file in changeset.
LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

  1. … 9 more files in changeset.
LDEV-4765 Apply new UI to other question types

    • -0
    • +136
    ./javascript/authoring-options.js
    • -0
    • +48
    ./javascript/authoring-question.js
  1. … 20 more files in changeset.
LDEV-4765 Add sorting of the question answers

Also some other improvements.

  1. … 7 more files in changeset.
LDEV-4765 introducing new question authoring UI

    • -26
    • +38
    ./javascript/assessmentoption.js
  1. … 12 more files in changeset.
QB_UI introducing new question authoring UI

    • -26
    • +38
    ./javascript/assessmentoption.js
  1. … 12 more files in changeset.
LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

  1. … 11 more files in changeset.
LDEV-4451 Add scss files and fix their names

  1. … 9 more files in changeset.
LDEV-4451 Store ConfidenceLevels inside Assessment

ConfidenceLevels should be stored at the tools level as otherwise it's

hard to keep questions hashes updated in lams_central.

Add support for providing them to Scratchie.

  1. … 16 more files in changeset.