lams-github / lams_tool_scratchie

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 13
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
Friday 22 Nov 2019
4:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -2
    • +2
    ./pages/authoring/parts/itemlist.jsp
  2. … 4 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
    ./pages/learning/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
    ./pages/learning/questionlist.jsp
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
10:28 pm

Andrey Balan

LDEV-4897 Update Scratchie to use new Excel exporting methods

Options
    • -1
    • +1
    ./pages/tblmonitoring/traStudentChoices.jsp
  2. … 1 more file in changeset.
10:02 pm

Marcin Cieslak

LDEV-4900 Make other tools react to autosave command

Options
    • -17
    • +16
    ./pages/learning/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
    ./pages/learning/results.jsp
  2. … 1 more file in changeset.
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

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

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/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.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/service/AssessmentServiceImpl.java

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/authoring/itemlist.jsp

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/AuthoringController.java

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -1
    • +1
    ./pages/authoring/start.jsp
    • -4
    • +8
    ./pages/tblmonitoring/traStudentChoices.jsp
  3. … 26 more files in changeset.
Tuesday 05 Nov 2019
4:51 am

Marcin Cieslak

LDEV-4898 Fix notifyCloseURL passing in Scratchie

Options
    • -1
    • +1
    ./pages/authoring/start.jsp
  2. … 1 more file in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -4
    • +6
    ./pages/tblmonitoring/traStudentChoices.jsp
  2. … 15 more files in changeset.
Tuesday 29 Oct 2019
5:40 pm

Marcin Cieslak

LDEV-4875 Fix JS validation after field name change

Options
    • -5
    • +5
    ./pages/authoring/parts/addMcq.jsp
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
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/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
    ./pages/learning/learning.jsp
    • -1
    • +1
    ./pages/learning/scratchies.jsp
    • -1
    • +1
    ./pages/monitoring/parts/itemSummary.jsp
    • -1
    • +1
    ./pages/tblmonitoring/teams.jsp
    • -1
    • +1
    ./pages/tblmonitoring/tra.jsp
    • -2
    • +2
    ./pages/tblmonitoring/traStudentChoices.jsp
Thursday 10 Oct 2019
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -16
    • +12
    ./pages/authoring/parts/addVsa.jsp
    • -5
    • +3
    ./pages/learning/learning.jsp
    • -24
    • +20
    ./pages/learning/questionlist.jsp
    • -11
    • +12
    ./pages/learning/scratchies.jsp
    • -12
    • +1
    ./pages/monitoring/parts/itemSummary.jsp
    • -1
    • +1
    ./pages/tblmonitoring/burningQuestions.jsp
    • -2
    • +2
    ./pages/tblmonitoring/teams.jsp
    • -1
    • +1
    ./pages/tblmonitoring/tra.jsp
    • -5
    • +5
    ./pages/tblmonitoring/traStudentChoices.jsp
  10. … 14 more files in changeset.
Wednesday 09 Oct 2019
5:26 am

Andrey Balan

LDEV-4875 Item summary page to display options correctly

Options
    • -20
    • +21
    ./pages/monitoring/parts/itemSummary.jsp
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -3
    • +3
    ./includes/css/scratchie-learning.scss
    • -4
    • +32
    ./pages/authoring/advance.jsp
    • -2
    • +2
    ./pages/authoring/authoring.jsp
    • -6
    • +16
    ./pages/authoring/basic.jsp
    • -0
    • +29
    ./pages/authoring/parts/addItemFooter.jsp
    • -0
    • +267
    ./pages/authoring/parts/addMcq.jsp
    • -0
    • +237
    ./pages/authoring/parts/addVsa.jsp
    • -292
    • +0
    ./pages/authoring/parts/additem.jsp
    • -1
    • +12
    ./pages/authoring/parts/itemlist.jsp
    • -2
    • +2
    ./pages/authoring/parts/optionlist.jsp
    • -42
    • +184
    ./pages/learning/learning.jsp
    • -0
    • +25
    ./pages/learning/parts/confidenceLevelPortrait.jsp
    • -2
    • +14
    ./pages/learning/questionlist.jsp
    • -74
    • +128
    ./pages/learning/scratchies.jsp
  15. … 62 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
    ./pages/learning/scratchies.jsp
  2. … 1 more file in changeset.
