lams-github / lams_tool_scratchie / src

java

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
Friday 19 Feb 2021
4:18 am

Marcin Cieslak

LDEV-5182 Do not show Monitors questions with no burning questions

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
Thursday 18 Feb 2021
5:28 am

Marcin Cieslak

LDEV-5181 Allow mark hedging questions for iRAT/tRAT in TBL template

Options
    • -1
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 9 more files in changeset.
5:27 am

Marcin Cieslak

LDEV-4884 Generate new UUID for new QB question version

UUID has to identify uniquely an exact version, not only the question in

general.

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Wednesday 17 Feb 2021
1:19 am

Marcin Cieslak

LDEV-5179 Add mark hedging question type support to Scratchie

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -9
    • +17
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  5. … 6 more files in changeset.
Monday 15 Feb 2021
2:53 pm

Marcin Cieslak

LDEV-5175 Use TBL burning questions layout in monitoring in Scratchie

Options
    • -1
    • +30
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -27
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  3. … 5 more files in changeset.
Saturday 30 Jan 2021
4:11 am

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -3
    • +13
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  3. … 20 more files in changeset.
Monday 25 Jan 2021
6:28 pm

Marcin Cieslak

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 33 more files in changeset.
4:44 am

Marcin Cieslak

LDEV-5143 Allow changing leader in Scratchie monitoring

Options
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +36
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  5. … 3 more files in changeset.
Sunday 24 Jan 2021
10:59 pm

Marcin Cieslak

LDEV-5143 Improve layout of wait for leader and change leader screens.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 15 more files in changeset.
Wednesday 30 Dec 2020
5:05 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

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

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -1
    • +40
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 29 more files in changeset.
Sunday 20 Dec 2020
1:57 am

Marcin Cieslak

LDEV-5138 Set leader only on his activity entry, not on any user entry

Options
    • -10
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 26 more files in changeset.
Wednesday 16 Dec 2020
1:41 am

Marcin Cieslak

LDEV-5128 Match VS answers more loosely

Remove all characters other than letters and numbers when matching

answers.

Options
    • -2
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -26
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 3 more files in changeset.
Monday 14 Dec 2020
4:58 pm

Marcin Cieslak

LDEV-5136 Enable double click revealing in Scratchie

Options
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20201214.sql
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
  3. … 4 more files in changeset.
4:52 am

Marcin Cieslak

LDEV-5132 Improve indication of good/bad VSA answers in monitoring

Options
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -11
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 3 more files in changeset.
Tuesday 01 Dec 2020
8:58 pm

Marcin Cieslak

LDEV-4944 Recalculate Scratchie marks only for given VSA answer

Options
    • -5
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -17
    • +17
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 5 more files in changeset.
Sunday 22 Nov 2020
5:02 am

Marcin Cieslak

LDEV-5121 Add TBL template imported questions to chosen QB collection

Options
    • -10
    • +23
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 7 more files in changeset.
Saturday 21 Nov 2020
6:16 pm

Marcin Cieslak

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +29
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 8 more files in changeset.
Friday 20 Nov 2020
4:51 am

Marcin Cieslak

LDEV-5122 Modify DB structure to produce 3.1 version

Till now DB structure was compliant with 3.0 version and patches

upgraded it to 3.1. Now we produce DB compliant with 3.1 and patches in

branch 4.0 upgrade it to version 4.0.

Options
    • -2
    • +12
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103_updateTo31.sql
    • -17
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -15
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
  4. … 38 more files in changeset.
Thursday 19 Nov 2020
1:33 am

Marcin Cieslak

LDEV-5114 Add "Save as new version" button to Scratchie

Options
    • -1
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 2 more files in changeset.
Wednesday 11 Nov 2020
5:48 pm

Marcin Cieslak

LDEV-5101 Allow easy change of question version in Scratchie

Options
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Tuesday 10 Nov 2020
10:50 pm

Marcin Cieslak

LDEV-5110 Add Learning Outcomes processing in TBL template

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +33
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 8 more files in changeset.
Monday 09 Nov 2020
6:31 pm

Marcin Cieslak

LDEV-5102 Do not give marks to absent learners in Scratchie Excel report

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Sunday 08 Nov 2020
10:15 pm

Marcin Cieslak

LDEV-5101 Allow applying new question version to other activities in LD

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 12 more files in changeset.
Thursday 05 Nov 2020
5:54 pm

Marcin Cieslak

LDEV-5102 Prevent Scratchie from giving marks to absent learner

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -1
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -5
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -23
    • +22
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  5. … 2 more files in changeset.
Tuesday 22 Sep 2020
10:08 pm

Marcin Cieslak

LDEV-4745 Use correct Set class in Scratchie on TBL sequence create

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
9:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 7 more files in changeset.
Thursday 17 Sep 2020
11:12 pm

Marcin Cieslak

LDEV-4745 Sort QB questions using display order when fetching from DB

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
  2. … 2 more files in changeset.
10:17 pm

Marcin Cieslak

LKC-236 Return questions replaced in tool for further processing

Options
    • -1
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Monday 24 Aug 2020
5:25 pm

Marcin Cieslak

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Thursday 20 Aug 2020
2:46 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -2
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 25 more files in changeset.