lams-github

lams_tool_scratchie

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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 13 Dec 2019
3:07 pm

Marcin Cieslak

LDEV-4921 Fix ordering for burning question in Scratchie learner

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -4
    • +6
    ./web/pages/learning/results.jsp
2:24 pm

Marcin Cieslak

LDEV-4921 Properly detect General Burning Question in TBL monitor

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/burningQuestions.jsp
Wednesday 11 Dec 2019
5:26 pm

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +15
    ./conf/language/lams/ApplicationResources.properties
  2. … 17 more files in changeset.
9:39 am

Marcin Cieslak

LDEV-4802 Try to identify and fix a NPE in Scratchie websockets

Options
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
Tuesday 10 Dec 2019
3:24 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring burning questions

Options
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +4
    ./web/pages/tblmonitoring/burningQuestions.jsp
3:19 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +3
    ./web/pages/monitoring/summary.jsp
12:09 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie burning questions

Options
    • -1
    • +19
    ./web/pages/learning/results.jsp
    • -6
    • +6
    ./web/pages/learning/scratchies.jsp
Monday 09 Dec 2019
2:27 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -15
    • +17
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +21
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -12
    • +17
    ./conf/language/lams/ApplicationResources_en_AU.properties
12:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +15
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +21
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +15
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 63 more files in changeset.
Saturday 07 Dec 2019
12:09 pm

Ernie Ghiglione

LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Friday 06 Dec 2019
7:32 am

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -0
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -23
    • +14
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 10 more files in changeset.
Thursday 05 Dec 2019
12:07 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Scratchie

Options
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +3
    ./web/pages/authoring/parts/itemlist.jsp
    • -4
    • +7
    ./web/pages/learning/scratchies.jsp
    • -123
    • +123
    ./web/pages/monitoring/parts/statisticpart.jsp
    • -3
    • +9
    ./web/pages/monitoring/summary.jsp
11:16 am

Marcin Cieslak

LDEV-4921 Allow hiding question titles in Learner for Scratchie

Options
    • -243
    • +244
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java
    • -1
    • +6
    ./web/pages/admin/config.jsp
    • -3
    • +5
    ./web/pages/learning/scratchies.jsp
12:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -2
    • +19
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +35
    ./web/pages/authoring/basic.jsp
    • -0
    • +5
    ./web/pages/authoring/parts/itemlist.jsp
  4. … 2 more files in changeset.
Tuesday 03 Dec 2019
8:44 pm

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

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

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +8
    ./conf/language/lams/ApplicationResources.properties
  2. … 35 more files in changeset.
Monday 02 Dec 2019
2:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -2
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 120 more files in changeset.
Monday 25 Nov 2019
6:34 pm

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +28
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 5 more files in changeset.
Sunday 24 Nov 2019
5:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

# Conflicts:

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
Saturday 23 Nov 2019
1:01 am

Ernie Ghiglione

LDEV-4769 Updating labels

Norgewian and Greek

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 1 more file in changeset.
Friday 22 Nov 2019
6:51 pm

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -3
    • +47
    ./web/pages/learning/parts/confidenceLevelPortrait.jsp
  4. … 17 more files in changeset.
Thursday 21 Nov 2019
9:12 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Create structure for monitoring learning

Options
    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
  2. … 4 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
    • -20
    • +55
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -54
    • +51
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -17
    • +16
    ./web/pages/learning/learning.jsp
  4. … 19 more files in changeset.
Friday 15 Nov 2019
11:09 pm

Andrey Balan

LDEV-4903 Fixed importing LD using a blank DB

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
  2. … 1 more file in changeset.
8:49 pm

Andrey Balan

LDEV-4875 Fix scratching of MCQ questions

Options
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -4
    • +3
    ./web/pages/learning/questionlist.jsp
9:10 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4900

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
3:28 pm

Andrey Balan

LDEV-4897 Update Scratchie to use new Excel exporting methods

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +1
    ./web/pages/tblmonitoring/traStudentChoices.jsp
3:02 pm

Marcin Cieslak

LDEV-4900 Make other tools react to autosave command

Options
    • -17
    • +16
    ./web/pages/learning/learning.jsp
  2. … 2 more files in changeset.
2:34 pm

Andrey Balan

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

Options
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -11
    • +12
    ./web/pages/learning/results.jsp
2:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Tuesday 12 Nov 2019
8:32 pm

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 60 more files in changeset.