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
Monday 02 Oct 2017
8:44 pm

Marcin Cieslak

LDEV-4366 Kumalive reports export

Allow exporting all and selected Kumalives in Excel format. Use i18n

instead of hardcoded labels. Move free jqGrid library to lams_central.

Minor fixes.

Options
    • -5
    • +52
    ./lams/learning/kumalive/KumaliveAction.java
    • -3
    • +5
    ./lams/learning/kumalive/dao/IKumaliveDAO.java
    • -2
    • +13
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +6
    ./lams/learning/kumalive/service/IKumaliveService.java
    • -27
    • +150
    ./lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +2
    ./lams/learning/learningApplicationContext.xml
  7. … 6 more files in changeset.
Saturday 30 Sep 2017
8:05 pm

Marcin Cieslak

LDEV-4366 Initial implementation of Kumalive reports

Latest free jqGrid is used as the one present in lams_central is

outdated and standard jqGrid became commercial.

Use bootstrap theme with Font Awesome icons.

Rewrite XML code used in Gradebook to feed jqGrid into JSON.

Options
    • -5
    • +126
    ./lams/learning/kumalive/KumaliveAction.java
    • -1
    • +1
    ./lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +9
    ./lams/learning/kumalive/dao/IKumaliveDAO.java
    • -2
    • +45
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +11
    ./lams/learning/kumalive/model/KumaliveScore.java
    • -1
    • +11
    ./lams/learning/kumalive/service/IKumaliveService.java
    • -4
    • +181
    ./lams/learning/kumalive/service/KumaliveService.java
  8. … 8 more files in changeset.
Friday 22 Sep 2017
5:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

Options
    • -20
    • +45
    ./lams/learning/web/action/NotebookAction.java
  2. … 12 more files in changeset.
Tuesday 22 Aug 2017
6:30 am

Marcin Cieslak

LDEV-4393 Fix parameter flow for lesson notebook

Current lesson ID was not retained during submits. It has to be present

on each page and submit so "view all" page knows where to add a new

entry.

Options
    • -12
    • +12
    ./lams/learning/web/action/NotebookAction.java
  2. … 4 more files in changeset.
Thursday 17 Aug 2017
9:52 pm

Andrey Balan

LDEV-4407 Move classes to the proper packages

Servlet classes were moved to learning.web.servlet package.

(To access files' earlier history use Eclipse's Show in History feature

or run 'git log --follow ./path/to/file')

Options
    • -81
    • +0
    ./lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java
    • -218
    • +0
    ./lams/learning/web/RepopulateProgressMarksServlet.java
    • -0
    • +81
    ./lams/learning/web/servlet/LogLessonMarkPushedToIntegrationsServlet.java
    • -0
    • +218
    ./lams/learning/web/servlet/RepopulateProgressMarksServlet.java
  5. … 1 more file in changeset.
Wednesday 09 Aug 2017
6:28 pm

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -41
    • +51
    ./lams/learning/presence/PresenceWebsocketServer.java
    • -22
    • +23
    ./lams/learning/web/action/LearnerAction.java
  3. … 134 more files in changeset.
Monday 07 Aug 2017
8:53 am

Marcin Cieslak

LDEV-4402 Use Spring support for Hibernate v5 instead of v4

WF10 is shipped with Hibernate 5, so Spring support version should

match.

Options
    • -1
    • +1
    ./lams/learning/web/RepopulateProgressMarksServlet.java
  2. … 19 more files in changeset.
Saturday 29 Jul 2017
6:53 am

Marcin Cieslak

LDEV-4394 Minor improvements for compiler optimisation

Options
    • -9
    • +9
    ./lams/learning/presence/PresenceWebsocketServer.java
  2. … 2 more files in changeset.
Monday 24 Jul 2017
7:05 pm

Marcin Cieslak

LDEV-4366 Introduce rubrics to Kumalive

