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
Wednesday 21 Sep 2022
4:57 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5302' into v4.7

Conflicts:

lams_admin/conf/language/lams/ApplicationResources_zh_CN.properties

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserRolesSaveController.java

lams_admin/web/user.jsp

lams_central/conf/language/lams/ApplicationResources_zh_CN.properties

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

lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

Options
    • -7
    • +7
    ./web/WEB-INF/web.xml
  2. … 58 more files in changeset.
1:56 pm

Marcin Cieslak

LDEV-5328 Squash DB patches and update versions

Options
    • -2
    • +2
    ./build.properties
    • -129
    • +118
    ./db/sql/create_lams_tool_scratchie.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
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200222.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20201214.sql
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210301.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210511.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210714.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210819.sql
    • -0
    • +34
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20210819_updateTo46.sql
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20220920.sql
  14. … 142 more files in changeset.
Friday 16 Sep 2022
5:17 pm

Marcin Cieslak

LDEV-5083 Add burning questions count badges next to question in tRAT

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +15
    ./web/pages/monitoring/studentChoices.jsp
    • -0
    • +11
    ./web/pages/monitoring/studentChoices5.jsp
4:37 pm

Marcin Cieslak

LDEV-5083 Change name and icon of "Hide Student Choices" button

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./web/pages/monitoring/studentChoices5.jsp
  4. … 4 more files in changeset.
1:46 am

Marcin Cieslak

LDEV-5083 Improve table and icons colouring

Options
    • -4
    • +0
    ./web/pages/monitoring/parts/burningQuestions5.jsp
  2. … 2 more files in changeset.
1:01 am

Marcin Cieslak

LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -34
    • +32
    ./web/pages/tblmonitoring/teams.jsp
    • -44
    • +0
    ./web/pages/tblmonitoring/teams5.jsp
    • -100
    • +92
    ./web/pages/tblmonitoring/tra.jsp
    • -155
    • +0
    ./web/pages/tblmonitoring/tra5.jsp
  6. … 55 more files in changeset.
Wednesday 14 Sep 2022
9:33 pm

Marcin Cieslak

LDEV-5324 Do not call missing function on validation success

Options
    • -1
    • +0
    ./web/pages/authoring/parts/addVsa.jsp
  2. … 3 more files in changeset.
Monday 12 Sep 2022
12:58 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 2 more files in changeset.
Friday 26 Aug 2022
12:34 am

Marcin Cieslak

LDEV-5083 Show Burning Question nav button only if they are enabled

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Friday 19 Aug 2022
5:39 pm

Marcin Cieslak

LDEV-4928 While exporting skip empty VSA options

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 16 Aug 2022
12:54 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 12 Aug 2022
11:58 pm

Marcin Cieslak

LDEV-4604 Hide "Burning Questions" header if there are none

Options
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./web/pages/learning/results.jsp
11:52 pm

Marcin Cieslak

LDEV-5019 Add "session finished" icon in Scratchie Student Choices table

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +7
    ./web/pages/monitoring/studentChoices.jsp
Tuesday 09 Aug 2022
5:03 pm

Marcin Cieslak

LDEV-5083 Add custom JSP tags than will be used in next version

Options
    • -0
    • +40
    ./web/WEB-INF/tags/Dropdown.tag
    • -0
    • +29
    ./web/WEB-INF/tags/PageComponent.tag
    • -0
    • +76
    ./web/WEB-INF/tags/Panel.tag
  4. … 93 more files in changeset.
4:59 pm

Marcin Cieslak

LDEV-5083 Improve accessibility by allowing focus with TAB button

Options
    • -1
    • +1
    ./web/pages/monitoring/parts/burningQuestions5.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/tra5.jsp
  3. … 4 more files in changeset.
Thursday 28 Jul 2022
1:35 am

Marcin Cieslak

LDEV-5083 Reduce empty spaces on TBL pages

Options
    • -4
    • +4
    ./web/pages/tblmonitoring/tra5.jsp
  2. … 4 more files in changeset.
1:15 am

Marcin Cieslak

LDEV-5083 Add missing custom JSP tags

Options
    • -0
    • +45
    ./web/WEB-INF/tags/Input.tag
    • -0
    • +46
    ./web/WEB-INF/tags/Switch.tag
  3. … 62 more files in changeset.
Tuesday 26 Jul 2022
6:26 pm

Marcin Cieslak

LDEV-5083 Add missing custom JSP tags to TLD

Options
    • -0
    • +8
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 32 more files in changeset.
Sunday 17 Jul 2022
9:25 pm

Marcin Cieslak

LDEV-5083 Fix popovers and rewrite tRAT tooltips to popovers

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Popover.tag
    • -2
    • +3
    ./web/pages/monitoring/studentChoices5.jsp
    • -6
    • +10
    ./web/pages/monitoring/studentChoicesTable.jsp
  4. … 34 more files in changeset.
Friday 15 Jul 2022
11:22 pm

Marcin Cieslak

LDEV-5083 Update all data on tRAT student choices using Flux

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +23
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -2
    • +3
    ./web/WEB-INF/spring-servlet.xml
    • -0
    • +16
    ./web/WEB-INF/web.xml
    • -176
    • +35
    ./web/pages/monitoring/studentChoices5.jsp
    • -0
    • +138
    ./web/pages/monitoring/studentChoicesTable.jsp
Thursday 14 Jul 2022
7:58 pm

Marcin Cieslak

LDEV-5083 Rewrite TBL Peer Review tab to new UI

Options
    • -3
    • +3
    ./web/pages/monitoring/parts/burningQuestions5.jsp
  2. … 5 more files in changeset.
Wednesday 13 Jul 2022
9:23 pm

Marcin Cieslak

LDEV-5083 Rewrite TBL Burnign Questions tab to new UI

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +229
    ./web/pages/monitoring/parts/burningQuestions5.jsp
  3. … 2 more files in changeset.
7:42 pm

Marcin Cieslak

LDEV-5083 Rewrite TBL RAT tabs' modals to new UI

Options
    • -56
    • +51
    ./web/pages/monitoring/studentChoices5.jsp
  2. … 2 more files in changeset.
6:25 pm

Marcin Cieslak

LDEV-5083 Rewrite TBL tRAT & student choices tab to new UI

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +386
    ./web/pages/monitoring/studentChoices5.jsp
    • -0
    • +155
    ./web/pages/tblmonitoring/tra5.jsp
  4. … 4 more files in changeset.
Friday 01 Jul 2022
9:11 am

Ernie Ghiglione

LDEV-4769 Updating Norwegian

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 4 more files in changeset.
Wednesday 29 Jun 2022
9:49 pm

Marcin Cieslak

LDEV-5083 Rewrite TBL Teams tab modals to new UI

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +44
    ./web/pages/tblmonitoring/teams5.jsp
  3. … 7 more files in changeset.
Monday 06 Jun 2022
9:13 pm

Marcin Cieslak

LDEV-5317 Fix thread preventing server from shutting down

Using <c:import> in cross-module context prevents WildFly from shutting

down properly. The mechanism was replaced with an Ajax call.

Options
    • -6
    • +0
    ./web/WEB-INF/jboss-web.xml
    • -7
    • +14
    ./web/pages/monitoring/studentChoices.jsp
    • -7
    • +12
    ./web/pages/monitoring/summary.jsp
  4. … 8 more files in changeset.
1:52 pm

Ernie Ghiglione

LDEV-4769 Updating Chinese, English, Norwegian Greek, and Spanish

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -20
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -20
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -20
    • +0
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -21
    • +1
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  7. … 26 more files in changeset.
Tuesday 31 May 2022
9:46 pm

Marcin Cieslak

LDEV-5317 Move timeLimit.jsp from its own directory

Options
    • -1
    • +1
    ./web/pages/monitoring/studentChoices.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  3. … 5 more files in changeset.
Monday 30 May 2022
10:39 pm

Marcin Cieslak

LDEV-5317 Move time limit panel to single source in monitoring

Each tool using time limits (Assessment, Scratchie, Doku, Whiteboard)

had it own code to display and operate time limits.

In preparations for time limit widget in monitoring the code was

refactored so there is single source of time limit feature.

Options
    • -20
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -20
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -0
    • +6
    ./web/WEB-INF/jboss-web.xml
    • -0
    • +2
    ./web/pages/monitoring/monitoring.jsp
    • -560
    • +0
    ./web/pages/monitoring/parts/timeLimit.jsp
    • -1
    • +7
    ./web/pages/monitoring/studentChoices.jsp
    • -1
    • +7
    ./web/pages/monitoring/summary.jsp
  9. … 22 more files in changeset.