Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5260' into v4.7

Conflicts:

lams_build/3rdParty.userlibraries

  1. … 6 more files in changeset.
LDEV-5292 Sync RAT activities questions in TBL sequences

  1. … 12 more files in changeset.
LKC-89 Show answer justification in TBL monitoring

LDEV-4385 Display (in)correct matching pairs in TBL monitoring better

LDEV-3580 Display each correct/incorrect matching answer

LDEV-4385 List possible and chosen matching pairs answers

  1. … 3 more files in changeset.
LDEV-5242 Merge changes from 4.5

  1. … 4 more files in changeset.
LDEV-5242 Fix Assessment question summary page

  1. … 2 more files in changeset.
LDEV-5273 Do not show blank VS answers for allocation

  1. … 1 more file in changeset.
LDEV-5273 Add VSA allocation to Scratchie

  1. … 17 more files in changeset.
LDEV-5273 Remove single VSA allocation interface from Assessment

Since UI for VSA allocation moved to Central, it is more difficult to

make it embedded within a tools own monitoring interface. It is probably

not needed too - a well designed VSA allocation UI for all questions

should be sufficient.

  1. … 4 more files in changeset.
LDEV-5273 Move VSA allocation code to Central

  1. … 17 more files in changeset.
LDEV-5272 Apply VSA UI improvements to single question summary page

  1. … 8 more files in changeset.
LDEV-5272 Allow deallocating answers from VSA options

Also fix a bug: when a teacher allocates an answer, the learner's

question result UID was used. If the learner changed his/her answer

before teacher allocated it or refreshed the page, the new answer got

allocated while the teacher thought the old one was getting allocated.

Now all allocation happens based on real answer value.

Also recalculate scores on allocation even if a learner has not finished

the activity yet.

  1. … 2 more files in changeset.
LDEV-5271 Check if VS answer is not already allocated to target option

LDEV-5271 Add extra logs for VS answer allocation

LDEV-5271 Add flushing to allocating VS answers

Updated options will be available quicker this way

LDEV-5271 Refactor code for VS answer allocation

LDEV-5271 Refactor code for checking if VS answer was allocated

LDEV-5271 Correctly remove answer from previously allocated option

LDEV-5271 Do not normalise VSA answer twice

LDEV-5260 Add utility class for global Flux management

  1. … 3 more files in changeset.
LDEV-5260 Improve Flux cancellation mechanism

  1. … 2 more files in changeset.
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. … 4 more files in changeset.
LDEV-5260 Emit chart update only when new data is available

LDEV-5260 Skip Flux retransmissions if data has not changed

LDEV-5260 Rewrite test implementation using Reactor Flux instead of SSE

LDEV-5260 Initial implementation of EventSource-powered chart

  1. … 2 more files in changeset.
LDEV-4762 Fix saving option order in ordering question

TreeSet.addAll() seems not to work correctly in some cases

https://bugs.java.com/bugdatabase/view_bug.do?bug_id=6385838

LDEV-5125 Improve support for VSA questions import from Word file

VSA questions should have 2 options if they are going to be TBL

compatible. When importing from Word document only correct answers

option is required. The other one, incorrect answers option, now gets

added automatically. Also incorrect answers option does not get deleted

after editing via QB interface.

  1. … 3 more files in changeset.