Options
    • -0
    • +102
    ./lams/learning/kumalive/KumaliveAction.java
    • -56
    • +118
    ./lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +5
    ./lams/learning/kumalive/dao/IKumaliveDAO.java
    • -12
    • +9
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +10
    ./lams/learning/kumalive/model/Kumalive.java
    • -0
    • +88
    ./lams/learning/kumalive/model/KumaliveRubric.java
    • -0
    • +78
    ./lams/learning/kumalive/model/KumaliveScore.java
    • -0
    • +44
    ./lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +142
    ./lams/learning/kumalive/service/KumaliveService.java
    • -4
    • +24
    ./lams/learning/learningApplicationContext.xml
    • -7
    • +0
    ./lams/learning/service/ILearnerService.java
    • -63
    • +12
    ./lams/learning/service/LearnerService.java
  13. … 18 more files in changeset.
Monday 10 Jul 2017
12:17 pm

Marcin Cieslak

LDEV-4366 Allow multiple score per learner per Kumalive

Fix showing user login as a div title for teachers.

Options
    • -13
    • +20
    ./lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +2
    ./lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +12
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -12
    • +2
    ./lams/learning/kumalive/model/Kumalive.java
    • -4
    • +1
    ./lams/learning/service/LearnerService.java
  6. … 4 more files in changeset.
Thursday 06 Jul 2017
11:48 am

Marcin Cieslak

LDEV-4366 Add a working version of Kumalive

Options
    • -44
    • +310
    ./lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +2
    ./lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +12
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +3
    ./lams/learning/kumalive/model/Kumalive.java
    • -0
    • +2
    ./lams/learning/learningApplicationContext.xml
    • -1
    • +6
    ./lams/learning/service/ILearnerService.java
    • -5
    • +39
    ./lams/learning/service/LearnerService.java
  8. … 8 more files in changeset.
Wednesday 28 Jun 2017
5:58 am

Marcin Cieslak

LDEV-4366 Prototype Kumalive front and back ends

Options
    • -0
    • +222
    ./lams/learning/kumalive/KumaliveWebsocketServer.java
    • -1
    • +1
    ./lams/learning/kumalive/model/Kumalive.java
    • -0
    • +6
    ./lams/learning/learningApplicationContext.xml
    • -0
    • +2
    ./lams/learning/service/ILearnerService.java
    • -12
    • +32
    ./lams/learning/service/LearnerService.java
  6. … 14 more files in changeset.
Saturday 24 Jun 2017
6:03 pm

Marcin Cieslak

LDEV-4366 Add database and Hibernate layer for Kumalive.

Options
    • -0
    • +29
    ./lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +32
    ./lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +95
    ./lams/learning/kumalive/model/Kumalive.java
  4. … 2 more files in changeset.
Wednesday 24 May 2017
6:08 am

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -43
    • +38
    ./lams/learning/presence/PresenceWebsocketServer.java
Tuesday 11 Apr 2017
8:02 pm

Andrey Balan

LDEV-4312 Handle unsuccessful mark submission to integrated servers

Options
    • -0
    • +5
    ./lams/learning/progress/ProgressEngine.java
    • -0
    • +81
    ./lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java
  3. … 5 more files in changeset.
Monday 10 Apr 2017
8:40 am

Marcin Cieslak

LDEV-4175: Remove unncessary synchronisations and commented out code.

Options
    • -1
    • +1
    ./lams/learning/service/LearnerService.java
  2. … 1 more file in changeset.
Monday 03 Apr 2017
9:28 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4290 Removed caching of progress bar messages as it makes the language first used stick for all users.

Options
    • -15
    • +11
    ./lams/learning/web/action/LearnerAction.java
Thursday 23 Mar 2017
7:58 pm

Marcin Cieslak

LDEV-4288: Archive gradebook on lesson retry. Remove activity content on lesson retry.

Options
    • -0
    • +10
    ./lams/learning/service/LearnerServiceProxy.java
    • -4
    • +13
    ./lams/learning/web/action/LearnerAction.java
  3. … 14 more files in changeset.
