lams-github / lams_learning / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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 19 Jul 2018
3:17 pm

Marcin Cieslak

Merge to lams31 after a vital commit to master

Options
    • -2
    • +4
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 4 more files in changeset.
Saturday 30 Jun 2018
1:22 pm

Marcin Cieslak

LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.

Options
    • -2
    • +4
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 10 more files in changeset.
Sunday 24 Jun 2018
9:26 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

Options
    • -5
    • +7
    ./lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
  2. … 14 more files in changeset.
Wednesday 30 May 2018
8:18 pm

Marcin Cieslak

LDEV-4587 Display all ordered branches in progress bar

Ordered branching should be displayed similarly to optional sequences.

Options
    • -2
    • +6
    ./lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
Tuesday 22 May 2018
5:59 pm

Marcin Cieslak

LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

Options
    • -2
    • +2
    ./lamsfoundation/lams/learning/service/LearnerService.java
  2. … 14 more files in changeset.
Monday 21 May 2018
7:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • -4
    • +5
    ./lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -3
    • +23
    ./lamsfoundation/lams/learning/service/LearnerService.java
  3. … 5 more files in changeset.
Tuesday 01 May 2018
9:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • -2
    • +4
    ./lamsfoundation/lams/learning/web/util/ActivityMapping.java
  2. … 6 more files in changeset.
Monday 09 Apr 2018
9:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +3
    ./lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +17
    ./lamsfoundation/lams/learning/service/LearnerService.java
  3. … 34 more files in changeset.
Thursday 29 Mar 2018
7:35 pm

Marcin Cieslak

LDEV-4538 Display gate open user and time in monitoring

Options
    • -9
    • +11
    ./lamsfoundation/lams/learning/service/LearnerService.java
  2. … 12 more files in changeset.
Saturday 24 Mar 2018
2:12 am

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -51
    • +397
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +14
    ./lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -2
    • +94
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  4. … 81 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -0
    • +2
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
    • -6
    • +21
    ./lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -2
    • +10
    ./lamsfoundation/lams/learning/service/LearnerService.java
  4. … 63 more files in changeset.
Tuesday 20 Feb 2018
11:24 am

Marcin Cieslak

LDEV-4513 Check if websocket is open before sending anything

Options
    • -17
    • +30
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
Wednesday 07 Feb 2018
6:32 pm

Marcin Cieslak

LDEV-4508 Log when a Kumalive learner raises and lowers a hand

Options
    • -0
    • +3
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +91
    ./lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
    • -0
    • +3
    ./lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +10
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +1
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
  6. … 2 more files in changeset.
Tuesday 06 Feb 2018
10:55 pm

Marcin Cieslak

LDEV-4507 Use DTOs instead of entities as page attributes

It seems that using entities as page attributes outside a transaction

causes undesired effect. Portrait tag fetches data from DB and existing

entities, including group participants, get flushed from session. It

overwrites changes made by learners being added to a group.

Options
    • -15
    • +9
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
  2. … 5 more files in changeset.
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -4
    • +5
    ./lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -4
    • +4
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
    • -19
    • +7
    ./lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java
  5. … 59 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -6
    • +6
    ./lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -17
    • +17
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/service/LearnerService.java
  4. … 54 more files in changeset.
Friday 02 Feb 2018
7:10 am

Andrey Balan

LDEV-4407 Introduce new IMonitorFullService interface

MonitorService interfaces are redefined now:

1. IMonitorService is going to be used by core modules.

2. IMonitorFullService is used inside of lams_monitoring only and

nowhere else, as it contains lams_monitoring's internal logic and

classes.

Options
    • -2
    • +0
    ./lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -2
    • +0
    ./lamsfoundation/lams/learning/service/LearnerService.java
  3. … 30 more files in changeset.
6:11 am

Andrey Balan

LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

nowhere else, as it contains lams_learning's internal logic and

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

Options
    • -3
    • +5
    ./lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -1
    • +0
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +181
    ./lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -32
    • +2
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/service/LearnerServiceProxy.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -10
    • +3
    ./lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -7
    • +2
    ./lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -2
    • +2
    ./lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -16
    • +2
    ./lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -10
    • +2
    ./lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -8
    • +2
    ./lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -7
    • +2
    ./lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -3
    • +3
    ./lamsfoundation/lams/learning/web/action/GateAction.java
    • -6
    • +6
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
  16. … 20 more files in changeset.
5:41 am

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -5
    • +2
    ./lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
  2. … 58 more files in changeset.
Thursday 01 Feb 2018
9:39 pm

Marcin Cieslak

LDEV-4507 Use redirect after learner chooses a group

Plain Struts forward resulted in "learnerChooseGroup" being the current

address which could lead to unnecessary retransmissions.

Options
    • -2
    • +1
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -5
    • +3
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -24
    • +7
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
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
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -7
    • +7
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -6
    • +4
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
  4. … 2 more files 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
    ./lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/GateAction.java
    • -11
    • +0
    ./lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -1
    • +1
    ./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
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
    • -324
    • +0
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -63
    • +0
    ./lamsfoundation/lams/learning/service/ILearnerService.java
    • -4
    • +19
    ./lamsfoundation/lams/learning/service/LearnerService.java
    • -73
    • +0
    ./lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -60
    • +0
    ./lamsfoundation/lams/learning/web/bean/ActivityPositionDTO.java
    • -152
    • +0
    ./lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -65
    • +0
    ./lamsfoundation/lams/learning/web/bean/GateActivityDTO.java
    • -20
    • +2
    ./lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  10. … 7 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
    • -0
    • +3
    ./lamsfoundation/lams/learning/web/action/GateAction.java
  2. … 15 more files in changeset.
Thursday 23 Nov 2017
4:14 am

Marcin Cieslak

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

Options
    • -1
    • +20
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
  2. … 5 more files in changeset.
Wednesday 22 Nov 2017
5:56 pm

Marcin Cieslak

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

Options
    • -4
    • +40
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +18
    ./lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -0
    • +2
    ./lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +11
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +1
    ./lamsfoundation/lams/learning/learningApplicationContext.xml
  6. … 7 more files in changeset.
Tuesday 21 Nov 2017
4:23 am

Marcin Cieslak

LDEV-4454 Add voting back end and basic front end

Options
    • -66
    • +151
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +11
    ./lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -0
    • +2
    ./lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +23
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  5. … 4 more files in changeset.
Monday 20 Nov 2017
6:34 pm

Marcin Cieslak

LDEV-4454 Clean up poll Java structure

Options
    • -39
    • +47
    ./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
    • -29
    • +177
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -1
    • +1
    ./lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -4
    • +4
    ./lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +4
    ./lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -4
    • +19
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  6. … 4 more files in changeset.
Friday 17 Nov 2017
11:03 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll entities and start flow

Options
    • -1
    • +35
    ./lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +3
    ./lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +10
    ./lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +98
    ./lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -0
    • +76
    ./lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -0
    • +5
    ./lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -2
    • +36
    ./lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  8. … 5 more files in changeset.