lams-github / lams_tool_assessment / web / pages / learning

learning.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 11
Last Commit: 29 Feb 24
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 20 Apr 2020
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
    • +9
    ./learning.jsp
  2. … 6 more files in changeset.
Monday 20 Jan 2020
9:23 pm

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

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

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +5
    ./learning.jsp
  2. … 19 more files in changeset.
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -24
    • +23
    ./learning.jsp
  2. … 21 more files in changeset.
Monday 11 Nov 2019
5:06 pm

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -2
    • +2
    ./learning.jsp
  2. … 5 more files in changeset.
3:54 pm

Marcin Cieslak

LDEV-4900 Make Assessment autosave a recognisable function

Options
    • -24
    • +23
    ./learning.jsp
Wednesday 09 Oct 2019
11:32 pm

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -18
    • +15
    ./learning.jsp
  2. … 22 more files in changeset.
Saturday 05 Oct 2019
12:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -20
    • +28
    ./learning.jsp
  2. … 75 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
  2. … 54 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
  2. … 94 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -6
    • +6
    ./learning.jsp
  2. … 80 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
  2. … 5 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
    ./learning.jsp
  2. … 5 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.jsp
  2. … 3 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
  2. … 7 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
  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
    • -1
    • +1
    ./learning.jsp
  2. … 506 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
  2. … 34 more files in changeset.
Friday 05 Oct 2018
9:05 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Clean up shared files

Options
    • -1
    • +1
    ./learning.jsp
  2. … 206 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
  2. … 1 more file 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
  2. … 74 more files in changeset.
Tuesday 21 Nov 2017
6:11 pm

Andrey Balan

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

Options
    • -1
    • +2
    ./learning.jsp
  2. … 7 more files in changeset.
Thursday 02 Nov 2017
10:24 pm

Andrey Balan

LDEV-4451 Make slider neater (narrower and with lesser text size)

Options
    • -9
    • +0
    ./learning.jsp
  2. … 2 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
    • -17
    • +23
    ./learning.jsp
  2. … 29 more files in changeset.
Wednesday 09 Aug 2017
1:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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.

Options
    • -1
    • +13
    ./learning.jsp
  2. … 1 more file in changeset.
Saturday 05 Aug 2017
7:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -5
    • +1
    ./learning.jsp
  2. … 88 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
    • -32
    • +1
    ./learning.jsp
  2. … 158 more files in changeset.
Monday 20 Mar 2017
8:44 pm

Andrey Balan

LDEV-4270 Started using redirects after submitting answers. this is done to prevent from sending form second time on page refresh

Options
    • -1
    • +1
    ./learning.jsp
  2. … 1 more file in changeset.
8:43 pm

Andrey Balan

LDEV-4279 Autosave essay type of questions

Options
    • -9
    • +4
    ./learning.jsp