lams-github / lams_tool_doku / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 9
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
Saturday 30 Jan 2021
4:11 am

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -2
    • +14
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +12
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  3. … 20 more files in changeset.
Friday 29 Jan 2021
12:42 am

Marcin Cieslak

LDEV-5143 Allow changing leader if activity is not grouped

Options
    • -5
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 4 more files in changeset.
Tuesday 26 Jan 2021
5:29 am

Marcin Cieslak

LDEV-5143 Allow changing leader in Dokumaran monitoring

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +18
    ./org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -0
    • +36
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  6. … 4 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/dokumaran/web/controller/LearningController.java
  2. … 15 more files in changeset.
Tuesday 12 Jan 2021
1:42 am

Marcin Cieslak

LDEV-5025, LDEV-5120 Softly remove duplicate rating criteria

For Assessment and Dokumaran we only allow one rating criterion each. On

high load, after a gate was opened, there is a chance that 2 learners

will detect no criteria and both will create one, resulting a duplicate

criterion. Instead of throwing a hard exception and rendering the

activity unusable, just remove the duplicate criterion ignoring any

exceptions. This is lighter than having a multi-node synchronization.

Options
    • -4
    • +23
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  3. … 1 more file in changeset.
Thursday 07 Jan 2021
7:49 pm

Marcin Cieslak

LDEV-5141 Correctly display Finish button to non-leaders

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  2. … 1 more file in changeset.
6:56 pm

Marcin Cieslak

LDEV-5141 Allow Author to always continue in Preview mode

Options
    • -3
    • +22
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  2. … 3 more files in changeset.
Wednesday 06 Jan 2021
12:58 am

Marcin Cieslak

LDEV-5141 Make manual timer start optional

Options
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20210105.sql
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -2
    • +8
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  4. … 4 more files in changeset.
Tuesday 05 Jan 2021
12:12 am

Marcin Cieslak

LDEV-5120 Fix "wait for time limit launch" page parameter passing

Options
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  2. … 1 more file 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
    • -11
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  3. … 25 more files in changeset.
Thursday 10 Dec 2020
8:09 pm

Marcin Cieslak

LDEV-5120 Add Gallery Walk instructions

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
  3. … 4 more files in changeset.
Sunday 06 Dec 2020
10:43 pm

Marcin Cieslak

LDEV-5120 Refresh learner page for Gallery Walk using command websocket

Local Dokumaran websocket call could fail on multi-instance LAMS

environment.

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -3
    • +21
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
  4. … 1 more file in changeset.
3:51 pm

Marcin Cieslak

LDEV-5120 Fix Gallery Walk race condition when creating rating criterion

Options
    • -36
    • +37
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -26
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/AuthoringController.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
Thursday 03 Dec 2020
6:10 pm

Marcin Cieslak

LDEV-5120 Introduce ratings to Doku Gallery Walk

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -3
    • +54
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -4
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -13
    • +14
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  7. … 4 more files in changeset.
1:57 am

Marcin Cieslak

LDEV-5120 Allow teacher to finish Gallery Walk in Monitoring

Learners get pushed to Gallery Walk page again, with Finish button

visible.

Options
    • -1
    • +15
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  5. … 3 more files in changeset.
Wednesday 02 Dec 2020
8:56 pm

Marcin Cieslak

LDEV-5120 Allow teacher to start Gallery Walk in Monitoring

Learners get pushed to Gallery Walk page.

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +22
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -1
    • +21
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -44
    • +36
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
    • -3
    • +7
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
  9. … 3 more files in changeset.
Thursday 26 Nov 2020
2:27 pm

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku learning

Options
    • -4
    • +12
    ./org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -7
    • +28
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  4. … 3 more files in changeset.
2:27 pm

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku learning

Options
    • -4
    • +12
    ./org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -7
    • +42
    ./org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
  4. … 3 more files in changeset.
12:12 am

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku advanced authoring

Options
    • -0
    • +16
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -2
    • +23
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
  3. … 2 more files in changeset.
12:12 am

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku advanced authoring

Options
    • -0
    • +16
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -2
    • +23
    ./org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
  3. … 2 more files in changeset.
Friday 20 Nov 2020
4:51 am

Marcin Cieslak

LDEV-5122 Modify DB structure to produce 3.1 version

Till now DB structure was compliant with 3.0 version and patches

upgraded it to 3.1. Now we produce DB compliant with 3.1 and patches in

branch 4.0 upgrade it to version 4.0.

Options
    • -2
    • +22
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20190103_updateTo31.sql
    • -16
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -17
    • +0
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
  4. … 38 more files in changeset.
Thursday 19 Nov 2020
12:55 am

Marcin Cieslak

LDEV-5113 Set max mark for Dokumaran to 100

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java
  2. … 1 more file in changeset.
Tuesday 17 Nov 2020
7:21 pm

Marcin Cieslak

LDEV-5113 Introduce manual grading tool output

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -46
    • +18
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranOutputFactory.java
  3. … 3 more files in changeset.
Thursday 12 Nov 2020
11:19 pm

Marcin Cieslak

LDEV-4196 Sort groups alphabetically in Dokumaran monitoring UI

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranSessionDAOHibernate.java
Tuesday 28 Jul 2020
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
  2. … 33 more files in changeset.
Friday 29 May 2020
7:07 pm

Marcin Cieslak

LDEV-4997 Fix Doku content initialisation

Options
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
Tuesday 12 May 2020
3:59 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

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

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.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

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/LearningController.java

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.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/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
  2. … 8 more files in changeset.
Monday 11 May 2020
6:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -15
    • +7
    ./org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
  2. … 8 more files in changeset.
1:06 pm

Ernie Ghiglione

LDEV-5008 backporting to master

Options
    • -4
    • +6
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -0
    • +17
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
  3. … 3 more files in changeset.
Thursday 30 Apr 2020
8:33 am

Ernie Ghiglione

LDEV-5008 Rename doKumaran tool

Options
    • -1
    • +6
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200324.sql
    • -1
    • +5
    ./org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20200329.sql
  3. … 2 more files in changeset.