Sunday 04 Aug 2019
5:10 am

Andrey Balan

LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

Options
    • -0
    • +2
    ./pages/authoring/authoring.jsp
    • -25
    • +28
    ./pages/authoring/basic.jsp
    • -41
    • +58
    ./pages/authoring/parts/additem.jsp
    • -14
    • +21
    ./pages/authoring/parts/itemlist.jsp
    • -14
    • +19
    ./pages/authoring/parts/optionlist.jsp
    • -1
    • +1
    ./pages/authoring/start.jsp
  7. … 9 more files in changeset.
Monday 22 Jul 2019
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Friday 19 Jul 2019
4:21 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

Options
    • -1
    • +1
    ./pages/tblmonitoring/tra.jsp
  2. … 4 more files in changeset.
Thursday 18 Jul 2019
10:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -0
    • +3
    ./pages/authoring/authoring.jsp
    • -5
    • +3
    ./pages/authoring/basic.jsp
  3. … 8 more files in changeset.
9:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -10
    • +13
    ./pages/authoring/authoring.jsp
    • -25
    • +46
    ./pages/authoring/basic.jsp
    • -39
    • +30
    ./pages/authoring/parts/itemlist.jsp
  4. … 4 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 50 more files in changeset.
8:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Supports multiple response app ex, improved font on TRA chart

Options
    • -1
    • +1
    ./pages/tblmonitoring/tra.jsp
  2. … 11 more files in changeset.
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
    ./pages/learning/learning.jsp
    • -12
    • +0
    ./pages/learning/results.jsp
    • -9
    • +13
    ./pages/learning/scratchies.jsp
    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
    • -12
    • +23
    ./pages/monitoring/summary.jsp
    • -32
    • +87
    ./pages/tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./pages/tblmonitoring/tra.jsp
    • -9
    • +40
    ./pages/tblmonitoring/traStudentChoices.jsp
  9. … 47 more files in changeset.
Tuesday 25 Jun 2019
3:41 am

Andrey Balan

LKC-203 Fix location of the first column

Options
    • -9
    • +34
    ./pages/tblmonitoring/traStudentChoices.jsp
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
    • -5
    • +31
    ./WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +52
    ./includes/css/scratchie-learning.scss
    • -1
    • +1
    ./pages/authoring/parts/additem.jsp
    • -34
    • +24
    ./pages/learning/learning.jsp
    • -12
    • +0
    ./pages/learning/results.jsp
    • -11
    • +15
    ./pages/learning/scratchies.jsp
    • -3
    • +2
    ./pages/monitoring/monitoring.jsp
    • -5
    • +14
    ./pages/monitoring/parts/itemSummary.jsp
    • -14
    • +24
    ./pages/monitoring/summary.jsp
    • -31
    • +86
    ./pages/tblmonitoring/burningQuestions.jsp
    • -1
    • +7
    ./pages/tblmonitoring/tra.jsp
    • -0
    • +6
    ./pages/tblmonitoring/traStudentChoices.jsp
  13. … 83 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -30
    • +2
    ./pages/authoring/basic.jsp
    • -18
    • +7
    ./pages/authoring/parts/itemlist.jsp
  3. … 11 more files in changeset.
Wednesday 29 May 2019
10:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -3
    • +2
    ./pages/monitoring/parts/statisticpart.jsp
  2. … 9 more files in changeset.
8:36 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Scratchie tool monitoring

Options
    • -69
    • +124
    ./pages/monitoring/parts/statisticpart.jsp
  2. … 2 more files in changeset.