lams-github / lams_learning / src / java / org

lamsfoundation

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 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -1
    • +3
    ./lams/learning/kumalive/KumaliveController.java
  2. … 15 more files in changeset.
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -2
    • +2
    ./lams/learning/kumalive/KumaliveController.java
    • -1
    • +1
    ./lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +1
    ./lams/learning/kumalive/service/KumaliveService.java
  4. … 30 more files in changeset.
Wednesday 16 Oct 2019
3:05 am

Andrey Balan

LDEV-4882 Check lesson monitor rights correctly

Options
    • -27
    • +5
    ./lams/learning/web/controller/NotebookController.java
2:39 am

Andrey Balan

LDEV-4881 Remove notebook entries from DB on lesson removal

Options
    • -32
    • +3
    ./lams/learning/web/controller/NotebookController.java
  2. … 4 more files in changeset.
Saturday 12 Oct 2019
4:46 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

Options
    • -102
    • +48
    ./lams/learning/web/controller/GroupingController.java
  2. … 4 more files in changeset.
1:43 am

Andrey Balan

LDEV-4874 Restrict displaying names for students that are not within student's group

Options
    • -101
    • +49
    ./lams/learning/web/controller/GroupingController.java
  2. … 8 more files in changeset.
Monday 01 Jul 2019
6:43 pm

Marcin Cieslak

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

Options
    • -0
    • +4
    ./lams/learning/web/controller/LearnerController.java
6:41 pm

Marcin Cieslak

LDEV-3839 Check on back end if a lesson can be restarted by a learner

Options
    • -4
    • +7
    ./lams/learning/web/controller/LearnerController.java
Sunday 14 Apr 2019
6:35 pm

Marcin Cieslak

LDEV-4801 Revert changes of FileDAO

They did not lead to fixing the problem and were actually unnecessary:

FileDAO does not use DB connections, so no need for transactions.

Options
    • -1
    • +1
    ./lams/learning/command/CommandWebsocketServer.java
  2. … 9 more files in changeset.
Sunday 07 Apr 2019
3:21 pm

Marcin Cieslak

LDEV-4802 Make all DAO calls in content repository go through service

Some classes in content repository were using DAO methods directly,

without enveloping them in a transaction. Now they all go through

RepositoryService.

These methods need to start with "dao" prefix so they are not picked up

by CheckCredentialTicketBeforeAdvice.

Options
    • -1
    • +1
    ./lams/learning/command/CommandWebsocketServer.java
  2. … 9 more files in changeset.
Saturday 06 Apr 2019
3:33 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -12
    • +30
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
  2. … 1 more file in changeset.
3:19 am

Andrey Balan

LDEV-4803 Remove branching warning when there's no need to warn

* Fix problem with HibernateProxy

* Change warning messages and their presentation

* Further enhancements to choose branching page markup

Options
    • -10
    • +28
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -8
    • +14
    ./lams/learning/web/form/OptionsActivityForm.java
  3. … 2 more files in changeset.
Friday 05 Apr 2019
4:56 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -4
    • +0
    ./lams/learning/service/LearnerService.java
    • -3
    • +20
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -6
    • +13
    ./lams/learning/web/controller/SequenceActivityController.java
3:36 pm

Marcin Cieslak

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

Options
    • -8
    • +11
    ./lams/learning/command/CommandWebsocketServer.java
  2. … 7 more files in changeset.
5:43 am

Andrey Balan

LDEV-4800 Proceed to the first incompleted activity in a branch, and not to simply the first one

Also display list of child activities for the completed branch, so user

can revisit completed activities.

Options
    • -4
    • +0
    ./lams/learning/service/LearnerService.java
    • -4
    • +21
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -7
    • +14
    ./lams/learning/web/controller/SequenceActivityController.java
  4. … 1 more file in changeset.
Saturday 26 Jan 2019
2:35 pm

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

