Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-4520'

  1. … 1 more file in changeset.
LDEV-4520 Reimplement student choices page in case of Assessment iRA

It should follow the format of Student choices page in case of MCQ iRA.

    • -2
    • +11
    ./pages/tblmonitoring/assessment.jsp
    • -0
    • +139
    ./pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 10 more files in changeset.
LDEV-4520 Fix export excel feature for AEs tab

LKC-89 Add TBL Monitoring code specific for the tools

Add TblMonitoringAction classes and /tblmonitoring/*.jsps to the

tools projects. They will be consumed solely by lams_monitoring

to generate tool specific content required for TBL Monitoring.

Tools themselves won't use those classes and jsps.

    • -0
    • +193
    ./pages/tblmonitoring/assessment.jsp
    • -0
    • +122
    ./pages/tblmonitoring/assessmentStudentChoices.jsp
    • -0
    • +37
    ./pages/tblmonitoring/teams.jsp
    • -0
    • +92
    ./pages/tblmonitoring/userresponse.jsp
  1. … 45 more files in changeset.
LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

  1. … 33 more files in changeset.
LDEV-4421 Comments allowed for authored items in Share Resources

  1. … 65 more files in changeset.
LDEV-4473 Add bootstrap.js when it's not available on page

  1. … 30 more files in changeset.
LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

    • -1
    • +1
    ./pages/learning/parts/confidencelevel.jsp
  1. … 4 more files in changeset.
LDEV-4436 Ability to change portrait in learner

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

    • -0
    • +5
    ./includes/css/monitoring.scss
    • -3
    • +4
    ./pages/monitoring/parts/questionsummary.jsp
    • -3
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  1. … 6 more files in changeset.
LDEV-4456 Warn users when there is no questions in question list

  1. … 1 more file in changeset.
LDEV-4445 Question page in monitor has portraits

    • -4
    • +21
    ./pages/monitoring/parts/questionsummary.jsp
  1. … 4 more files in changeset.
LDEV-4451 Make slider neater (narrower and with lesser text size)

  1. … 1 more file 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.

    • -33
    • +0
    ./includes/javascript/monitoring.js
    • -6
    • +2
    ./pages/monitoring/parts/questionsummary.jsp
    • -8
    • +4
    ./pages/monitoring/parts/usersummary.jsp
  1. … 12 more files in changeset.
LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

    • -0
    • +33
    ./includes/javascript/monitoring.js
    • -0
    • +4
    ./pages/learning/parts/allquestions.jsp
    • -0
    • +13
    ./pages/learning/parts/confidencelevel.jsp
    • -0
    • +4
    ./pages/learning/results/allquestions.jsp
    • -0
    • +13
    ./pages/learning/results/confidencelevel.jsp
    • -2
    • +6
    ./pages/monitoring/parts/masterDetailLoadUp.jsp
    • -14
    • +20
    ./pages/monitoring/parts/questionsummary.jsp
    • -14
    • +23
    ./pages/monitoring/parts/usersummary.jsp
  1. … 17 more files in changeset.
LDEV-4443: Ooops

swap file shouldn't have been committed. Too many terminals open :-)

    • binary
    ./pages/monitoring/.editactivity.jsp.swp
LDEV-4443: warning when editing activity that has been already used.

Currently when editing an assessment or voting activity in monitor, if an answer is changed, the data associated with that question is removed.

So if students have already completed the activity, their answers/marks will be removed and will shown as not answered.

We currently give no warning to monitors when they do this, so we should.

    • binary
    ./pages/monitoring/.editactivity.jsp.swp
  1. … 11 more files in changeset.
LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

  1. … 44 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

    • -1
    • +1
    ./pages/monitoring/parts/reflections.jsp
  1. … 70 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

    • -1
    • +1
    ./pages/monitoring/parts/reflections.jsp
  1. … 71 more files in changeset.
LDEV-4406: Timing count preserved across page switch, Submit All

Also fixed a validation bug with Essay questions that had a

minimum word count but were not required.

LDEV-4406: Timing count preserved across page switch, Submit All

Also fixed a validation bug with Essay questions that had a

minimum word count but were not required.

  1. … 1 more file in changeset.
LDEV-4402 Use Spring support for Hibernate v5 instead of v4

WF10 is shipped with Hibernate 5, so Spring support version should

match.

  1. … 19 more files in changeset.
LDEV-4395 Sizing tweaks

  1. … 33 more files in changeset.
LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

    • -0
    • +28
    ./WEB-INF/tags/LeaderDisplay.tag
  1. … 85 more files in changeset.
LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

  1. … 53 more files in changeset.
LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

  1. … 37 more files in changeset.
LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

  1. … 37 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

  1. … 154 more files in changeset.
LDEV-4385: colours for assessment feedback

Depict the tick in green and the cross in red.

    • -2
    • +2
    ./pages/learning/results/markhedging.jsp
    • -2
    • +2
    ./pages/learning/results/matchingpairs.jsp
    • -2
    • +2
    ./pages/learning/results/numerical.jsp
    • -2
    • +2
    ./pages/learning/results/shortanswer.jsp
    • -4
    • +4
    ./pages/learning/results/truefalse.jsp