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
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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -14
    • +25
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -6
    • +19
    ./web/pages/monitoring/summary.jsp
  6. … 3 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
    ./src/java/org/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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/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
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -12
    • +25
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +19
    ./web/pages/monitoring/summary.jsp
Saturday 21 Mar 2020
9:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -2
    • +2
    ./web/pages/authoring/parts/addItemFooter.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addVsa.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/statisticpart.jsp
    • -2
    • +2
    ./web/pages/tblmonitoring/burningQuestions.jsp
    • -5
    • +5
    ./web/pages/tblmonitoring/tra.jsp
    • -4
    • +4
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  7. … 193 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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -11
    • +38
    ./web/pages/monitoring/summary.jsp
  5. … 18 more files in changeset.
1:31 pm

Marcin Cieslak

LDEV-4992 Add icon to a leader in Scratchie monitoring summary

Options
    • -1
    • +10
    ./web/pages/monitoring/summary.jsp
Thursday 19 Mar 2020
9:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -12
    • +30
    ./web/pages/monitoring/summary.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +55
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -53
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +252
    ./web/pages/monitoring/studentChoices.jsp
    • -17
    • +8
    ./web/pages/monitoring/summary.jsp
Wednesday 18 Mar 2020
10:09 pm

Ernie Ghiglione

LDEV-4993 Slight layout changes

Options
    • -1
    • +3
    ./web/pages/monitoring/summary.jsp
8:55 pm

Marcin Cieslak

LDEV-4993 Move files to reflect logical assignment better

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +244
    ./web/pages/monitoring/studentChoices.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
    • -244
    • +0
    ./web/pages/tblmonitoring/traStudentChoices.jsp
8:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +65
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -65
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -16
    • +5
    ./web/pages/monitoring/summary.jsp
    • -52
    • +69
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  9. … 1 more file 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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -32
    • +28
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +19
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -13
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +4
    ./web/includes/css/scratchie-learning.scss
    • -0
    • +11
    ./web/pages/learning/learning.jsp
    • -2
    • +9
    ./web/pages/learning/results.jsp
    • -2
    • +8
    ./web/pages/learning/scratchies.jsp
  11. … 1 more file in changeset.
1:33 pm

Marcin Cieslak

LDEV-4990 Style results page the same way as learning page in Scratchie

Options
    • -1
    • +3
    ./web/pages/learning/results.jsp
1:14 pm

Marcin Cieslak

LDEV-4987 Round percentage cell in tRAT monitoring

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
10:12 am

Ernie Ghiglione

LDEV-4987 Minor adjustments in layout

Options
    • -7
    • +8
    ./web/pages/learning/scratchies.jsp
Wednesday 11 Mar 2020
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -0
    • +4
    ./web/includes/css/scratchie-learning.scss
    • -0
    • +11
    ./web/pages/learning/learning.jsp
    • -4
    • +6
    ./web/pages/learning/scratchies.jsp
5:56 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -38
    • +29
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +6
    ./web/pages/learning/results.jsp
    • -0
    • +4
    ./web/pages/learning/scratchies.jsp
Monday 09 Mar 2020
10:10 am

Ernie Ghiglione

LDEV-4986 Updating labels

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
10:10 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./conf/language/lams/ApplicationResources_no_NO.properties
10:04 am

Ernie Ghiglione

LDEV-4739 Updating Greek and Norwegian

Options
    • -2
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./conf/language/lams/ApplicationResources_no_NO.properties
10:03 am

Ernie Ghiglione

LDEV-4986 Updating labels

Options
    • -6
    • +22
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +22
    ./conf/language/lams/ApplicationResources_en_AU.properties
Sunday 08 Mar 2020
8:11 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
Saturday 22 Feb 2020
9:01 pm

Marcin Cieslak

LDEV-4976 Add DB cascades to reflect Hibernate inheritance

Options
    • -0
    • +16
    ./src/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
    • -1
    • +1
    ./build.properties
    • -40
    • +24
    ./db/sql/create_lams_tool_scratchie.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200219_updateTo40.sql
  7. … 53 more files in changeset.
Wednesday 19 Feb 2020
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    ./web/pages/learning/learning.jsp
  2. … 16 more files in changeset.
Tuesday 04 Feb 2020
11:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +2
    ./src/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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 37 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./web/403.jsp
    • -1
    • +0
    ./web/404.jsp
    • -0
    • +6
    ./web/WEB-INF/web.xml
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/error.jsp
    • -1
    • +0
    ./web/login.jsp
  7. … 167 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
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -49
    • +16
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -26
    • +1
    ./web/pages/authoring/basic.jsp
    • -14
    • +50
    ./web/pages/authoring/parts/itemlist.jsp
  5. … 1 more file in changeset.