lams-github / lams_common / src / java / org

lamsfoundation

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 17 Jul 2018
1:59 pm

Marcin Cieslak

LDEV-4609 Sort attempts in reverse order

It was implemented from the start, but our Java -> jqGrid XML conversion

method sorts the rows in ascending order by default.

Options
    • -2
    • +2
    ./lams/gradebook/dao/hibernate/GradebookDAO.java
  2. … 2 more files in changeset.
Monday 16 Jul 2018
5:23 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Necessary changes for migration to Spring - changes in method of validation

Options
    • -5
    • +4
    ./lams/util/FileValidatorSpringUtil.java
  2. … 8 more files in changeset.
Friday 13 Jul 2018
4:26 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Added new way of sending error messages

Options
    • -631
    • +632
    ./lams/commonContext.xml
  2. … 10 more files in changeset.
Tuesday 10 Jul 2018
6:56 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of Noticeboard

Options
    • -0
    • +199
    ./lams/util/FileValidatorSpringUtil.java
  2. … 45 more files in changeset.
Monday 09 Jul 2018
7:13 pm

Andrey Balan

LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

Options
    • -4
    • +11
    ./lams/integration/service/IntegrationService.java
    • -1
    • +2
    ./lams/integrationContext.xml
    • -0
    • +1
    ./lams/usermanagement/ldapContext.xml
    • -13
    • +20
    ./lams/usermanagement/service/LdapService.java
  5. … 3 more files in changeset.
6:16 pm

Andrey Balan

LDEV-4631 Prevent accidental storing of timezone as JVM one

Options
    • -2
    • +1
    ./lams/usermanagement/User.java
Sunday 08 Jul 2018
7:18 pm

Marcin Cieslak

LDEV-4627 Accept country in integrations servlet

If a received langIsoCode is just 2 letters, then countryIsoCode stays

the same and country will fall back to default. If langIsoCode is en_AU,

then it gets split to langIsoCode and countryIsoCode and the old value

of countryIsoCode is considered country.

Options
    • -3
    • +3
    ./lams/integration/service/IIntegrationService.java
    • -6
    • +12
    ./lams/integration/service/IntegrationService.java
  3. … 5 more files in changeset.
11:27 am

Marcin Cieslak

LDEV-4625 Make server country configurable

Also use default country in integrations

Options
    • -0
    • +15
    ./lams/dbupdates/patch20180708.sql
    • -6
    • +3
    ./lams/integration/service/IntegrationService.java
    • -1
    • +1
    ./lams/signup/service/SignupService.java
    • -2
    • +2
    ./lams/util/LanguageUtil.java
  5. … 4 more files in changeset.
10:31 am

Marcin Cieslak

LDEV-4625 Use default country configured on server

Options
    • -1
    • +1
    ./lams/signup/service/SignupService.java
    • -0
    • +5
    ./lams/util/ConfigurationKeys.java
    • -16
    • +23
    ./lams/util/LanguageUtil.java
  4. … 1 more file in changeset.
Saturday 07 Jul 2018
9:58 pm

Andrey Balan

LDEV-4624 Signup page to use system language for country list

Options
    • -2
    • +8
    ./lams/util/LanguageUtil.java
    • -0
    • +22
    ./lams/util/MessageService.java
  3. … 3 more files in changeset.
5:51 pm

Marcin Cieslak

LDEV-4616 Remove locale from courses

Options
    • -0
    • +15
    ./lams/dbupdates/patch20180707.sql
    • -3
    • +2
    ./lams/integration/service/IntegrationService.java
    • -10
    • +0
    ./lams/usermanagement/Organisation.java
  4. … 10 more files in changeset.
Thursday 05 Jul 2018
6:59 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Almost finished learning and monitoring - needed corrections

Options
    • -2
    • +24
    ./lams/util/FileValidatorUtil.java
  2. … 16 more files in changeset.
2:02 pm

Andrey Balan

LDEV-4614 Sort country list by name rather than code

Options
    • -22
    • +48
    ./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
    ./lams/dbupdates/patch20180704.sql
    • -1
    • +1
    ./lams/lesson/dao/hibernate/LessonDAO.java
    • -1
    • +2
    ./lams/logevent/LogEvent.java
    • -0
    • +11
    ./lams/logevent/service/ILogEventService.java
    • -29
    • +20
    ./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
    ./lams/lesson/dao/ILessonDAO.java
    • -3
    • +10
    ./lams/lesson/dao/hibernate/LessonDAO.java
4:23 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started learning migration

Options
    • -2
    • +3
    ./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
    ./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
    ./lams/dbupdates/patch20180628.sql
    • -1
    • +0
    ./lams/lesson/LearnerProgress.java
    • -1
    • +22
    ./lams/lesson/LearnerProgressArchive.java
    • -0
    • +4
    ./lams/lesson/dao/ILearnerProgressDAO.java
    • -2
    • +12
    ./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
    ./lams/dbupdates/patch20180628.sql
    • -1
    • +12
    ./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
    ./lams/usermanagement/service/IUserManagementService.java
    • -3
    • +4
    ./lams/usermanagement/service/UserManagementService.java
    • -0
    • +24
    ./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
    ./lams/gradebook/dao/IGradebookDAO.java
    • -54
    • +57
    ./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
    ./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
    ./lams/tool/service/LamsToolService.java
8:41 am

Marcin Cieslak

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

Options
    • -0
    • +18
    ./lams/dbupdates/patch20180628.sql
    • -2
    • +11
    ./lams/gradebook/GradebookUserActivityArchive.java
    • -1
    • +13
    ./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
    ./lams/policies/dao/IPolicyDAO.java
    • -0
    • +77
    ./lams/policies/dao/hibernate/PolicyDAO.java
    • -0
    • +37
    ./lams/policies/dto/UserPolicyConsentDTO.java
    • -7
    • +11
    ./lams/policies/service/IPolicyService.java
    • -21
    • +61
    ./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
    ./lams/commonContext.xml
    • -0
    • +15
    ./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
    ./lams/integration/service/IntegrationService.java
    • -5
    • +41
    ./lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +18
    ./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
    ./lams/dbupdates/patch20180528.sql
    • -6
    • +12
    ./lams/policies/Policy.java
    • -0
    • +95
    ./lams/policies/PolicyDTO.java
    • -4
    • +20
    ./lams/policies/dao/IPolicyDAO.java
    • -11
    • +82
    ./lams/policies/dao/hibernate/PolicyDAO.java
    • -3
    • +33
    ./lams/policies/service/IPolicyService.java
    • -20
    • +34
    ./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
    ./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
    ./lams/learningdesign/ContributionTypes.java
    • -0
    • +2
    ./lams/learningdesign/strategy/ToolActivityStrategy.java
    • -0
    • +7
    ./lams/tool/ToolContentManager.java
    • -7
    • +11
    ./lams/tool/service/LamsCoreToolService.java
  5. … 6 more files in changeset.