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
Tuesday 04 Dec 2018
12:32 pm

Marcin Cieslak

LDEV-4721 Change order of changes applied to imported LD XML

First we need to change class names, then add/remove fields as otherwise

owner classes would not get recognised.

Options
    • -13
    • +5
    ./lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
Monday 03 Dec 2018
9:39 am

Marcin Cieslak

LDEV-4721 Add class renaming filter for tool content import

Options
    • -30
    • +86
    ./lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
  2. … 17 more files in changeset.
Saturday 01 Dec 2018
11:27 pm

Marcin Cieslak

LDEV-4696 Remove an unnecessary Hibernate restriction

Options
    • -11
    • +1
    ./lamsfoundation/lams/learningdesign/GroupingActivity.java
Wednesday 28 Nov 2018
3:50 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

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

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

Options
    • -0
    • +2
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  2. … 10 more files in changeset.
3:54 am

Andrey Balan

LDEV-4710 Add config setting to enable "Forgot your password?" option

Also if people try to get to the login page by going to the URL

directly, we display a 404 error message.

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20181127.sql
    • -0
    • +2
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 4 more files in changeset.
Tuesday 27 Nov 2018
9:46 pm

Marcin Cieslak

LDEV-4714 Fix LD access adding and processing

Options
    • -4
    • +6
    ./lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java
    • -1
    • +12
    ./lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
  3. … 2 more files in changeset.
Monday 26 Nov 2018
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -15
    • +15
    ./lamsfoundation/lams/comments/Comment.java
    • -5
    • +4
    ./lamsfoundation/lams/comments/CommentLike.java
    • -1
    • +2
    ./lamsfoundation/lams/events/Subscription.java
    • -2
    • +3
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -2
    • +3
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -2
    • +3
    ./lamsfoundation/lams/integration/ExtCourseClassMap.java
    • -1
    • +2
    ./lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -2
    • +3
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -2
    • +3
    ./lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -7
    • +8
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -4
    • +4
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/Competence.java
    • -2
    • +3
    ./lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
  16. … 156 more files in changeset.
11:23 pm

Marcin Cieslak

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

Options
    • -15
    • +15
    ./lamsfoundation/lams/comments/Comment.java
    • -5
    • +4
    ./lamsfoundation/lams/comments/CommentLike.java
    • -1
    • +2
    ./lamsfoundation/lams/events/Subscription.java
    • -2
    • +3
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -2
    • +3
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -2
    • +3
    ./lamsfoundation/lams/integration/ExtCourseClassMap.java
    • -1
    • +2
    ./lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -2
    • +3
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -2
    • +3
    ./lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -7
    • +8
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -4
    • +4
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -1
    • +2
    ./lamsfoundation/lams/learningdesign/Competence.java
    • -2
    • +3
    ./lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
  16. … 156 more files in changeset.
Thursday 22 Nov 2018
7:13 pm

Marcin Cieslak

LDEV-4712, LDEV-4644 Fix a query used for fetching outcomes

Options
    • -6
    • +15
    ./lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
Wednesday 21 Nov 2018
11:16 pm

Marcin Cieslak

LDEV-4696 Proper use of @MapsId with @EmbeddableId

Options
    • -2
    • +5
    ./lamsfoundation/lams/learningdesign/GroupUser.java
Friday 16 Nov 2018
2:46 am

Andrey Balan

DEMO-2 Add new wrapper methods that allow specifying userId

IToolContentHandler methods assume userId is always available from the

current HttpSession. However sometimes, as in the case of lams_demo,

userId can't be acquired from HttpSession (as it might be invalidated

already), so we need to have an ability to specify userId as a

parameter.

Options
    • -6
    • +20
    ./lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
  2. … 4 more files in changeset.
Thursday 15 Nov 2018
1:16 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4697 Audit entries filtering by user and remarks

Options
    • -3
    • +4
    ./lamsfoundation/lams/logevent/dao/ILogEventDAO.java
    • -32
    • +122
    ./lamsfoundation/lams/logevent/dao/hibernate/LogEventDAO.java
    • -3
    • +9
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -6
    • +8
    ./lamsfoundation/lams/logevent/service/LogEventService.java
  5. … 3 more files in changeset.
Tuesday 13 Nov 2018
12:11 am

Marcin Cieslak

