lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 01 Feb 2018
8:33 pm

Marcin Cieslak

LDEV-4507 Prevent duplicate groups with a DB constraint

Lesson staff groups need to have order id different than 1 so they do

not clash with learner groups.

Fetch lesson learner count faster by an exact query rather than fetching

all learners with Hibernate and counting them.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -7
    • +7
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
  4. … 2 more files in changeset.
Monday 29 Jan 2018
10:26 pm

Marcin Cieslak

LDEV-4504 Wrap activity names in links to pop up with their content

Options
    • -0
    • +10
    ./web/lessonComplete.jsp
  2. … 1 more file in changeset.
4:41 pm

Marcin Cieslak

Merge branch 'LDEV-4454'

Conflicts:

lams_central/web/includes/javascript/chart.js

Options
    • -3
    • +29
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 1 more file in changeset.
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -11
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
  11. … 69 more files in changeset.
9:02 pm

Andrey Balan

LDEV-4407 Move shared classes from lams_learning to lams_common

This is done in order to eliminate the need for other projects to

depend on lams_learning.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -324
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -63
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -4
    • +19
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -73
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -60
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java
    • -152
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -65
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/bean/GateActivityDTO.java
    • -20
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  10. … 7 more files in changeset.
Friday 05 Jan 2018
10:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Wednesday 13 Dec 2017
4:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4474 Able to change the scheduled open date time for a gate.

Also fixed a number of bugs causing the schedule gate screens to

report strange times, missing fields, etc.

Options
    • -2
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -6
    • +2
    ./web/gate/scheduleGateContent.jsp
  5. … 12 more files in changeset.
Thursday 23 Nov 2017
5:06 am

Marcin Cieslak

LDEV-4454 Add bar chart

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./web/css/kumalive.scss
    • -9
    • +23
    ./web/includes/javascript/kumalive.js
    • -0
    • +3
    ./web/kumalive/kumalive.jsp
  5. … 1 more file in changeset.
4:14 am

Marcin Cieslak

LDEV-4454 Add pie chart, colours to badges and missing voters.

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +20
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -6
    • +28
    ./web/css/kumalive.scss
    • -20
    • +108
    ./web/includes/javascript/kumalive.js
    • -4
    • +14
    ./web/kumalive/kumalive.jsp
  6. … 1 more file in changeset.
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
7:24 pm

Andrey Balan

LDEV-4472 Fix Javascript error on accessing a Grouping activity

Since <i name="ui-${user.userId}" class="fa fa-xs

fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp<c:out

value="${user.lastName}" /> was removed in one of the previous commits,

this peace of Javascript also needs to be taken care of.

Options
    • -1
    • +0
    ./web/grouping/show.jsp
5:56 pm

Marcin Cieslak

LDEV-4454 Add buttons to release votes & voters to learners

Options
    • -0
    • +14
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml
    • -4
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +40
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    ./web/css/kumalive.scss
    • -1
    • +41
    ./web/includes/javascript/kumalive.js
    • -2
    • +13
    ./web/kumalive/kumalive.jsp
  12. … 1 more file in changeset.
Tuesday 21 Nov 2017
9:06 pm

Marcin Cieslak

LDEV-4454 Display voters in groups and with badges

Options
    • -5
    • +40
    ./web/css/kumalive.scss
    • -8
    • +48
    ./web/includes/javascript/kumalive.js
    • -3
    • +2
    ./web/kumalive/kumalive.jsp
4:23 am

Marcin Cieslak

LDEV-4454 Add voting back end and basic front end

Options
    • -0
    • +6
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePollAnswer.hbm.xml
    • -66
    • +151
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +23
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -33
    • +75
    ./web/includes/javascript/kumalive.js
    • -1
    • +1
    ./web/kumalive/kumalive.jsp
  8. … 1 more file in changeset.
Monday 20 Nov 2017
6:34 pm

Marcin Cieslak

LDEV-4454 Clean up poll Java structure

Options
    • -39
    • +47
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
Sunday 19 Nov 2017
12:02 am

Marcin Cieslak

LDEV-4454: Add vote form and poll finish&close flow

Options
    • -2
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -29
    • +177
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -4
    • +19
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -1
    • +28
    ./web/css/kumalive.scss
    • -8
    • +121
    ./web/includes/javascript/kumalive.js
    • -6
    • +39
    ./web/kumalive/kumalive.jsp
Friday 17 Nov 2017
11:03 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll entities and start flow

Options
    • -0
    • +40
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml
    • -0
    • +23
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePollAnswer.hbm.xml
    • -1
    • +35
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +98
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -0
    • +76
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -2
    • +36
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -4
    • +11
    ./web/includes/javascript/kumalive.js
    • -1
    • +2
    ./web/kumalive/kumalive.jsp
  12. … 1 more file in changeset.
9:25 pm

Marcin Cieslak

LDEV-4454 Kumalive poll setup validation

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./web/css/kumalive.scss
    • -4
    • +76
    ./web/includes/javascript/kumalive.js
    • -7
    • +13
    ./web/kumalive/kumalive.jsp
Thursday 16 Nov 2017
9:43 pm

Marcin Cieslak

LDEV-4454 Use strict mode in Kumalive JS scripts

Options
    • -1
    • +2
    ./web/includes/javascript/kumalive.js
    • -0
    • +2
    ./web/kumalive/kumalive.jsp
9:41 pm

Marcin Cieslak

LDEV-4454 Prevent setting Kumalive speaker when no question is asked

Options
    • -0
    • +3
    ./web/includes/javascript/kumalive.js
9:34 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll setup front end

Options
    • -2
    • +13
    ./conf/language/lams/ApplicationResources.properties
    • -8
    • +39
    ./web/css/kumalive.scss
    • -2
    • +21
    ./web/includes/javascript/kumalive.js
    • -2
    • +37
    ./web/kumalive/kumalive.jsp
  5. … 1 more file in changeset.
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
Thursday 09 Nov 2017
11:41 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Adding labels

Options
    • -2
    • +43
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +43
    ./conf/language/lams/ApplicationResources_en_AU.properties
11:30 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4453: adding labels

Adding labels to central and learning

Options
    • -49
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Tuesday 07 Nov 2017
6:21 pm

Marcin Cieslak

LDEV-4453 Add "Your mark" in lesson complete gradebook

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./web/lessonComplete.jsp
  3. … 3 more files in changeset.
Saturday 04 Nov 2017
8:10 pm

Marcin Cieslak

LDEV-4453 Add gradebook on lesson complete front end

Options
    • -0
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -0
    • +82
    ./web/lessonComplete.jsp
  4. … 4 more files in changeset.
Thursday 02 Nov 2017
10:41 pm

Marcin Cieslak

LDEV-4411 Add collections 2nd level cache

Options
    • -0
    • +2
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
  2. … 97 more files in changeset.
Tuesday 31 Oct 2017
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    ./build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    ./build.xml
2:02 pm

Marcin Cieslak

LDEV-4366 Fix case of Kumalive class in Ant build file

It worked fine on case-insensitive systems, but on Linux it could not

find the Kumalive websocket class.

Options
    • -1
    • +1
    ./build.xml