lams-github / lams_tool_assessment / web / pages / learning

parts

Clone Tools

Stats

Commits this week: 0
Total Committers: 10
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
Thursday 23 Jul 2020
8:11 am

Marcin Cieslak

LDEV-4921 Hide question titles in Assessment

Options
    • -5
    • +8
    ./allquestions.jsp
  2. … 1 more file in changeset.
Tuesday 14 Jul 2020
10:16 am

Ernie Ghiglione

LDEV-5052 rendering question title

Options
    • -4
    • +5
    ./allquestions.jsp
  2. … 1 more file in changeset.
Wednesday 24 Jun 2020
2:37 pm

Marcin Cieslak

LDEV-5033 Add answer justification to Assessment

Options
    • -1
    • +26
    ./allquestions.jsp
  2. … 13 more files in changeset.
Monday 20 Apr 2020
3:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Options
    • -0
    • +29
    ./allquestions.jsp
  2. … 6 more files in changeset.
3:28 pm

Marcin Cieslak

LDEV-5002 Add Etherpads after each question in Assessment

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

Options
    • -0
    • +29
    ./allquestions.jsp
  2. … 6 more files in changeset.
Friday 22 Nov 2019
6:51 pm

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -1
    • +23
    ./confidencelevel.jsp
  2. … 19 more files in changeset.
Saturday 05 Oct 2019
12:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -1
    • +1
    ./allquestions.jsp
    • -17
    • +0
    ./shortanswer.jsp
    • -0
    • +19
    ./vsa.jsp
  4. … 73 more files in changeset.
Monday 05 Aug 2019
7:43 am

Marcin Cieslak

LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

Options
    • -2
    • +2
    ./essay.jsp
    • -1
    • +1
    ./markhedging.jsp
    • -1
    • +1
    ./numerical.jsp
    • -1
    • +1
    ./shortanswer.jsp
    • -1
    • +1
    ./truefalse.jsp
  6. … 19 more files in changeset.
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
    • -1
    • +1
    ./markhedging.jsp
    • -1
    • +1
    ./matchingpairs.jsp
    • -2
    • +2
    ./multiplechoice.jsp
    • -29
    • +9
    ./ordering.jsp
  5. … 51 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
    ./markhedging.jsp
    • -1
    • +1
    ./matchingpairs.jsp
    • -2
    • +2
    ./multiplechoice.jsp
    • -1
    • +1
    ./ordering.jsp
  5. … 91 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -4
    • +4
    ./markhedging.jsp
    • -3
    • +3
    ./matchingpairs.jsp
    • -3
    • +3
    ./multiplechoice.jsp
    • -2
    • +2
    ./ordering.jsp
  5. … 77 more files in changeset.
Friday 15 Mar 2019
3:32 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./markhedging.jsp
    • -1
    • +1
    ./matchingpairs.jsp
    • -2
    • +2
    ./multiplechoice.jsp
    • -1
    • +1
    ./ordering.jsp
  5. … 2 more files 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
    ./markhedging.jsp
    • -1
    • +1
    ./matchingpairs.jsp
    • -2
    • +2
    ./multiplechoice.jsp
    • -1
    • +1
    ./ordering.jsp
  5. … 2 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
    • -29
    • +9
    ./ordering.jsp
  2. … 3 more files in changeset.
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./essay.jsp
    • -1
    • +1
    ./markhedging.jsp
    • -1
    • +1
    ./matchingpairs.jsp
    • -1
    • +1
    ./multiplechoice.jsp
    • -1
    • +1
    ./numerical.jsp
    • -1
    • +1
    ./ordering.jsp
    • -1
    • +1
    ./shortanswer.jsp
    • -1
    • +1
    ./truefalse.jsp
  9. … 384 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
    • -29
    • +9
    ./ordering.jsp
  2. … 7 more files in changeset.
11:58 pm

Andrey Balan

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

Options
    • -29
    • +9
    ./ordering.jsp
  2. … 7 more files in changeset.
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -3
    • +3
    ./allquestions.jsp
  2. … 506 more files in changeset.
Monday 24 Sep 2018
3:06 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Resetting essay assessment vaildation and escaping

Options
    • -3
    • +1
    ./essay.jsp
  2. … 1 more file in changeset.
Sunday 23 Sep 2018
12:58 pm

Marcin Cieslak

LDEV-4440 Reintroduce custom textarea tags

Options
    • -3
    • +3
    ./essay.jsp
    • -3
    • +4
    ./markhedging.jsp
  3. … 8 more files in changeset.
Friday 07 Sep 2018
1:55 pm

Andrey Balan

LDEV-4440 Assessment noStruts

Options
    • -3
    • +5
    ./essay.jsp
    • -7
    • +6
    ./markhedging.jsp
    • -6
    • +7
    ./matchingpairs.jsp
  4. … 72 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
    • -3
    • +6
    ./multiplechoice.jsp
  2. … 11 more files in changeset.
Friday 16 Mar 2018
5:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4531 Essay Question displays 8 rows for text entry

Options
    • -2
    • +2
    ./essay.jsp
Tuesday 21 Nov 2017
6:11 pm

Andrey Balan

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

Options
    • -1
    • +1
    ./confidencelevel.jsp
  2. … 7 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
    • +4
    ./allquestions.jsp
    • -0
    • +13
    ./confidencelevel.jsp
  3. … 28 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
    • -1
    • +1
    ./paging.jsp
  2. … 158 more files in changeset.
Wednesday 26 Apr 2017
12:51 pm

Andrey Balan

LDEV-4329 Fixed marked hedging questions' table formatting

Options
    • -2
    • +1
    ./markhedging.jsp
  2. … 2 more files in changeset.
12:48 pm

Andrey Balan

LDEV-4329 Forbid leaders entering text in essay questions

Options
    • -3
    • +3
    ./essay.jsp
  2. … 1 more file in changeset.
Thursday 20 Apr 2017
5:27 pm

Andrey Balan

LDEV-4326 Matching pairs answer options should be sorted alphanumerically

Options
    • -2
    • +8
    ./matchingpairs.jsp
  2. … 3 more files in changeset.
Friday 17 Mar 2017
7:03 pm

Andrey Balan

LDEV-4271 Refactor Assessment code * use DTO instead of model classes for carrying interim information * split learning.jsp into two pages: actual learning.jsp where user enters his answers and results.jsp where we display results to him

Options
    • -71
    • +58
    ./allquestions.jsp
    • -69
    • +0
    ./attemptsummary.jsp
    • -5
    • +0
    ./essay.jsp
    • -24
    • +0
    ./markandpenaltyarea.jsp
    • -65
    • +6
    ./markhedging.jsp
    • -17
    • +3
    ./matchingpairs.jsp
    • -45
    • +4
    ./multiplechoice.jsp
    • -21
    • +2
    ./numerical.jsp
    • -33
    • +5
    ./ordering.jsp
    • -0
    • +18
    ./paging.jsp
    • -111
    • +0
    ./questionsummary.jsp
    • -21
    • +2
    ./shortanswer.jsp
    • -58
    • +2
    ./truefalse.jsp
  14. … 32 more files in changeset.