lams-github / lams_tool_assessment / web

pages

Clone Tools

Stats

Commits this week: 0
Total Committers: 13
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
    • -26
    • +23
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/parts/markhedging.jsp
    • -1
    • +1
    ./learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./learning/parts/multiplechoice.jsp
    • -29
    • +9
    ./learning/parts/ordering.jsp
    • -6
    • +0
    ./learning/results/ordering.jsp
    • -1
    • +1
    ./monitoring/parts/masterDetailLoadUp.jsp
    • -18
    • +9
    ./monitoring/parts/questionsummary.jsp
    • -20
    • +8
    ./monitoring/parts/usersummary.jsp
    • -12
    • +16
    ./monitoring/summary.jsp
    • -1
    • +6
    ./tblmonitoring/assessment.jsp
  12. … 44 more files in changeset.
Tuesday 25 Jun 2019
7:09 pm

Andrey Balan

LDEV-4833 Move import/export questions in XML format feature to QB

Options
    • -6
    • +0
    ./authoring/basic.jsp
    • -101
    • +0
    ./authoring/importQuestions.jsp
    • -12
    • +0
    ./authoring/parts/questionlist.jsp
  4. … 5 more files in changeset.
Monday 24 Jun 2019
7:18 pm

Andrey Balan

LKC-202 AEs "Show student’s choices” page to show real question title

Options
    • -1
    • +10
    ./tblmonitoring/assessmentStudentChoices.jsp
Wednesday 19 Jun 2019
12:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -0
    • +1
    ./authoring/parts/addessay.jsp
    • -0
    • +1
    ./authoring/parts/addmarkhedging.jsp
    • -0
    • +1
    ./authoring/parts/addmatchingpairs.jsp
    • -0
    • +1
    ./authoring/parts/addmultiplechoice.jsp
    • -0
    • +1
    ./authoring/parts/addnumerical.jsp
    • -0
    • +1
    ./authoring/parts/addordering.jsp
    • -0
    • +1
    ./authoring/parts/addshortanswer.jsp
    • -0
    • +1
    ./authoring/parts/addtruefalse.jsp
  9. … 21 more files in changeset.
Friday 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

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

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

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

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

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -1
    • +1
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/parts/markhedging.jsp
    • -1
    • +1
    ./learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./learning/parts/multiplechoice.jsp
    • -1
    • +1
    ./learning/parts/ordering.jsp
    • -18
    • +9
    ./monitoring/parts/questionsummary.jsp
    • -20
    • +8
    ./monitoring/parts/usersummary.jsp
    • -12
    • +16
    ./monitoring/summary.jsp
    • -1
    • +6
    ./tblmonitoring/assessment.jsp
  10. … 86 more files in changeset.
Thursday 30 May 2019
2:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -29
    • +1
    ./authoring/basic.jsp
    • -9
    • +0
    ./authoring/parts/questionlist.jsp
  3. … 11 more files in changeset.
Wednesday 29 May 2019
4:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -3
    • +2
    ./monitoring/statisticpart.jsp
  2. … 9 more files in changeset.
3:02 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Assessment tool monitoring

Options
    • -167
    • +231
    ./monitoring/statisticpart.jsp
  2. … 2 more files in changeset.
Monday 13 May 2019
2:35 pm

Andrey Balan

LDEV-4777 Show question details for all question types

Options
    • -1
    • +1
    ./authoring/parts/questionlist.jsp
  2. … 4 more files in changeset.
Friday 10 May 2019
11:59 pm

Andrey Balan

LDEV-4777 Search QB interface is now available in Assessment tool

Options
    • -2
    • +2
    ./authoring/basic.jsp
    • -1
    • +1
    ./authoring/importQuestions.jsp
    • -1
    • +1
    ./authoring/parts/addessay.jsp
    • -1
    • +1
    ./authoring/parts/addmarkhedging.jsp
    • -1
    • +1
    ./authoring/parts/addmatchingpairs.jsp
    • -1
    • +1
    ./authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./authoring/parts/addnumerical.jsp
    • -1
    • +1
    ./authoring/parts/addordering.jsp
    • -1
    • +1
    ./authoring/parts/addshortanswer.jsp
    • -1
    • +1
    ./authoring/parts/addtruefalse.jsp
    • -4
    • +4
    ./authoring/parts/questionlist.jsp
  12. … 4 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -17
    • +17
    ./authoring/basic.jsp
    • -7
    • +7
    ./authoring/parts/addessay.jsp
    • -8
    • +8
    ./authoring/parts/addmarkhedging.jsp
    • -8
    • +8
    ./authoring/parts/addmatchingpairs.jsp
    • -15
    • +15
    ./authoring/parts/addmultiplechoice.jsp
    • -16
    • +16
    ./authoring/parts/addnumerical.jsp
    • -8
    • +8
    ./authoring/parts/addordering.jsp
    • -15
    • +15
    ./authoring/parts/addshortanswer.jsp
    • -7
    • +7
    ./authoring/parts/addtruefalse.jsp
    • -1
    • +1
    ./authoring/parts/gradeselector.jsp
    • -4
    • +4
    ./authoring/parts/matchingpairoption.jsp
    • -3
    • +3
    ./authoring/parts/numericaloption.jsp
    • -2
    • +2
    ./authoring/parts/option.jsp
    • -4
    • +4
    ./authoring/parts/optionhedgingmark.jsp
    • -4
    • +4
    ./authoring/parts/optionlist.jsp
  16. … 66 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
    • -6
    • +10
    ./authoring/parts/addessay.jsp
    • -13
    • +14
    ./authoring/parts/addmarkhedging.jsp
    • -8
    • +14
    ./authoring/parts/addmatchingpairs.jsp
    • -8
    • +16
    ./authoring/parts/addmultiplechoice.jsp
    • -9
    • +19
    ./authoring/parts/addnumerical.jsp
    • -7
    • +13
    ./authoring/parts/addordering.jsp
    • -8
    • +16
    ./authoring/parts/addshortanswer.jsp
    • -12
    • +19
    ./authoring/parts/addtruefalse.jsp
    • -1
    • +3
    ./authoring/parts/optionlist.jsp
  10. … 4 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
    • -1
    • +0
    ./monitoring/monitoring.jsp
    • -1
    • +0
    ./monitoring/parts/questionsummary.jsp
    • -1
    • +0
    ./monitoring/parts/usersummary.jsp
  4. … 5 more files in changeset.
12:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -4
    • +8
    ./monitoring/monitoring.jsp
    • -1
    • +1
    ./monitoring/parts/masterDetailLoadUp.jsp
    • -17
    • +9
    ./monitoring/parts/questionsummary.jsp
    • -19
    • +8
    ./monitoring/parts/usersummary.jsp
    • -12
    • +16
    ./monitoring/summary.jsp
  6. … 23 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
    • -6
    • +12
    ./authoring/parts/addessay.jsp
    • -66
    • +13
    ./authoring/parts/addmarkhedging.jsp
    • -4
    • +10
    ./authoring/parts/addmatchingpairs.jsp
    • -12
    • +24
    ./authoring/parts/addmultiplechoice.jsp
    • -2
    • +5
    ./authoring/parts/addnumerical.jsp
    • -2
    • +5
    ./authoring/parts/addordering.jsp
    • -3
    • +6
    ./authoring/parts/addshortanswer.jsp
    • -3
    • +6
    ./authoring/parts/addtruefalse.jsp
    • -1
    • +2
    ./authoring/parts/optionhedgingmark.jsp
    • -74
    • +4
    ./authoring/parts/optionlist.jsp
  11. … 4 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
    • -1
    • +1
    ./authoring/parts/optionhedgingmark.jsp
    • -6
    • +18
    ./authoring/parts/optionlist.jsp
  3. … 2 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
    • -14
    • +23
    ./authoring/parts/addessay.jsp
    • -5
    • +8
    ./authoring/parts/addmarkhedging.jsp
    • -12
    • +20
    ./authoring/parts/addmatchingpairs.jsp
    • -45
    • +50
    ./authoring/parts/addmultiplechoice.jsp
    • -12
    • +20
    ./authoring/parts/addnumerical.jsp
    • -12
    • +20
    ./authoring/parts/addordering.jsp
    • -20
    • +31
    ./authoring/parts/addshortanswer.jsp
    • -12
    • +20
    ./authoring/parts/addtruefalse.jsp
    • -3
    • +3
    ./authoring/parts/numericaloption.jsp
    • -2
    • +2
    ./authoring/parts/option.jsp
    • -2
    • +2
    ./authoring/parts/optionhedgingmark.jsp
    • -4
    • +138
    ./authoring/parts/optionlist.jsp
    • -1
    • +1
    ./authoring/parts/shortansweroption.jsp
  14. … 6 more files in changeset.
Monday 25 Mar 2019
8:52 pm

Andrey Balan

LDEV-4794 TBLmonitor display question numbering only if setting is ON

Options
    • -1
    • +6
    ./tblmonitoring/assessment.jsp
Friday 15 Mar 2019
3:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

Options
    • -1
    • +1
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/parts/markhedging.jsp
    • -1
    • +1
    ./learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./learning/parts/multiplechoice.jsp
    • -1
    • +1
    ./learning/parts/ordering.jsp
  6. … 1 more file in changeset.
3:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

Options
    • -1
    • +1
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/parts/markhedging.jsp
    • -1
    • +1
    ./learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./learning/parts/multiplechoice.jsp
    • -1
    • +1
    ./learning/parts/ordering.jsp
  6. … 1 more file in changeset.
Tuesday 12 Mar 2019
11:13 pm

Andrey Balan

LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

Options
    • -0
    • +17
    ./authoring/parts/questionlist.jsp
  2. … 14 more files in changeset.
Thursday 28 Feb 2019
3:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -14
    • +28
    ./authoring/advance.jsp
    • -1
    • +1
    ./monitoring/parts/questionsummary.jsp
    • -2
    • +2
    ./monitoring/statisticpart.jsp
    • -5
    • +5
    ./tblmonitoring/assessment.jsp
    • -3
    • +3
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -3
    • +3
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  7. … 38 more files in changeset.
Thursday 14 Feb 2019
4:21 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

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

