lams-github / lams_tool_scratchie / 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
Wednesday 15 Apr 2020
12:24 am

Marcin Cieslak

LDEV-5002 Reduce gap between user names

Options
    • -1
    • +0
    ./scratchies.jsp
12:24 am

Marcin Cieslak

LDEV-5002 Reduce gap between user names

Options
    • -1
    • +0
    ./scratchies.jsp
Monday 13 Apr 2020
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +26
    ./scratchies.jsp
  2. … 12 more files in changeset.
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -9
    • +0
    ./learning.jsp
    • -1
    • +27
    ./scratchies.jsp
  3. … 11 more files in changeset.
Thursday 02 Apr 2020
3:23 pm

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -0
    • +9
    ./learning.jsp
  2. … 10 more files in changeset.
Thursday 12 Mar 2020
1:55 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.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/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +11
    ./learning.jsp
    • -2
    • +9
    ./results.jsp
    • -2
    • +8
    ./scratchies.jsp
  4. … 8 more files in changeset.
1:33 pm

Marcin Cieslak

LDEV-4990 Style results page the same way as learning page in Scratchie

Options
    • -1
    • +3
    ./results.jsp
10:12 am

Ernie Ghiglione

LDEV-4987 Minor adjustments in layout

Options
    • -7
    • +8
    ./scratchies.jsp
Wednesday 11 Mar 2020
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -0
    • +11
    ./learning.jsp
    • -4
    • +6
    ./scratchies.jsp
  3. … 2 more files in changeset.
5:56 am

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -1
    • +6
    ./results.jsp
    • -0
    • +4
    ./scratchies.jsp
  3. … 7 more files in changeset.
Wednesday 19 Feb 2020
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    ./learning.jsp
  2. … 16 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

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

Options
    • -4
    • +4
    ./learning.jsp
  2. … 4 more files in changeset.
Friday 13 Dec 2019
10:07 pm

Marcin Cieslak

LDEV-4921 Fix ordering for burning question in Scratchie learner

Options
    • -4
    • +6
    ./results.jsp
  2. … 1 more file in changeset.
Tuesday 10 Dec 2019
7:09 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie burning questions

Options
    • -1
    • +19
    ./results.jsp
    • -6
    • +6
    ./scratchies.jsp
Thursday 05 Dec 2019
7:07 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Scratchie

Options
    • -4
    • +7
    ./scratchies.jsp
  2. … 4 more files in changeset.
6:16 pm

Marcin Cieslak

LDEV-4921 Allow hiding question titles in Learner for Scratchie

Options
    • -3
    • +5
    ./scratchies.jsp
  2. … 7 more files in changeset.
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -3
    • +47
    ./parts/confidenceLevelPortrait.jsp
  2. … 19 more files in changeset.
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.
Saturday 16 Nov 2019
3:49 am

Andrey Balan

LDEV-4875 Fix scratching of MCQ questions

Options
    • -4
    • +3
    ./questionlist.jsp
  2. … 1 more file 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.
9:34 pm

Andrey Balan

LDEV-4745 Set general burning question's uid to 0

Options
    • -11
    • +12
    ./results.jsp
  2. … 1 more file 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
    • -1
    • +1
    ./scratchies.jsp
  3. … 6 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
    • -1
    • +1
    ./scratchies.jsp
  3. … 4 more files in changeset.
Thursday 10 Oct 2019
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -5
    • +3
    ./learning.jsp
    • -24
    • +20
    ./questionlist.jsp
    • -11
    • +12
    ./scratchies.jsp
  4. … 20 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
    • -0
    • +25
    ./parts/confidenceLevelPortrait.jsp
    • -2
    • +14
    ./questionlist.jsp
    • -74
    • +128
    ./scratchies.jsp
  5. … 72 more files in changeset.
Tuesday 10 Sep 2019
2:29 pm

Andrey Balan

LDEV-4868 Fix Scratchie so it can show more than one question

* Also fix confidence levels feature in Scratchie

Options
    • -1
    • +1
    ./scratchies.jsp
  2. … 1 more file 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
    • -12
    • +0
    ./results.jsp
    • -9
    • +13
    ./scratchies.jsp
  4. … 52 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
    • -12
    • +0
    ./results.jsp
    • -11
    • +15
    ./scratchies.jsp
  4. … 92 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
    • -10
    • +8
    ./scratchies.jsp
  3. … 1 more file 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
    • -3
    • +3
    ./questionlist.jsp
    • -15
    • +15
    ./scratchies.jsp
  4. … 24 more files in changeset.