lams-github / lams_tool_scratchie / src / java

org

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
Monday 13 Apr 2020
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

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

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
    • -0
    • +11
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +5
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +17
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  7. … 7 more files in changeset.
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -10
    • +14
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
    • -0
    • +11
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +5
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +17
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  7. … 7 more files in changeset.
Wednesday 01 Apr 2020
7:44 pm

Marcin Cieslak

LDEV-4998 Protect activity default questions from modification

Options
    • -4
    • +17
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 5 more files in changeset.
12:08 pm

Marcin Cieslak

LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Thursday 26 Mar 2020
6:59 pm

Marcin Cieslak

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

Conflicts:

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

Options
    • -0
    • +10
    ./lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -14
    • +25
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  5. … 4 more files in changeset.
Wednesday 25 Mar 2020
12:44 am

Marcin Cieslak

LDEV-4993 Convert double to percent correctly in Scratcie monitoring

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 24 Mar 2020
1:19 am

Marcin Cieslak

LDEV-4992 Remove obsolete method parameter

Options
    • -4
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
1:17 am

Marcin Cieslak

LDEV-4992 Display all learners in group in Scratchie monitoring summary

Mark ones who reached the activity.

Options
    • -4
    • +13
    ./lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -12
    • +25
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 2 more files in changeset.
Friday 20 Mar 2020
1:35 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -4
    • +12
    ./lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 19 more files in changeset.
Thursday 19 Mar 2020
9:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -0
    • +9
    ./lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 2 more files in changeset.
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
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +4
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +55
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +12
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -53
    • +9
    ./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
    ./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
    ./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +65
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +10
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -65
    • +8
    ./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
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +12
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -32
    • +28
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +19
    ./lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -13
    • +10
    ./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
    ./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
    ./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
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +12
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -38
    • +29
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +8
    ./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
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +5
    ./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
    ./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
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
    • -0
    • +23
    ./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
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +2
    ./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
    ./lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +2
    ./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
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    ./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
    ./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    ./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
    ./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
    ./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
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20130502_wviCustomUpdate.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./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
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20130502_wviCustomUpdate.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -2
    • +2
    ./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
    ./lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -10
    • +26
    ./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -35
    • +79
    ./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./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
    ./lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -7
    • +9
    ./lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -3
    • +2
    ./lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  4. … 92 more files in changeset.