Friday 17 Mar 2017
5:57 am

Marcin Cieslak

LDEV-4278: Put and get activity ID from form since it is not present in request anymore.

Options
    • -0
    • +1
    ./lams/learning/web/action/GroupingAction.java
  2. … 2 more files in changeset.
Tuesday 14 Mar 2017
2:56 pm

Marcin Cieslak

LDEV-4272: Check if learner progress belongs to the logged in user.

Options
    • -0
    • +6
    ./lams/learning/web/action/CompleteActivityAction.java
Tuesday 07 Mar 2017
11:05 am

Marcin Cieslak

LDEV-4260: Make sure that lesson corresponds to the activity.

Options
    • -2
    • +5
    ./lams/learning/service/LearnerService.java
Thursday 02 Mar 2017
9:38 am

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -16
    • +7
    ./lams/learning/command/CommandWebsocketServer.java
Wednesday 15 Feb 2017
6:06 am

Marcin Cieslak

LDEV-4224: Pass IDs instead of objects into transactional methods so the objects are not cached and reused in subsequent retries.

Options
    • -26
    • +5
    ./lams/learning/service/ICoreLearnerService.java
    • -30
    • +23
    ./lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lams/learning/web/util/LearningWebUtil.java
  4. … 1 more file in changeset.
Friday 03 Feb 2017
12:39 pm

Andrey Balan

LDEV-4155 In order to be able to use "history.back()" without any problems - using redirect in NotebookAction

Options
    • -31
    • +2
    ./lams/learning/web/action/NotebookAction.java
  2. … 1 more file in changeset.
Monday 30 Jan 2017
5:13 am

Marcin Cieslak

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

Options
    • -6
    • +10
    ./lams/learning/command/CommandWebsocketServer.java
    • -14
    • +21
    ./lams/learning/presence/PresenceWebsocketServer.java
    • -66
    • +73
    ./lams/learning/service/LearnerService.java
  4. … 5 more files in changeset.
Tuesday 24 Jan 2017
2:27 pm

Marcin Cieslak

LDEV-4198: Re-committing Fiona's changes: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    ./lams/learning/web/util/LearningWebUtil.java
2:25 pm

Marcin Cieslak

LDEV-4175: Do not put DB entities (LearnerProgress, Activity) into request as this can cause problems. Better stick to IDs as parameters.

Options
    • -2
    • +0
    ./lams/learning/web/action/ActivityAction.java
    • -2
    • +0
    ./lams/learning/web/action/BranchingActivityAction.java
    • -4
    • +4
    ./lams/learning/web/action/CompleteActivityAction.java
    • -8
    • +1
    ./lams/learning/web/action/GateAction.java
    • -7
    • +5
    ./lams/learning/web/action/GroupingAction.java
    • -13
    • +10
    ./lams/learning/web/action/LearnerAction.java
    • -2
    • +0
    ./lams/learning/web/action/SequenceActivityAction.java
    • -15
    • +7
    ./lams/learning/web/util/ActivityMapping.java
    • -82
    • +14
    ./lams/learning/web/util/LearningWebUtil.java
Monday 23 Jan 2017
2:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4198: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    ./lams/learning/web/util/LearningWebUtil.java
Tuesday 17 Jan 2017
2:19 pm

Marcin Cieslak

LDEV-4187: Open new session on Presence Chat websocket thread run.

Options
    • -7
    • +10
    ./lams/learning/presence/PresenceWebsocketServer.java
Wednesday 11 Jan 2017
10:00 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Reprocess the learner progress for a lesson, basing any missing entries from data gathered from the related tool or system activity.

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -0
    • +7
    ./lams/learning/service/ICoreLearnerService.java
    • -0
    • +184
    ./lams/learning/service/LearnerService.java
    • -0
    • +218
    ./lams/learning/web/RepopulateProgressMarksServlet.java
  5. … 1 more file in changeset.