Options
    • -2
    • +6
    ./lams/learning/progress/ProgressBuilder.java
    • -4
    • +5
    ./lams/learning/progress/ProgressEngine.java
    • -3
    • +23
    ./lams/learning/service/LearnerService.java
    • -4
    • +4
    ./lams/learning/web/controller/LearnerController.java
  5. … 20 more files in changeset.
Friday 11 Jan 2019
2:49 am

Andrey Balan

LDEV-4678 Push some util methods to the service layer

Certain static util methods (mainly from LearningWebUtil.java) expect

service beans as a parameter. It was changed by pushing those methods to

the appropriate service layer.

Options
    • -2
    • +1
    ./lams/learning/progress/ProgressBuilder.java
    • -6
    • +0
    ./lams/learning/service/ILearnerFullService.java
    • -63
    • +40
    ./lams/learning/service/LearnerService.java
    • -5
    • +7
    ./lams/learning/web/controller/BranchingActivityController.java
    • -2
    • +4
    ./lams/learning/web/controller/ChooseActivityController.java
    • -5
    • +6
    ./lams/learning/web/controller/CompleteActivityController.java
    • -2
    • +1
    ./lams/learning/web/controller/DisplayActivityController.java
    • -3
    • +5
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -1
    • +4
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -1
    • +4
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -17
    • +9
    ./lams/learning/web/controller/GateController.java
    • -6
    • +10
    ./lams/learning/web/controller/GroupingController.java
    • -15
    • +11
    ./lams/learning/web/controller/LearnerController.java
    • -4
    • +5
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -6
    • +8
    ./lams/learning/web/controller/SequenceActivityController.java
  16. … 15 more files in changeset.
Friday 21 Dec 2018
2:05 am

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -1
    • +0
    ./lams/learning/service/LearnerService.java
    • -130
    • +0
    ./lams/learning/service/LearnerServiceProxy.java
    • -18
    • +9
    ./lams/learning/web/controller/BranchingActivityController.java
    • -9
    • +2
    ./lams/learning/web/controller/ChooseActivityController.java
    • -7
    • +2
    ./lams/learning/web/controller/CompleteActivityController.java
    • -9
    • +4
    ./lams/learning/web/controller/DisplayActivityController.java
    • -9
    • +8
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -13
    • +6
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -7
    • +2
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -6
    • +3
    ./lams/learning/web/controller/GateController.java
    • -6
    • +10
    ./lams/learning/web/controller/GroupingController.java
    • -15
    • +8
    ./lams/learning/web/controller/LearnerController.java
    • -10
    • +3
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -7
    • +3
    ./lams/learning/web/controller/SequenceActivityController.java
    • -18
    • +10
    ./lams/learning/web/util/ActivityMapping.java
  16. … 37 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
    • -2
    • +2
    ./lams/learning/kumalive/model/Kumalive.java
    • -9
    • +8
    ./lams/learning/kumalive/model/KumalivePoll.java
    • -10
    • +10
    ./lams/learning/kumalive/model/KumalivePollAnswer.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveScore.java
  6. … 166 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
    • -2
    • +2
    ./lams/learning/kumalive/model/Kumalive.java
    • -9
    • +8
    ./lams/learning/kumalive/model/KumalivePoll.java
    • -10
    • +10
    ./lams/learning/kumalive/model/KumalivePollAnswer.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -6
    • +7
    ./lams/learning/kumalive/model/KumaliveScore.java
  6. … 166 more files in changeset.
Tuesday 13 Nov 2018
2:41 pm

Marcin Cieslak

LDEV-4649 Fix a Hibernate mapping to a column

Options
    • -8
    • +7
    ./lams/learning/kumalive/model/Kumalive.java
Sunday 04 Nov 2018
5:41 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -9
    • +9
    ./lams/learning/service/LearnerService.java
    • -3
    • +2
    ./lams/learning/web/controller/LearnerController.java
  3. … 24 more files in changeset.
Thursday 01 Nov 2018
6:36 am

Andrey Balan

LDEV-4696 Migrate lams_learning to Hibernate annotations

Options
    • -0
    • +17
    ./lams/learning/command/model/Command.java
    • -3
    • +2
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +34
    ./lams/learning/kumalive/model/Kumalive.java
    • -1
    • +20
    ./lams/learning/kumalive/model/KumaliveLog.java
    • -1
    • +35
    ./lams/learning/kumalive/model/KumalivePoll.java
    • -3
    • +45
    ./lams/learning/kumalive/model/KumalivePollAnswer.java
    • -1
    • +24
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -0
    • +24
    ./lams/learning/kumalive/model/KumaliveScore.java
    • -22
    • +18
    ./lams/learning/presence/model/PresenceChatMessage.java
    • -14
    • +12
    ./lams/learning/presence/model/PresenceChatUser.java
  11. … 10 more files in changeset.
6:35 am

Andrey Balan

LDEV-4696 start transactions for update* method names

Options
    • -1
    • +1
    ./lams/learning/learningApplicationContext.xml
6:31 am

Andrey Balan

LDEV-4440 Fix Kumalive Controller

Options
    • -5
    • +2
    ./lams/learning/kumalive/KumaliveController.java
  2. … 1 more file in changeset.
Wednesday 10 Oct 2018
11:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4440 Live Edit saves and the learner message is back

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMappingStrategy.java
  2. … 3 more files in changeset.
Thursday 04 Oct 2018
7:35 pm

Andrey Balan

LDEV-4440 Switch controllers to use @Autowired service beans

Also in cases when service bean in Controller has the same name as in

applicationContext, @Qualifier(..) can be removed. Which was done almost

in all cases, except for messageService due to "messageService" name

seems to be more preferable than adminMessageService,

centralMessageService and so on. Thus they were kept as before:

@Autowired

@Qualifier("centralMessageService")

private MessageService messageService;

Options
    • -37
    • +22
    ./lams/learning/kumalive/KumaliveController.java
    • -5
    • +0
    ./lams/learning/web/controller/BranchingActivityController.java
    • -5
    • +1
    ./lams/learning/web/controller/ChooseActivityController.java
    • -16
    • +4
    ./lams/learning/web/controller/CompleteActivityController.java
    • -7
    • +0
    ./lams/learning/web/controller/DisplayActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/DisplayOptionsActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/DisplayParallelActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/DisplayToolActivityController.java
    • -5
    • +0
    ./lams/learning/web/controller/GateController.java
    • -13
    • +3
    ./lams/learning/web/controller/GroupingController.java
    • -30
    • +7
    ./lams/learning/web/controller/LearnerController.java
    • -30
    • +5
    ./lams/learning/web/controller/LessonCompleteActivityController.java
    • -4
    • +0
    ./lams/learning/web/controller/LoadToolActivityController.java
    • -19
    • +11
    ./lams/learning/web/controller/NotebookController.java
    • -7
    • +0
    ./lams/learning/web/controller/SequenceActivityController.java
  16. … 168 more files in changeset.
Monday 01 Oct 2018
4:50 pm

Marcin Cieslak

LDEV-4440 Make a path to file absolute

References to requestURL can come from various controllers and contexts,

leading to errors.

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMapping.java
Friday 28 Sep 2018
5:00 pm

Marcin Cieslak

LDEV-4440 Fix a path for skipping activities in preview

Options
    • -1
    • +1
    ./lams/learning/progress/ProgressBuilder.java
Thursday 27 Sep 2018
7:02 pm

Marcin Cieslak

LDEV-4440 Fix parallel activity completed page redirect

Options
    • -1
    • +1
    ./lams/learning/web/util/ActivityMappingStrategy.java
    • -1
    • +1
    ./lams/learning/web/util/ParallelActivityMappingStrategy.java