lams-github / lams_tool_assessment / web

includes

Clone Tools

Stats

Commits this week: 0
Total Committers: 11
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

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

Options
    • -2
    • +10
    ./css/assessment.scss
  2. … 54 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -4
    • +4
    ./javascript/authoring-options.js
    • -1
    • +1
    ./javascript/authoring-question.js
  3. … 79 more files in changeset.
Monday 29 Apr 2019
11:31 pm

Andrey Balan

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

Options
    • -13
    • +22
    ./css/addQuestion.scss
    • -2
    • +34
    ./javascript/authoring-question.js
  3. … 11 more files in changeset.
Wednesday 24 Apr 2019
11:04 pm

Andrey Balan

LDEV-4814 Wrap text properly in jqGrid

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

jqGrid instances.

Options
    • -5
    • +0
    ./css/monitoring.scss
  2. … 7 more files in changeset.
Wednesday 17 Apr 2019
10:45 pm

Andrey Balan

LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

Options
    • -0
    • +62
    ./css/addQuestion.scss
    • -0
    • +28
    ./css/bootstrap-toggle.scss
    • -0
    • +9
    ./javascript/bootstrap-toggle.js
  4. … 11 more files in changeset.
Tuesday 16 Apr 2019
11:28 pm

Andrey Balan

LDEV-4765 UI improvements

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

blank

* Proper transition on expanding/collapsing options

Options
    • -0
    • +3
    ./css/addQuestion.scss
  2. … 3 more files in changeset.
Wednesday 03 Apr 2019
12:38 am

Andrey Balan

LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

Options
    • -11
    • +41
    ./css/addQuestion.scss
    • -5
    • +0
    ./css/assessment.scss
    • -6
    • +5
    ./javascript/authoring-options.js
  4. … 16 more files in changeset.
Monday 11 Feb 2019
11:58 pm

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

Options
    • -2
    • +10
    ./css/assessment.scss
  2. … 7 more files in changeset.
11:58 pm

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

Options
    • -2
    • +10
    ./css/assessment.scss
  2. … 7 more files in changeset.
Friday 08 Feb 2019
2:40 pm

Andrey Balan

LDEV-4765 Fixed essay's slider CSS and validation

Options
    • -4
    • +9
    ./css/addQuestion.scss
  2. … 1 more file in changeset.
Thursday 07 Feb 2019
10:50 pm

Andrey Balan

LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

Options
    • -1
    • +10
    ./css/addQuestion.scss
  2. … 9 more files in changeset.
Wednesday 06 Feb 2019
9:52 pm

Andrey Balan

LDEV-4765 Apply new UI to other question types

Options
    • -7
    • +241
    ./css/addQuestion.scss
    • -59
    • +0
    ./javascript/assessmentoption.js
    • -0
    • +136
    ./javascript/authoring-options.js
    • -0
    • +48
    ./javascript/authoring-question.js
  5. … 20 more files in changeset.
Thursday 31 Jan 2019
1:09 am

Andrey Balan

LDEV-4765 Add sorting of the question answers

Also some other improvements.

Options
    • -55
    • +1
    ./javascript/assessmentoption.js
  2. … 7 more files in changeset.
Friday 25 Jan 2019
7:07 pm

Andrey Balan

LDEV-4765 introducing new question authoring UI

Options
    • -26
    • +38
    ./javascript/assessmentoption.js
  2. … 12 more files in changeset.
7:07 pm

Andrey Balan

QB_UI introducing new question authoring UI

Options
    • -26
    • +38
    ./javascript/assessmentoption.js
  2. … 12 more files in changeset.
Wednesday 16 May 2018
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4582 Able to add letter prefix to Assessment MCQ Answers

Options
    • -0
    • +8
    ./css/assessment.scss
  2. … 11 more files in changeset.
Wednesday 08 Nov 2017
4:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +5
    ./css/monitoring.scss
  2. … 9 more files in changeset.
Thursday 02 Nov 2017
12:57 am

Andrey Balan

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.

Options
    • -33
    • +0
    ./javascript/monitoring.js
  2. … 16 more files in changeset.
Thursday 26 Oct 2017
1:17 am

Andrey Balan

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.

Options
    • -0
    • +33
    ./javascript/monitoring.js
  2. … 29 more files in changeset.
Monday 10 Jul 2017
4:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 CSS Files removed if they are now generated files using SASS

Options
    • -30
    • +0
    ./css/addQuestion.css
    • -99
    • +0
    ./css/assessment.css
  3. … 41 more files in changeset.
Saturday 01 Jul 2017
5:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -29
    • +19
    ./css/addQuestion.css
    • -0
    • +42
    ./css/addQuestion.scss
    • -69
    • +72
    ./css/assessment.css
    • -0
    • +112
    ./css/assessment.scss
  5. … 155 more files in changeset.
Tuesday 13 Jun 2017
7:03 am

Marcin Cieslak

After migration clean up

Options
    • -1
    • +0
    ./images/.cvsignore
  2. … 314 more files in changeset.
Friday 09 Jun 2017
5:27 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding the Use Leader version of the Mark Charts to Assessment and fixing an update issue with ToolOutput settings.

Options
    • -23
    • +0
    ./css/assessment.css
  2. … 9 more files in changeset.
Wednesday 26 Apr 2017
12:51 pm

Andrey Balan

LDEV-4329 Fixed marked hedging questions' table formatting

Options
    • -2
    • +4
    ./css/assessment.css
  2. … 2 more files in changeset.
Wednesday 12 Apr 2017
6:41 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4212: Improving the look of the result attempts table. Removed no longer used entries from css file. Using bootstrap css values where possible.

Options
    • -66
    • +1
    ./css/assessment.css
Monday 10 Apr 2017
2:41 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4273: Initial check of Assessment's use of histogram. Added a simple summary table of results to the first worksheet in the spreadsheet export - grouping the overall marks received. Modified the SQL code used to do the Monitor screen paging as the CASE appears to be causing the marks to sort as if they were strings, rather than numbers.

Options
    • -0
    • +25
    ./css/assessment.css
  2. … 14 more files in changeset.
Friday 09 Dec 2016
8:31 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4133:Mark hedging validation for justification is not showing properly

Options
    • -1
    • +1
    ./css/assessment.css
  2. … 1 more file in changeset.
Friday 18 Nov 2016
12:33 pm

erniegx <ernieg@gmail.com>

LDEV-3716: fixing growl formatting

Options
    • -4
    • +2
    ./css/assessment.css
  2. … 1 more file in changeset.
Thursday 10 Nov 2016
2:21 pm

Andrey Balan

LDEV-4036 Readjust thickbox positioning

Options
    • -0
    • +5
    ./css/addQuestion.css
  2. … 9 more files in changeset.
Thursday 20 Oct 2016
11:50 pm

erniegx <ernieg@gmail.com>

LDEV-2951: removing unused images from assessment

Options
    • binary
    ./images/completeitem.gif
    • binary
    ./images/cross.gif
    • binary
    ./images/downarrow.gif
    • binary
    ./images/downarrow_disabled.gif
    • binary
    ./images/edit.gif
    • binary
    ./images/incompleteitem.gif
    • binary
    ./images/indicator.gif
    • binary
    ./images/req.gif
    • binary
    ./images/spacer.gif
    • binary
    ./images/tick.gif
    • binary
    ./images/uparrow.gif
    • binary
    ./images/uparrow_disabled.gif
    • binary
    ./images/warning.gif
  14. … 2 more files in changeset.