LDEV-4649 Get rid of obsolete field

Options
    • -22
    • +14
    ./lamsfoundation/lams/learningdesign/LearningDesign.java
  2. … 1 more file in changeset.
Friday 09 Nov 2018
6:37 pm

Marcin Cieslak

LDEV-4696 Remove hbm.xml file remains

Options
    • -6
    • +0
    ./lamsfoundation/lams/commonContext.xml
  2. … 2 more files in changeset.
Thursday 08 Nov 2018
6:47 pm

Marcin Cieslak

LDEV-4649 Make import work with files with header or with pure data

Options
    • -90
    • +104
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
6:23 pm

Marcin Cieslak

LDEV-4649 Fix outcome and scale import

Fixed paths for import and outcome/scale removal.

Description is now an optional field when importing.

Options
    • -2
    • +2
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  2. … 4 more files in changeset.
Wednesday 07 Nov 2018
8:04 pm

Andrey Balan

LDEV-4696 Add generics to common methods

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -2
    • +1
    ./lamsfoundation/lams/tool/ToolSessionManager.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
12:52 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Fixing bugs with new single activity lesson, notifications

Options
    • -1
    • +1
    ./lamsfoundation/lams/events/Subscription.java
    • -4
    • +10
    ./lamsfoundation/lams/learningdesign/LearningDesign.java
Tuesday 06 Nov 2018
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4696' of https://github.com/lamsfoundation/lams into LDEV-4696

Options
    • -0
    • +3
    ./lamsfoundation/lams/commonContext.xml
6:50 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy

Options
    • -0
    • +50
    ./lamsfoundation/lams/comments/Comment.java
    • -0
    • +21
    ./lamsfoundation/lams/comments/CommentLike.java
    • -0
    • +20
    ./lamsfoundation/lams/comments/CommentSession.java
    • -30
    • +30
    ./lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -9
    • +9
    ./lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -8
    • +8
    ./lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
    • -5
    • +6
    ./lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -13
    • +14
    ./lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -0
    • +8
    ./lamsfoundation/lams/rating/model/AuthoredItemRatingCriteria.java
    • -0
    • +6
    ./lamsfoundation/lams/rating/model/LearnerItemRatingCriteria.java
    • -0
    • +11
    ./lamsfoundation/lams/rating/model/LessonRatingCriteria.java
    • -10
    • +22
    ./lamsfoundation/lams/rating/model/Rating.java
    • -1
    • +24
    ./lamsfoundation/lams/rating/model/RatingComment.java
  16. … 20 more files in changeset.
4:03 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +3
    ./lamsfoundation/lams/commonContext.xml
    • -1
    • +30
    ./lamsfoundation/lams/events/EmailNotificationArchive.java
    • -43
    • +28
    ./lamsfoundation/lams/events/Event.java
    • -25
    • +21
    ./lamsfoundation/lams/events/Subscription.java
    • -15
    • +20
    ./lamsfoundation/lams/integration/ExtCourseClassMap.java
    • -28
    • +48
    ./lamsfoundation/lams/integration/ExtServer.java
    • -19
    • +23
    ./lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -23
    • +21
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -19
    • +23
    ./lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -0
    • +34
    ./lamsfoundation/lams/outcome/Outcome.java
    • -1
    • +23
    ./lamsfoundation/lams/outcome/OutcomeMapping.java
    • -0
    • +27
    ./lamsfoundation/lams/outcome/OutcomeResult.java
    • -0
    • +36
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -1
    • +21
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.java
  15. … 13 more files in changeset.
Monday 05 Nov 2018
3:57 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +20
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -20
    • +22
    ./lamsfoundation/lams/learningdesign/Competence.java
    • -31
    • +21
    ./lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -25
    • +41
    ./lamsfoundation/lams/learningdesign/GroupUser.java
    • -48
    • +44
    ./lamsfoundation/lams/learningdesign/LearningDesignAccess.java
    • -0
    • +31
    ./lamsfoundation/lams/learningdesign/LearningDesignAnnotation.java
    • -27
    • +23
    ./lamsfoundation/lams/learningdesign/LearningLibrary.java
    • -15
    • +23
    ./lamsfoundation/lams/learningdesign/LearningLibraryGroup.java
    • -21
    • +27
    ./lamsfoundation/lams/learningdesign/License.java
    • -6
    • +6
    ./lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
    • -82
    • +38
    ./lamsfoundation/lams/tool/SystemTool.java
    • -49
    • +20
    ./lamsfoundation/lams/tool/ToolContent.java
    • -35
    • +26
    ./lamsfoundation/lams/usermanagement/AuthenticationMethod.java
    • -23
    • +15
    ./lamsfoundation/lams/usermanagement/AuthenticationMethodType.java
    • -8
    • +22
    ./lamsfoundation/lams/usermanagement/FavoriteOrganisation.java
  16. … 40 more files in changeset.
