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
Tuesday 02 Jan 2024
10:33 pm

Marcin Cieslak

LDEV-5420 Add questions print button to Scratchie

Options
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -94
    • +91
    ./web/pages/authoring/authoring.jsp
    • -0
    • +11
    ./web/pages/authoring/basic.jsp
  4. … 1 more file in changeset.
Saturday 30 Dec 2023
8:23 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -6
    • +6
    ./web/WEB-INF/tags/PageLearner.tag
  2. … 31 more files in changeset.
Friday 29 Dec 2023
8:19 pm

Ernie Ghiglione

LDEV-5397 round scratchies

Options
    • -1
    • +1
    ./web/pages/learning/parts/scratchieSvg.jsp
5:38 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

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

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

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

Merge remote-tracking branch 'origin/LDEV-5397' into v4.8

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
  3. … 8 more files in changeset.
3:24 pm

Ernie Ghiglione

LDEV-5397 Updating labels

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 13 more files in changeset.
Thursday 28 Dec 2023
5:09 am

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

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

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

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

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

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -81
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
5:09 am

Andrey Balan

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

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

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

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

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

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

Options
    • -81
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 34 more files in changeset.
4:14 am

Andrey Balan

LDEV-5425 copy-tags

Options
    • -107
    • +0
    ./web/WEB-INF/tags/Notebook.tag
    • -67
    • +0
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -4
    • +1
    ./web/WEB-INF/tags/PageLearner.tag
    • -71
    • +10
    ./web/WEB-INF/tags/SubmissionDeadline.tag
    • -8
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
  6. … 154 more files in changeset.
4:04 am

Andrey Balan

LDEV-5425 Remove "End of activity" notebook from *all* tools

Options
    • -12
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20231221.sql
    • -50
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java
    • -22
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -38
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -81
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -151
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -67
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ReflectionForm.java
    • -29
    • +1
    ./web/pages/authoring/advance.jsp
    • -5
    • +2
    ./web/pages/learning/learning.jsp
    • -9
    • +0
    ./web/pages/learning/notebook.jsp
    • -14
    • +3
    ./web/pages/learning/questionlist.jsp
  16. … 505 more files in changeset.
Wednesday 27 Dec 2023
9:13 pm

Marcin Cieslak

LDEV-5363 Make RAT questions sync optional

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -56
    • +61
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +8
    ./web/pages/authoring/authoring.jsp
    • -1
    • +6
    ./web/pages/authoring/basic.jsp
    • -1
    • +3
    ./web/pages/authoring/parts/itemlist.jsp
  7. … 8 more files in changeset.
Friday 22 Dec 2023
11:00 pm

Marcin Cieslak

LDEV-5433 Squash DB patches and update versions

Options
    • -2
    • +2
    ./build.properties
    • -1
    • +2
    ./db/sql/create_lams_tool_scratchie.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20220920.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230220.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230410.sql
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230410_updateTo47.sql
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230411.sql
  8. … 101 more files in changeset.
12:57 am

Andrey Balan

LDEV-5397 fix inability to double click when such option is ON

Options
    • -2
    • +2
    ./web/pages/learning/learning.jsp
    • -0
    • +1
    ./web/pages/learning/scratchies.jsp
Thursday 21 Dec 2023
6:46 pm

Marcin Cieslak

LDEV-5401 Display individual extensions in time limit widget

Options
    • -2
    • +2
    ./web/pages/monitoring/studentChoices5.jsp
  2. … 5 more files in changeset.
4:42 pm

Marcin Cieslak

LDEV-5431 Reset activity completion on force uncomplete in Monitor

Options
    • -47
    • +63
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 38 more files in changeset.
8:13 am

Andrey Balan

LDEV-5397 improve burning questions' CSS at the results page

Options
    • -28
    • +42
    ./web/pages/learning/results.jsp
6:11 am

Andrey Balan

LDEV-5397 divs not having any special roles can't have aria-labels

Options
    • -2
    • +1
    ./web/pages/learning/scratchies.jsp
  2. … 11 more files in changeset.
Wednesday 20 Dec 2023
8:24 am

Andrey Balan

LDEV-5397 make sure all buttons have proper "type" attribute

