lams-github / lams_tool_scratchie / web / pages / learning

learning.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 10
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
Tuesday 19 Nov 2019
9: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
    • -17
    • +16
    ./learning.jsp
  2. … 21 more files in changeset.
Thursday 14 Nov 2019
10:02 pm

Marcin Cieslak

LDEV-4900 Make other tools react to autosave command

Options
    • -17
    • +16
    ./learning.jsp
  2. … 2 more files in changeset.
Friday 18 Oct 2019
8:59 pm

Andrey Balan

LDEV-4875 Respect QbQuestion's case sensitive setting

* Simplify learning.jsp, so it gets most of the data from the server

rather than tries to figure it out on a client side

* Optimize the way answers get fetched from Assessment

* Fix the following issue: if there is no activity selected to fetch

assessment answers from, then Scratchie don't show user answers

Options
    • -64
    • +47
    ./learning.jsp
  2. … 7 more files in changeset.
Thursday 17 Oct 2019
2:28 am

Andrey Balan

LDEV-4875 Take care about answers containing XML escaped characters

Options
    • -4
    • +12
    ./learning.jsp
  2. … 5 more files in changeset.
Thursday 10 Oct 2019
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -5
    • +3
    ./learning.jsp
  2. … 22 more files in changeset.
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -42
    • +184
    ./learning.jsp
  2. … 75 more files in changeset.
Thursday 04 Jul 2019
3:25 am

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
    • -34
    • +24
    ./learning.jsp
  2. … 54 more files in changeset.
Friday 14 Jun 2019
1:11 pm

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
    • -34
    • +24
    ./learning.jsp
  2. … 94 more files in changeset.
Saturday 25 May 2019
4:20 am

Andrey Balan

LDEV-4820 Show user names as tooltips

Options
    • -41
    • +24
    ./learning.jsp
  2. … 2 more files in changeset.
Saturday 18 May 2019
5:26 am

Andrey Balan

LDEV-4746 Rename ScratchieAnswer to QbOptionDTO to reduce ambiguity

Options
    • -7
    • +7
    ./learning.jsp
  2. … 26 more files in changeset.
Thursday 16 May 2019
2:53 am

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -0
    • +7
    ./learning.jsp
  2. … 5 more files in changeset.
Tuesday 12 Feb 2019
6:15 pm

Marcin Cieslak

LDEV-4746 Migrate Scratchie to QB

Options
    • -1
    • +1
    ./learning.jsp
  2. … 31 more files in changeset.
Wednesday 06 Feb 2019
11: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.
Friday 12 Oct 2018
5:01 am

Andrey Balan

LDEV-4682 Overlay of percentages is fixed

Besides, changed layout of portraits with confidence levels in case of a

long answer description.

Options
    • -2
    • +4
    ./learning.jsp
  2. … 1 more file in changeset.
Friday 05 Oct 2018
3:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Clean up shared files

Options
    • -1
    • +1
    ./learning.jsp
  2. … 206 more files in changeset.
Tuesday 07 Aug 2018
10:43 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scratchie autosave fix

Options
    • -2
    • +2
    ./learning.jsp
  2. … 62 more files in changeset.
4:23 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scratchie NoStruts library

Options
    • -3
    • +3
    ./learning.jsp
  2. … 27 more files in changeset.
Monday 06 Aug 2018
7:09 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A autosave fix

Options
    • -1
    • +1
    ./learning.jsp
  2. … 13 more files in changeset.
3:24 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe nostruts library

Options
    • -5
    • +5
    ./learning.jsp
  2. … 32 more files in changeset.
Saturday 28 Apr 2018
6:18 am

Andrey Balan

LDEV-4568 Change burning question's "+" icon to "-" on expanding

Options
    • -0
    • +6
    ./learning.jsp
  2. … 2 more files in changeset.
Wednesday 08 Nov 2017
10:30 pm

Andrey Balan

LDEV-4455 Remove edit burning questions functionality

Besides, increase autosave interval to 60 seconds.

Options
    • -1
    • +1
    ./learning.jsp
  2. … 4 more files in changeset.
Saturday 04 Nov 2017
6:24 am

Andrey Balan

LDEV-4455 Move burning question to the learning.jsp

We need a change in the flow for Burning questions in learner, so the

burning question text for each question is entered as the students

answer select the answers.

So each question would have a "burning question?" label that would

expand/collapse on request for students to enter the text as they answer

each question.

Options
    • -31
    • +74
    ./learning.jsp
  2. … 11 more files in changeset.
Thursday 02 Nov 2017
8:01 am

Andrey Balan

LDEV-4451 Display confidence levels in Scratchie

Add ability to Scratchie to display what options the individual students

have had in the individual assessment.

Add advanced option to Scratchie - 'Show confidences' and then list

activites from the sequence to choose from (skip branching or use only

the current branch if inside of it).

Options
    • -0
    • +19
    ./learning.jsp
  2. … 22 more files in changeset.
Saturday 05 Aug 2017
1:04 pm

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
    • -7
    • +1
    ./learning.jsp
  2. … 88 more files in changeset.
Tuesday 13 Dec 2016
12:54 am

Andrey Balan

LDEV-3801 store time limit's launched date in DB

Options
    • -14
    • +30
    ./learning.jsp
  2. … 13 more files in changeset.
Tuesday 06 Dec 2016
5:02 pm

Andrey Balan

LDEV-3801 store time limit's launched date in DB

Options
    • -14
    • +32
    ./learning.jsp
  2. … 18 more files in changeset.
Tuesday 08 Nov 2016
12:52 am

Andrey Balan

LDEV-3741 Fixed path to CSS file

Options
    • -1
    • +1
    ./learning.jsp
Friday 21 Oct 2016
8:37 am

erniegx <ernieg@gmail.com>

LDEV-2951: removing unused images from lams_tool_scratchie

Options
    • -1
    • +1
    ./learning.jsp
  2. … 11 more files in changeset.
Wednesday 20 Jul 2016
11:44 pm

Andrey Balan

LDEV-3741 Add a time limit to scratchie

Options
    • -24
    • +101
    ./learning.jsp
  2. … 8 more files in changeset.
10:33 pm

Andrey Balan

LDEV-3741 Add a time limit to scratchie

Options
    • -31
    • +93
    ./learning.jsp
  2. … 9 more files in changeset.