Sunday 04 Nov 2018
5:48 pm

Marcin Cieslak

LDEV-4696 Remove obsolete DTO

Options
    • -479
    • +0
    ./lamsfoundation/lams/tool/BasicToolVO.java
    • -81
    • +0
    ./lamsfoundation/lams/tool/IToolVO.java
    • -8
    • +0
    ./lamsfoundation/lams/tool/Tool.java
    • -17
    • +20
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
    • -20
    • +12
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -4
    • +4
    ./lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java
  7. … 9 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -43
    • +17
    ./lamsfoundation/lams/config/ConfigurationItem.java
    • -28
    • +30
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -20
    • +26
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -52
    • +10
    ./lamsfoundation/lams/lesson/CompletedActivityProgress.java
    • -50
    • +10
    ./lamsfoundation/lams/lesson/CompletedActivityProgressArchive.java
    • -96
    • +59
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -22
    • +42
    ./lamsfoundation/lams/lesson/LearnerProgressArchive.java
    • -24
    • +21
    ./lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java
    • -19
    • +19
    ./lamsfoundation/lams/themes/Theme.java
    • -132
    • +49
    ./lamsfoundation/lams/tool/Tool.java
    • -3
    • +4
    ./lamsfoundation/lams/usermanagement/User.java
  13. … 14 more files in changeset.
Friday 02 Nov 2018
10:32 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -41
    • +80
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -9
    • +3
    ./lamsfoundation/lams/learningdesign/ActivityOrderComparator.java
    • -12
    • +5
    ./lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -10
    • +40
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -29
    • +22
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -32
    • +6
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -6
    • +11
    ./lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -36
    • +32
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -35
    • +11
    ./lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -28
    • +22
    ./lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -8
    • +13
    ./lamsfoundation/lams/learningdesign/DataTransition.java
    • -44
    • +15
    ./lamsfoundation/lams/learningdesign/FloatingActivity.java
    • -14
    • +24
    ./lamsfoundation/lams/learningdesign/GateActivity.java
    • -44
    • +53
    ./lamsfoundation/lams/learningdesign/Group.java
  16. … 45 more files in changeset.
Thursday 01 Nov 2018
3:24 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV4696 Removing legacy parameters and deprecated methods

Options
    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
  2. … 29 more files in changeset.
Monday 29 Oct 2018
9:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Content Repository converted to annotations

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
  2. … 13 more files in changeset.
2:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 TZ, Notebook entry, Log Event, Signup, Policies converted

Options
    • -1
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -29
    • +23
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +16
    ./lamsfoundation/lams/logevent/LogEventType.java
    • -0
    • +25
    ./lamsfoundation/lams/notebook/model/NotebookEntry.java
    • -8
    • +34
    ./lamsfoundation/lams/policies/Policy.java
    • -5
    • +19
    ./lamsfoundation/lams/policies/PolicyConsent.java
    • -1
    • +39
    ./lamsfoundation/lams/signup/model/SignupOrganisation.java
    • -0
    • +14
    ./lamsfoundation/lams/timezone/Timezone.java
  9. … 7 more files in changeset.
Friday 26 Oct 2018
1:55 pm

Marcin Cieslak

LDEV-4696 Rewrite Condition inheritance to Hibernate annotations

Options
    • -1
    • +6
    ./lamsfoundation/lams/commonContext.xml
    • -5
    • +35
    ./lamsfoundation/lams/learningdesign/BranchCondition.java
    • -2
    • +16
    ./lamsfoundation/lams/learningdesign/TextSearchCondition.java
  4. … 2 more files in changeset.
Thursday 25 Oct 2018
6:38 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Correct scan path for tool Hibernate objects

Options
    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml