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
Thursday 05 Jul 2018
2:02 pm

Andrey Balan

LDEV-4614 Sort country list by name rather than code

Options
    • -22
    • +48
    ./lamsfoundation/lams/util/LanguageUtil.java
  2. … 6 more files in changeset.
Wednesday 04 Jul 2018
10:56 pm

Andrey Balan

LDEV-4620 Submit Files tool to log release marks event

Options
    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180704.sql
    • -1
    • +1
    ./lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -1
    • +2
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +11
    ./lamsfoundation/lams/logevent/service/ILogEventService.java
    • -29
    • +20
    ./lamsfoundation/lams/logevent/service/LogEventService.java
  6. … 2 more files in changeset.
10:55 pm

Andrey Balan

LDEV-4620 Change return type of getLessonActivityIdsForToolContentId

Options
    • -1
    • +1
    ./lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -3
    • +10
    ./lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
4:23 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started learning migration

Options
    • -2
    • +3
    ./lamsfoundation/lams/util/FileValidatorUtil.java
  2. … 10 more files in changeset.
Monday 02 Jul 2018
7:47 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4605 adding missing country/territory

I forgot to include BQ = Bonaire, Saint Eustatius and Saba. Glad no one noticed ;-)

Options
    • -13
    • +13
    ./lamsfoundation/lams/util/CommonConstants.java
  2. … 2 more files in changeset.
Saturday 30 Jun 2018
7:22 am

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
    • -0
    • +6
    ./lamsfoundation/lams/dbupdates/patch20180628.sql
    • -1
    • +0
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -1
    • +22
    ./lamsfoundation/lams/lesson/LearnerProgressArchive.java
    • -0
    • +4
    ./lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +12
    ./lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
  6. … 6 more files in changeset.
Friday 29 Jun 2018
11:35 pm

Andrey Balan

LDEV-4605 Codify country for users

Change the country field to ISO_3166-1 alpha-2 codes (two letters).

So in when editing the profile, a user should be able to set his/her

country based on the list of countries in the ISO list.

Country should be a compulsory when editing profile, editing user

as group manager and in signup pages.

For integrations, if the country is not passed, then we should default

to a default country server.

Options
    • -0
    • +16
    ./lamsfoundation/lams/dbupdates/patch20180628.sql
    • -1
    • +12
    ./lamsfoundation/lams/integration/service/IntegrationService.java
  3. … 11 more files in changeset.
11:31 pm

Andrey Balan

LDEV-4605 Introduce CommonConstants.java

For starters it will contain user portrait dimensions and the list of

country codes.

Options
    • -3
    • +0
    ./lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -3
    • +4
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -0
    • +24
    ./lamsfoundation/lams/util/CommonConstants.java
  4. … 1 more file in changeset.
5:14 pm

Marcin Cieslak

LDEV-4440 Show archived activity attempts in gradebook

Options
    • -7
    • +13
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -54
    • +57
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
  3. … 8 more files in changeset.
Thursday 28 Jun 2018
8:26 pm

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • -0
    • +28
    ./lamsfoundation/lams/commonContext.xml
  2. … 5 more files in changeset.
9:22 am

Marcin Cieslak

LDEV-4607 Detach gradebook output from activity if "no score" is chosen

Options
    • -2
    • +7
    ./lamsfoundation/lams/tool/service/LamsToolService.java
8:41 am

Marcin Cieslak

LDEV-4609 Add archive date to gradebook marks on lesson restart

Options
    • -0
    • +18
    ./lamsfoundation/lams/dbupdates/patch20180628.sql
    • -2
    • +11
    ./lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java
    • -1
    • +13
    ./lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java
  4. … 4 more files in changeset.
12:54 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -0
    • +4
    ./lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -0
    • +77
    ./lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
    • -0
    • +37
    ./lamsfoundation/lams/policies/dto/UserPolicyConsentDTO.java
    • -7
    • +11
    ./lamsfoundation/lams/policies/service/IPolicyService.java
    • -21
    • +61
    ./lamsfoundation/lams/policies/service/PolicyService.java
  6. … 9 more files in changeset.
Monday 25 Jun 2018
5:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4603 Delete preview lessons with ratings now works

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180625.sql
  3. … 2 more files in changeset.
Sunday 24 Jun 2018
2:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • -1
    • +2
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -5
    • +41
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +18
    ./lamsfoundation/lams/rating/service/RatingService.java
  4. … 21 more files in changeset.
Saturday 23 Jun 2018
2:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -1
    • +0
    ./lamsfoundation/lams/dbupdates/patch20180528.sql
    • -6
    • +12
    ./lamsfoundation/lams/policies/Policy.java
    • -0
    • +95
    ./lamsfoundation/lams/policies/PolicyDTO.java
    • -4
    • +20
    ./lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -11
    • +82
    ./lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
    • -3
    • +33
    ./lamsfoundation/lams/policies/service/IPolicyService.java
    • -20
    • +34
    ./lamsfoundation/lams/policies/service/PolicyService.java
  8. … 21 more files in changeset.
Friday 22 Jun 2018
6:42 pm

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • -14
    • +18
    ./lamsfoundation/lams/tool/service/LamsToolService.java
  2. … 11 more files in changeset.
Saturday 16 Jun 2018
5:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • -1
    • +1
    ./lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -0
    • +2
    ./lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java
    • -0
    • +7
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -7
    • +11
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  5. … 6 more files in changeset.
Sunday 03 Jun 2018
5:42 am

Marcin Cieslak

LDEV-4597 Set sent date in emails

Options
    • -8
    • +11
    ./lamsfoundation/lams/util/Emailer.java
Saturday 02 Jun 2018
8:02 am

Marcin Cieslak

LDEV-4592 Rewrite paths in tool content XML

Options
    • -5
    • +41
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:08 am

Marcin Cieslak

LDEV-4592 Bump server version

LDs exported with this version do not undergo resources path rewriting

in XML.

Options
    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20180602.sql
7:04 am

Marcin Cieslak

LDEV-4592 Remove obsolete configuration keys

Options
    • -6
    • +0
    ./lamsfoundation/lams/util/ConfigurationKeys.java
4:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180601.sql
    • -0
    • +3
    ./lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 7 more files in changeset.
Thursday 31 May 2018
5:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +28
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +70
    ./lamsfoundation/lams/dbupdates/patch20180528.sql
    • -0
    • +164
    ./lamsfoundation/lams/policies/Policy.java
    • -0
    • +60
    ./lamsfoundation/lams/policies/PolicyConsent.java
    • -0
    • +42
    ./lamsfoundation/lams/policies/dao/IPolicyDAO.java
    • -0
    • +40
    ./lamsfoundation/lams/policies/dao/hibernate/PolicyDAO.java
    • -0
    • +43
    ./lamsfoundation/lams/policies/service/IPolicyService.java
    • -0
    • +84
    ./lamsfoundation/lams/policies/service/PolicyService.java
  9. … 14 more files in changeset.
Friday 25 May 2018
6:03 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • -1
    • +3
    ./lamsfoundation/lams/rating/model/RatingCriteria.java
    • -2
    • +18
    ./lamsfoundation/lams/rating/service/RatingService.java
  3. … 2 more files in changeset.
Thursday 24 May 2018
11:21 pm

Andrey Balan

* LDEV-4589 Add methods and constants for LTI Deep Linking

Options
    • -0
    • +2
    ./lamsfoundation/lams/integration/service/IIntegrationService.java
    • -1
    • +2
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -0
    • +2
    ./lamsfoundation/lams/integration/util/LtiUtils.java
Tuesday 22 May 2018
11:59 am

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
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch20180522.sql
    • -4
    • +14
    ./lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -0
    • +14
    ./lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +7
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +1
    ./lamsfoundation/lams/util/AuthoringJsonTags.java
  6. … 10 more files in changeset.
Monday 21 May 2018
1:03 pm

Marcin Cieslak

LDEV-4587 Silence i18n warning as they are not that important

Options
    • -4
    • +4
    ./lamsfoundation/lams/tool/OutputFactory.java
1: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
    • -11
    • +19
    ./lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -0
    • +13
    ./lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
  3. … 5 more files in changeset.
Friday 18 May 2018
12:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

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

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

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

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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • -0
    • +8
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -3
    • +17
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  3. … 21 more files in changeset.