lams-github / lams_tool_assessment / web / pages

learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 12
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
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
    ./parts/essay.jsp
    • -1
    • +1
    ./parts/markhedging.jsp
    • -1
    • +1
    ./parts/numerical.jsp
    • -1
    • +1
    ./parts/shortanswer.jsp
    • -1
    • +1
    ./parts/truefalse.jsp
    • -2
    • +2
    ./results/essay.jsp
    • -4
    • +4
    ./results/historyresponses.jsp
    • -1
    • +1
    ./results/markhedging.jsp
    • -1
    • +1
    ./results/numerical.jsp
    • -1
    • +1
    ./results/shortanswer.jsp
    • -3
    • +3
    ./results/truefalse.jsp
  12. … 13 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
    • -26
    • +23
    ./learning.jsp
    • -1
    • +1
    ./parts/markhedging.jsp
    • -1
    • +1
    ./parts/matchingpairs.jsp
    • -2
    • +2
    ./parts/multiplechoice.jsp
    • -29
    • +9
    ./parts/ordering.jsp
    • -6
    • +0
    ./results/ordering.jsp
  7. … 49 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.jsp
    • -1
    • +1
    ./parts/markhedging.jsp
    • -1
    • +1
    ./parts/matchingpairs.jsp
    • -2
    • +2
    ./parts/multiplechoice.jsp
    • -1
    • +1
    ./parts/ordering.jsp
  6. … 90 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -6
    • +6
    ./learning.jsp
    • -4
    • +4
    ./parts/markhedging.jsp
    • -3
    • +3
    ./parts/matchingpairs.jsp
    • -3
    • +3
    ./parts/multiplechoice.jsp
    • -2
    • +2
    ./parts/ordering.jsp
    • -4
    • +4
    ./results/historyresponses.jsp
    • -4
    • +4
    ./results/markandpenaltyarea.jsp
    • -9
    • +9
    ./results/markhedging.jsp
    • -3
    • +3
    ./results/matchingpairs.jsp
    • -7
    • +7
    ./results/multiplechoice.jsp
    • -3
    • +3
    ./results/ordering.jsp
  12. … 70 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
    ./learning.jsp
    • -1
    • +1
    ./parts/markhedging.jsp
    • -1
    • +1
    ./parts/matchingpairs.jsp
    • -2
    • +2
    ./parts/multiplechoice.jsp
    • -1
    • +1
    ./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.jsp
    • -1
    • +1
    ./parts/markhedging.jsp
    • -1
    • +1
    ./parts/matchingpairs.jsp
    • -2
    • +2
    ./parts/multiplechoice.jsp
    • -1
    • +1
    ./parts/ordering.jsp
  6. … 1 more file 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.jsp
    • -29
    • +9
    ./parts/ordering.jsp
    • -6
    • +0
    ./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
    ./parts/essay.jsp
    • -1
    • +1
    ./parts/markhedging.jsp
    • -1
    • +1
    ./parts/matchingpairs.jsp
    • -1
    • +1
    ./parts/multiplechoice.jsp
    • -1
    • +1
    ./parts/numerical.jsp
    • -1
    • +1
    ./parts/ordering.jsp
    • -1
    • +1
    ./parts/shortanswer.jsp
    • -1
    • +1
    ./parts/truefalse.jsp
    • -2
    • +2
    ./results/essay.jsp
    • -1
    • +1
    ./results/markhedging.jsp
    • -1
    • +1
    ./results/matchingpairs.jsp
    • -1
    • +1
    ./results/multiplechoice.jsp
    • -1
    • +1
    ./results/numerical.jsp
    • -1
    • +1
    ./results/ordering.jsp
    • -1
    • +1
    ./results/shortanswer.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.jsp
    • -29
    • +9
    ./parts/ordering.jsp
    • -6
    • +0
    ./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.jsp
    • -29
    • +9
    ./parts/ordering.jsp
    • -6
    • +0
    ./results/ordering.jsp
  4. … 5 more files in changeset.
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./learning.jsp
    • -1
    • +1
    ./notebook.jsp
    • -3
    • +3
    ./parts/allquestions.jsp
    • -5
    • +5
    ./results.jsp
    • -3
    • +3
    ./results/allquestions.jsp
  6. … 502 more files in changeset.
Thursday 20 Dec 2018
9:47 pm

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -1
    • +1
    ./notebook.jsp
    • -1
    • +1
    ./results.jsp
    • -1
    • +1
    ./submissionDeadline.jsp
  4. … 140 more files in changeset.
