lams-github / lams_tool_scratchie

src

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 19 Mar 2020
2:51 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java

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

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

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -5
    • +3
    ./java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +4
    ./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +55
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +12
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -53
    • +9
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  6. … 2 more files in changeset.
Wednesday 18 Mar 2020
8:55 pm

Marcin Cieslak

LDEV-4993 Move files to reflect logical assignment better

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 3 more files in changeset.
8:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +65
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +10
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -65
    • +8
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  6. … 4 more files in changeset.
Thursday 12 Mar 2020
1:55 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.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/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +12
    ./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -32
    • +28
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +19
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -13
    • +10
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  7. … 5 more files in changeset.
1:14 pm

Marcin Cieslak

LDEV-4987 Round percentage cell in tRAT monitoring

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
Wednesday 11 Mar 2020
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -1
    • +11
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 3 more files in changeset.
5:56 am

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +12
    ./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -38
    • +29
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +8
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  6. … 4 more files in changeset.
Sunday 08 Mar 2020
8:11 pm

Marcin Cieslak

LDEV-4986 Lowest score (not zero) is default for unravelled question

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  3. … 1 more file in changeset.
Saturday 22 Feb 2020
9:01 pm

Marcin Cieslak

LDEV-4976 Add DB cascades to reflect Hibernate inheritance

Options
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200222.sql
  2. … 3 more files in changeset.
12:32 am

Andrey Balan

LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

Options
    • -17
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -15
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -15
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
    • -0
    • +23
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200219_updateTo40.sql
  5. … 55 more files in changeset.
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 34 more files in changeset.
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 37 more files in changeset.
Wednesday 22 Jan 2020
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Options
    • -10
    • +14
    ./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 3 more files in changeset.
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Conflicts:

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

lams_tool_scratchie/web/pages/authoring/basic.jsp

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

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 3 more files in changeset.
Monday 20 Jan 2020
2:34 pm

Marcin Cieslak

LDEV-4846 Set QB question content folder when creating via TBL template

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
2:31 pm

Marcin Cieslak

LDEV-4947 Add questions from imported LD to user private QB collection

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

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130502_wviCustomUpdate.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
  5. … 73 more files in changeset.
Sunday 19 Jan 2020
3:25 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130502_wviCustomUpdate.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
  7. … 96 more files in changeset.
Wednesday 15 Jan 2020
5:57 am

Andrey Balan

LDEV-4928 Update TBL monitor and Excel export to fully support VSA type

Options
    • -1
    • +6
    ./java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -10
    • +26
    ./java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -35
    • +79
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  5. … 1 more file in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# 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/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -7
    • +9
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -3
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  4. … 92 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -3
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 9 more files in changeset.
Wednesday 08 Jan 2020
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -3
    • +2
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 12 more files in changeset.
Sunday 05 Jan 2020
11:49 pm

Ernie Ghiglione

LDEV Adding CSRF to Scratchie authoring

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# 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/authoring/authoringGeneral.js

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -21
    • +22
    ./java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -388
    • +448
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 18 more files in changeset.
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -14
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql
    • -14
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171026.sql
    • -15
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
    • -17
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql
    • -14
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql
    • -17
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180425.sql
    • -14
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180828.sql
    • -17
    • +0
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103.sql
    • -0
    • +59
    ./java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103_updateTo31.sql
  10. … 110 more files in changeset.
Tuesday 31 Dec 2019
5:14 am

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 42 more files in changeset.
12:34 am

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java

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

Options
    • -10
    • +10
    ./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +20
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
Saturday 28 Dec 2019
11:42 pm

Marcin Cieslak

LDEV-4935 Secure Scratchie websockets

User gets checked if he participates in the given activity.

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -25
    • +26
    ./java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -19
    • +26
    ./java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
11:04 am

Ernie Ghiglione

LDEV-4932 Add CSRF to Scratchie monitoring

Adding CSRF for:

- Changing group marks

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
2:23 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

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