lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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 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
    • -8
    • +3
    ./lamsfoundation/lams/commonContext.xml
    • -20
    • +23
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -41
    • +16
    ./lamsfoundation/lams/rating/service/RatingService.java
  4. … 81 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -5
    • +10
    ./lamsfoundation/lams/web/util/CustomStrutsExceptionHandler.java
  2. … 34 more files in changeset.
Wednesday 21 Mar 2018
9:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4535 Changes to TBL Template

Added support for a Peer Review activity, Monitor selected group

count saved properly the application exercises are grouped.

Options
    • -0
    • +15
    ./lamsfoundation/lams/rating/model/RatingCriteria.java
    • -30
    • +6
    ./lamsfoundation/lams/rating/service/RatingService.java
  3. … 13 more files in changeset.
Sunday 04 Mar 2018
9:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -2
    • +3
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -10
    • +20
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  3. … 12 more files in changeset.
Wednesday 28 Feb 2018
2:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -0
    • +4
    ./lamsfoundation/lams/usermanagement/User.java
  2. … 8 more files in changeset.
Friday 23 Feb 2018
4:43 pm

Marcin Cieslak

LDEV-4519 Hide learners who are also staff

Options
    • -3
    • +3
    ./lamsfoundation/lams/usermanagement/IUserDAO.java
    • -7
    • +12
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -2
    • +2
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +3
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  5. … 4 more files in changeset.
Thursday 22 Feb 2018
6:08 pm

Marcin Cieslak

LDEV-4519 Make random passwords easier

Options
    • -3
    • +1
    ./lamsfoundation/lams/integration/security/RandomPasswordGenerator.java
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/comments/Comment.java
    • -1
    • +2
    ./lamsfoundation/lams/comments/commentsContext.xml
    • -9
    • +56
    ./lamsfoundation/lams/comments/service/CommentService.java
    • -8
    • +0
    ./lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -10
    • +7
    ./lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -5
    • +5
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -3
    • +5
    ./lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -0
    • +2
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -21
    • +36
    ./lamsfoundation/lams/logevent/service/LogEventService.java
    • -9
    • +5
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -1
    • +1
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -229
    • +0
    ./lamsfoundation/lams/util/audit/AuditService.java
    • -138
    • +0
    ./lamsfoundation/lams/util/audit/IAuditService.java
  15. … 52 more files in changeset.
Wednesday 21 Feb 2018
11:09 pm

Marcin Cieslak

LDEV-4519 Add paged, sortable user grids

Options
    • -0
    • +4
    ./lamsfoundation/lams/usermanagement/IUserDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/usermanagement/dao/IRoleDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java
    • -9
    • +35
    ./lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
    • -0
    • +5
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -2
    • +13
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  7. … 5 more files in changeset.
Tuesday 20 Feb 2018
4:57 pm

Marcin Cieslak

LDEV-4519 Add complex password generator

Options
    • -3
    • +57
    ./lamsfoundation/lams/integration/security/RandomPasswordGenerator.java
Monday 19 Feb 2018
12:28 pm

Marcin Cieslak

LDEV-3640 There should be a cascade in case of ID change, not set null

Options
    • -2
    • +2
    ./lamsfoundation/lams/dbupdates/patch20180218.sql
12:56 am

Marcin Cieslak

LDEV-3640 Add cascades so LDs can get removed

Options
    • -0
    • +25
    ./lamsfoundation/lams/dbupdates/patch20180218.sql
Wednesday 14 Feb 2018
6:42 pm

Marcin Cieslak

LDEV-4516 Allow "-" chars in image path when exporting to QTI

Options
    • -1
    • +1
    ./lamsfoundation/lams/questions/QuestionExporter.java
Tuesday 13 Feb 2018
2:08 am

Andrey Balan

LDEV-4512 Calculate lessonMaxPossibleMark properly

Take into account whether learning design uses grade weights.

Options
    • -18
    • +25
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  2. … 1 more file in changeset.
1:52 am

Andrey Balan

LDEV-4512 Move isWeightedMarks method to LamsCoreToolService

Move isWeightedMarks(LearningDesign design) from GradebookService

to LamsCoreToolService in order to avoid creation of a new

dependency on lams_gradebook.

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -0
    • +17
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  3. … 2 more files in changeset.
Monday 12 Feb 2018
4:25 pm

Marcin Cieslak

LDEV-4507 Add queries which remove group duplicates before adding index

Options
    • -0
    • +41
    ./lamsfoundation/lams/dbupdates/patch20180201.sql
Friday 09 Feb 2018
4:42 pm

Marcin Cieslak

LDEV-4507 Add query allowing index to be created on existing DB

Options
    • -0
    • +2
    ./lamsfoundation/lams/dbupdates/patch20180201.sql
Wednesday 07 Feb 2018
6:32 pm

Marcin Cieslak

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

