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
Thursday 22 Apr 2021
1:57 am

Marcin Cieslak

LDEV-5121 Prevent Hibernate issues when processing existing QB questions

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Tuesday 20 Apr 2021
2:35 am

Marcin Cieslak

LDEV-5121 TBL wizard questions go to private collection

Unless collection is specified, like when importing questions from Word

or QTI

Options
    • -13
    • +19
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Sunday 18 Apr 2021
5:34 pm

Marcin Cieslak

LDEV-5185 Add Scratchie timing limits control to TBL monitoring

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 5 more files in changeset.
Thursday 25 Mar 2021
1:23 am

Marcin Cieslak

LDEV-5138 If leader entered activity, any learner can set him as leader

Options
    • -2
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 6 more files in changeset.
Friday 05 Mar 2021
12:21 am

Marcin Cieslak

LDEV-3545 Remove scratched answers on learner force uncomplete

Options
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 02 Mar 2021
2:36 am

Marcin Cieslak

LDEV-5185 Introduce time limits to Scratchie monitoring

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210301.sql
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -9
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -18
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
    • -0
    • +77
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  9. … 12 more files in changeset.
Monday 01 Mar 2021
9:17 pm

Marcin Cieslak

LDEV-5185 Introduce absolute time limit and adjustments to Scratchie

Options
    • -0
    • +19
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210301.sql
    • -6
    • +18
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -4
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -3
    • +12
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  7. … 3 more files in changeset.
Sunday 28 Feb 2021
2:57 pm

Marcin Cieslak

LDEV-5185 Introduce advanced timing limits in Scratchie

Options
    • -10
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -9
    • +28
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -86
    • +76
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -217
    • +137
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  5. … 7 more files in changeset.
Friday 26 Feb 2021
2:22 am

Marcin Cieslak

LDEV-5174 Redesign TBL monitor team tab

Extract tRAT stats to the top. Add counters of correct answers both for

iRAT and tRAT.

Options
    • -1
    • +37
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 10 more files in changeset.
Tuesday 23 Feb 2021
5:12 am

Marcin Cieslak

LDEV-5148 Add median, mode etc. to Scratchie excel export

Options
    • -4
    • +34
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
12:44 am

Marcin Cieslak

LDEV-5152 Make Scratchie chart consistent with rest of monitoring UI

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
Monday 22 Feb 2021
8:26 pm

Marcin Cieslak

LDEV-5171 Fix percent rounding in Student Choices table

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:19 pm

Marcin Cieslak

LDEV-5169 Add data for median and modes on Scratchie analysis screen

Options
    • -3
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -25
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -29
    • +91
    ./org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -18
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  7. … 1 more file in changeset.
7:40 pm

Marcin Cieslak

LDEV-5152 Use correct data for charts and item analysis.

For mark charts and stats we submitted data. It corresponds to

teachers' desire to see stats as soon as it is available, even when

learners have not finished an activity yet.

For item analysis we have to use only data from

learners who finished (not only submitted) the activity. It is because

lesson marks are updated only on activity finish and we need lesson

marks to calculate item analysis factors. An explanation for teachers

has been added.

If we want it to work the same as mark charts, we need to have lesson

marks to be updated on activity submit.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
  2. … 5 more files in changeset.
Saturday 20 Feb 2021
5:55 pm

Marcin Cieslak

LDEV-5171 Add question stats and colour indication to choices table

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +20
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -2
    • +13
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  5. … 1 more file in changeset.
Friday 19 Feb 2021
2:28 pm

Marcin Cieslak

LDEV-5182 Fix ordering in non-empty 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
  3. … 1 more file in changeset.
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.