Options
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -2
    • +2
    ./web/pages/learning/questionlist.jsp
    • -1
    • +1
    ./web/pages/learning/scratchies.jsp
    • -1
    • +1
    ./web/pages/learning/waitForLeaderTimeLimit.jsp
  5. … 21 more files in changeset.
Tuesday 19 Dec 2023
11:48 am

Ernie Ghiglione

LDEV-5397 Updating labels

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 84 more files in changeset.
Monday 18 Dec 2023
3:15 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.7' into LDEV-5397

# Conflicts:

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

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

# lams_admin/web/timezoneManagement.jsp

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

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

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

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

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

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

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

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

# lams_tool_scratchie/web/pages/learning/learning.jsp

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

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

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

Options
    • -18
    • +20
    ./web/pages/learning/learning.jsp
  2. … 9 more files in changeset.
Saturday 16 Dec 2023
12:31 am

Andrey Balan

LDEV-5397 copy-tags

Options
    • -2
    • +1
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +1
    ./web/WEB-INF/tags/Notebook.tag
    • -133
    • +163
    ./web/WEB-INF/tags/PageLearner.tag
    • -2
    • +2
    ./web/WEB-INF/tags/Rating5.tag
  5. … 155 more files in changeset.
12:20 am

Andrey Balan

LDEV-5397 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

Options
    • -1
    • +5
    ./web/includes/css/scratchie-learning.scss
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
    • -1
    • +1
    ./web/pages/learning/scratchies.jsp
  4. … 13 more files in changeset.
Wednesday 13 Dec 2023
9:03 am

Andrey Balan

LDEV-5397 fix jgrowl text color

Options
    • -0
    • +1
    ./web/includes/css/scratchie-learning.scss
  2. … 1 more file in changeset.
9:02 am

Andrey Balan

LDEV-5397 improvements to LeaderDisplay.tag

Options
    • -11
    • +10
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 1 more file in changeset.
8:39 am

Andrey Balan

LDEV-5427 fix a typo

Options
    • -1
    • +1
    ./web/pages/learning/parts/scratchieSvg.jsp
3:26 am

Andrey Balan

LDEV-5427 Start using new svgs for scatchie images

Options
    • -5
    • +50
    ./web/includes/css/scratchie-learning.scss
    • binary
    ./web/includes/images/answer-1.png
    • binary
    ./web/includes/images/answer-10.png
    • binary
    ./web/includes/images/answer-2.png
    • binary
    ./web/includes/images/answer-3.png
    • binary
    ./web/includes/images/answer-4.png
    • binary
    ./web/includes/images/answer-5.png
    • binary
    ./web/includes/images/answer-6.png
    • binary
    ./web/includes/images/answer-7.png
    • binary
    ./web/includes/images/answer-8.png
    • binary
    ./web/includes/images/answer-9.png
    • binary
    ./web/includes/images/scratchie-correct-animation.gif
    • binary
    ./web/includes/images/scratchie-correct.png
    • binary
    ./web/includes/images/scratchie-wrong-animation.gif
    • binary
    ./web/includes/images/scratchie-wrong.png
  16. … 4 more files in changeset.
Monday 11 Dec 2023
11:20 pm

Ernie Ghiglione

LDEV-5345 Adding and modifying labels based on changes for bootstrap 5

Options
    • -1
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +12
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +16
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +15
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +13
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +13
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +5
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +13
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +6
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  11. … 238 more files in changeset.
Friday 08 Dec 2023
12:32 am

Marcin Cieslak

LDEV-5361 Fix "require all answers" and "double click to reveal" problem

Options
    • -336
    • +337
    ./web/pages/learning/learning.jsp
Tuesday 05 Dec 2023
5:42 am

Andrey Balan

LDEV-5397 improve CSS of autosave notification

* make it identical in Scratchie and Assessment

Options
    • -2
    • +5
    ./web/includes/css/scratchie-learning.scss
  2. … 2 more files in changeset.
Thursday 30 Nov 2023
10:25 pm

Ernie Ghiglione

LDEV-5345 Adding and updating latest translations

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
  2. … 42 more files in changeset.
4:31 am

Andrey Balan

LDEV-5397 show warnings and nofications before activity's instructions

Options
    • -4
    • +4
    ./web/pages/learning/learning.jsp
  2. … 14 more files in changeset.