Wednesday 05 Dec 2018
12:27 pm

Marcin Cieslak

LDEV-4708 Fix a merge issue

Options
    • -5
    • +1
    ./results.jsp
Wednesday 28 Nov 2018
8:50 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

Options
    • -0
    • +4
    ./results.jsp
  2. … 10 more files in changeset.
Monday 26 Nov 2018
9:34 pm

Andrey Balan

LDEV-4708 update marks more skillfully after edit in monitor

Options
    • -1
    • +0
    ./learning.jsp
    • -1
    • +0
    ./results.jsp
  3. … 33 more files in changeset.
Wednesday 14 Nov 2018
2:57 pm

Andrey Balan

LDEV-4706 Display assessment instructions in case display summary is ON

Options
    • -0
    • +4
    ./results.jsp
2:54 pm

Andrey Balan

LDEV-4706 Display assessment instructions in case display summary is ON

Options
    • -0
    • +4
    ./results.jsp
Friday 05 Oct 2018
9:05 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Clean up shared files

Options
    • -1
    • +1
    ./learning.jsp
    • -1
    • +1
    ./notebook.jsp
    • -1
    • +1
    ./results.jsp
  4. … 204 more files in changeset.
Tuesday 25 Sep 2018
12:03 am

Andrey Balan

LDEV-4440 Full path is not required in these cases

Options
    • -1
    • +1
    ./notebook.jsp
  2. … 9 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
    • -11
    • +2
    ./learning.jsp
    • -3
    • +1
    ./parts/essay.jsp
Sunday 23 Sep 2018
12:58 pm

Marcin Cieslak

LDEV-4440 Reintroduce custom textarea tags

Options
    • -3
    • +3
    ./parts/essay.jsp
    • -3
    • +4
    ./parts/markhedging.jsp
    • -2
    • +4
    ./results/markhedging.jsp
  4. … 7 more files in changeset.
Friday 21 Sep 2018
2:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Assessment essay type non CKEditor works again

Options
    • -3
    • +13
    ./learning.jsp
Friday 07 Sep 2018
1:55 pm

Andrey Balan

LDEV-4440 Assessment noStruts

Options
    • -14
    • +9
    ./learning.jsp
    • -5
    • +5
    ./notebook.jsp
    • -3
    • +5
    ./parts/essay.jsp
    • -7
    • +6
    ./parts/markhedging.jsp
    • -6
    • +7
    ./parts/matchingpairs.jsp
    • -6
    • +6
    ./results.jsp
    • -3
    • +3
    ./results/markhedging.jsp
    • -4
    • +7
    ./results/matchingpairs.jsp
    • -3
    • +3
    ./submissionDeadline.jsp
    • -2
    • +2
    ./waitForLeaderTimeLimit.jsp
    • -2
    • +2
    ./waitforleader.jsp
  12. … 64 more files in changeset.
Friday 18 May 2018
4:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4586 Letter prefixes shown on results page

Options
    • -3
    • +6
    ./results/multiplechoice.jsp
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
    ./parts/multiplechoice.jsp
  2. … 11 more files in changeset.
Sunday 22 Apr 2018
12:15 pm

Marcin Cieslak

LDEV-4540 Fix variable name clash when iterating over options

Options
    • -4
    • +4
    ./results/multiplechoice.jsp
Thursday 12 Apr 2018
12:34 pm

Marcin Cieslak

LDEV-4540 Change layout of other groups' answers for MC questions

Options
    • -0
    • +9
    ./results.jsp
    • -0
    • +1
    ./results/essay.jsp
    • -39
    • +27
    ./results/multiplechoice.jsp
  4. … 1 more file in changeset.
11:44 am

Marcin Cieslak

LDEV-4540 Show correct answers and user's answers separately

Options
    • -4
    • +4
    ./results/multiplechoice.jsp
Wednesday 11 Apr 2018
3:52 pm

Marcin Cieslak

LDEV-4540 Move groups' answers under each question

Options
    • -6
    • +9
    ./results.jsp
    • -1
    • +30
    ./results/essay.jsp
    • -5
    • +55
    ./results/multiplechoice.jsp
    • -138
    • +0
    ./results/tblsummary.jsp
  5. … 1 more file in changeset.
3:06 pm

Marcin Cieslak

LDEV-4540 Do not show correct answers until they are disclosed

Till now other groups' answers were marked as correct no matter if

correct answers were disclosed by a monitor.

Options
    • -1
    • +1
    ./results/tblsummary.jsp