Options
    • -0
    • +22
    ./lamsfoundation/lams/dbupdates/patch20180207.sql
  2. … 6 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
    • -0
    • +17
    ./lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -0
    • +68
    ./lamsfoundation/lams/usermanagement/dto/UserBasicDTO.java
  3. … 4 more files in changeset.
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +3
    ./lamsfoundation/lams/commonContext.xml
    • -13
    • +16
    ./lamsfoundation/lams/dbupdates/patch20180123.sql
    • -9
    • +13
    ./lamsfoundation/lams/integration/security/SsoHandler.java
    • -0
    • +6
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -0
    • +20
    ./lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -16
    • +17
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -1
    • +1
    ./lamsfoundation/lams/logevent/LogEventType.java
    • -1
    • +1
    ./lamsfoundation/lams/logevent/dao/ILogEventDAO.java
    • -4
    • +8
    ./lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -7
    • +24
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -15
    • +164
    ./lamsfoundation/lams/logevent/service/LogEventService.java
    • -16
    • +24
    ./lamsfoundation/lams/security/SecurityService.java
    • -2
    • +3
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +1
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
    • -10
    • +20
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  16. … 48 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
    • -4
    • +2
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -108
    • +0
    ./lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java
    • -4
    • +2
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -85
    • +0
    ./lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java
    • -0
    • +70
    ./lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +11
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
    • -0
    • +6
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -3
    • +3
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -0
    • +20
    ./lamsfoundation/lams/util/CommonConstants.java
  10. … 48 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
    • -0
    • +344
    ./lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +67
    ./lamsfoundation/lams/monitoring/service/MonitoringServiceException.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
    • -326
    • +0
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -13
    • +116
    ./lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +30
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
    • -12
    • +45
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -0
    • +3
    ./lamsfoundation/lams/toolApplicationContext.xml
  6. … 30 more files in changeset.
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
    • -0
    • +9
    ./lamsfoundation/lams/dbupdates/patch20180201.sql
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/Group.java
  3. … 3 more files in changeset.
Monday 29 Jan 2018
12:14 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 First cut of audit log screen implemented.

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +52
    ./lamsfoundation/lams/dbupdates/patch20180123.sql
    • -5
    • +28
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +63
    ./lamsfoundation/lams/logevent/LogEventType.java
    • -0
    • +13
    ./lamsfoundation/lams/logevent/dao/ILogEventDAO.java
    • -0
    • +128
    ./lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -0
    • +68
    ./lamsfoundation/lams/logevent/dto/LogEventTypeDTO.java
    • -0
    • +25
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -2
    • +30
    ./lamsfoundation/lams/logevent/service/LogEventService.java
    • -13
    • +59
    ./lamsfoundation/lams/util/audit/AuditService.java
  11. … 10 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
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/dto/ActivityURL.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java
  4. … 76 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
    • +326
    ./lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -0
    • +57
    ./lamsfoundation/lams/learning/service/ILearnerService.java
    • -0
    • +73
    ./lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -0
    • +60
    ./lamsfoundation/lams/learningdesign/dto/ActivityPositionDTO.java
    • -0
    • +152
    ./lamsfoundation/lams/learningdesign/dto/ActivityURL.java
    • -0
    • +65
    ./lamsfoundation/lams/learningdesign/dto/GateActivityDTO.java
    • -4
    • +23
    ./lamsfoundation/lams/util/WebUtil.java
  8. … 9 more files in changeset.
7:12 am

Andrey Balan

LDEV-4407 Move shared contentrepository classes to lams_common

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

be dependent on lams_contentrepository.

Options
    • -0
    • +52
    ./lamsfoundation/lams/contentrepository/ITicket.java
    • -0
    • +85
    ./lamsfoundation/lams/contentrepository/NodeKey.java
    • -0
    • +199
    ./lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +396
    ./lamsfoundation/lams/contentrepository/client/ToolContentHandler.java
    • -0
    • +74
    ./lamsfoundation/lams/contentrepository/exception/FileException.java
    • -0
    • +73
    ./lamsfoundation/lams/contentrepository/exception/InvalidParameterException.java
    • -0
    • +74
    ./lamsfoundation/lams/contentrepository/exception/ItemNotFoundException.java
    • -0
    • +93
    ./lamsfoundation/lams/contentrepository/exception/RepositoryCheckedException.java
    • -0
    • +488
    ./lamsfoundation/lams/contentrepository/service/IRepositoryService.java
  10. … 9 more files in changeset.
Wednesday 24 Jan 2018
2:22 am

Andrey Balan

LDEV-4407 Move ped planner stuff to lams_planer

All ped planner related code moved out from lams_central and

lams_common to lams_planer. Although

PedagogicalPlannerActivityForm.java was moved from

lams_central to lams_common to be accessible by LAMS tools.

Options
    • -5
    • +0
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +115
    ./lamsfoundation/lams/planner/PedagogicalPlannerActivityForm.java
    • -94
    • +0
    ./lamsfoundation/lams/planner/PedagogicalPlannerNodeRole.java
    • -195
    • +0
    ./lamsfoundation/lams/planner/PedagogicalPlannerSequenceNode.java
    • -55
    • +0
    ./lamsfoundation/lams/planner/dao/PedagogicalPlannerDAO.java
    • -200
    • +0
    ./lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
    • -184
    • +0
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerActivityDTO.java
    • -326
    • +0
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -197
    • +0
    ./lamsfoundation/lams/planner/dto/PedagogicalPlannerTemplateDTO.java
    • -6
    • +0
    ./lamsfoundation/lams/web/util/AttributeNames.java
  11. … 15 more files in changeset.
Thursday 18 Jan 2018
6:20 pm

Marcin Cieslak

LDEV-4497 Split authored image path when saving

Options
    • -4
    • +22
    ./lamsfoundation/lams/util/UploadFileUtil.java