Options
    • -26
    • +23
    ./learning/learning.jsp
    • -29
    • +9
    ./learning/parts/ordering.jsp
    • -6
    • +0
    ./learning/results/ordering.jsp
  4. … 1 more file in changeset.
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./authoring/parts/optionlist.jsp
    • -1
    • +1
    ./authoring/parts/overallfeedbacklist.jsp
    • -2
    • +2
    ./authoring/parts/questionlist.jsp
    • -1
    • +1
    ./authoring/parts/questionlistRestricted.jsp
    • -1
    • +1
    ./learning/parts/essay.jsp
    • -1
    • +1
    ./learning/parts/markhedging.jsp
    • -1
    • +1
    ./learning/parts/matchingpairs.jsp
    • -1
    • +1
    ./learning/parts/multiplechoice.jsp
    • -1
    • +1
    ./learning/parts/numerical.jsp
    • -1
    • +1
    ./learning/parts/ordering.jsp
    • -1
    • +1
    ./learning/parts/shortanswer.jsp
    • -1
    • +1
    ./learning/parts/truefalse.jsp
    • -2
    • +2
    ./learning/results/essay.jsp
    • -1
    • +1
    ./learning/results/markhedging.jsp
    • -1
    • +1
    ./learning/results/matchingpairs.jsp
  16. … 377 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
    • -26
    • +23
    ./learning/learning.jsp
    • -29
    • +9
    ./learning/parts/ordering.jsp
    • -6
    • +0
    ./learning/results/ordering.jsp
  4. … 5 more files in changeset.
11:58 pm

Andrey Balan

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

Options
    • -26
    • +23
    ./learning/learning.jsp
    • -29
    • +9
    ./learning/parts/ordering.jsp
    • -6
    • +0
    ./learning/results/ordering.jsp
  4. … 5 more files in changeset.
Friday 08 Feb 2019
2:40 pm

Andrey Balan

LDEV-4765 Fixed essay's slider CSS and validation

Options
    • -5
    • +13
    ./authoring/parts/addessay.jsp
  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
    • -65
    • +65
    ./authoring/parts/addessay.jsp
    • -52
    • +127
    ./authoring/parts/addmarkhedging.jsp
    • -43
    • +43
    ./authoring/parts/addmatchingpairs.jsp
    • -61
    • +61
    ./authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./authoring/parts/addnumerical.jsp
    • -1
    • +0
    ./authoring/parts/addordering.jsp
    • -4
    • +4
    ./authoring/parts/numericaloption.jsp
    • -6
    • +12
    ./authoring/parts/optionhedgingmark.jsp
    • -4
    • +4
    ./authoring/parts/unitlist.jsp
  10. … 1 more file in changeset.
Wednesday 06 Feb 2019
9:52 pm

Andrey Balan

LDEV-4765 Apply new UI to other question types

Options
    • -96
    • +96
    ./authoring/parts/addessay.jsp
    • -141
    • +105
    ./authoring/parts/addmarkhedging.jsp
    • -116
    • +91
    ./authoring/parts/addmatchingpairs.jsp
    • -497
    • +154
    ./authoring/parts/addmultiplechoice.jsp
    • -144
    • +109
    ./authoring/parts/addnumerical.jsp
    • -126
    • +93
    ./authoring/parts/addordering.jsp
    • -116
    • +93
    ./authoring/parts/addshortanswer.jsp
    • -104
    • +88
    ./authoring/parts/addtruefalse.jsp
    • -48
    • +9
    ./authoring/parts/gradeselector.jsp
    • -10
    • +7
    ./authoring/parts/matchingpairoption.jsp
    • -30
    • +16
    ./authoring/parts/numericaloption.jsp
    • -16
    • +6
    ./authoring/parts/option.jsp
    • -22
    • +20
    ./authoring/parts/optionhedgingmark.jsp
    • -9
    • +1
    ./authoring/parts/optionlist.jsp
    • -6
    • +4
    ./authoring/parts/orderingoption.jsp
  16. … 9 more files in changeset.
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -3
    • +3
    ./authoring/advance.jsp
    • -1
    • +1
    ./authoring/basic.jsp
    • -4
    • +4
    ./authoring/importQuestions.jsp
    • -3
    • +3
    ./authoring/parts/addessay.jsp
    • -3
    • +3
    ./authoring/parts/addmarkhedging.jsp
    • -3
    • +3
    ./authoring/parts/addmatchingpairs.jsp
    • -3
    • +3
    ./authoring/parts/addmultiplechoice.jsp
    • -3
    • +3
    ./authoring/parts/addnumerical.jsp
    • -3
    • +3
    ./authoring/parts/addordering.jsp
    • -3
    • +3
    ./authoring/parts/addshortanswer.jsp
    • -3
    • +3
    ./authoring/parts/addtruefalse.jsp
    • -4
    • +4
    ./authoring/parts/questionlist.jsp
    • -2
    • +2
    ./authoring/parts/questionlistRestricted.jsp
    • -1
    • +1
    ./learning/learning.jsp
    • -1
    • +1
    ./learning/notebook.jsp
  16. … 492 more files in changeset.