lams-github / lams_gradebook / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 15
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
Saturday 18 Aug 2018
7:44 pm

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

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

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -2
    • +11
    ./lams/gradebook/model/GradebookUserActivityArchive.java
    • -1
    • +12
    ./lams/gradebook/model/GradebookUserLessonArchive.java
    • -73
    • +291
    ./lams/gradebook/service/GradebookService.java
    • -7
    • +39
    ./lams/gradebook/service/IGradebookFullService.java
    • -0
    • +9
    ./lams/gradebook/util/GradebookConstants.java
    • -2
    • +82
    ./lams/gradebook/web/action/GradebookAction.java
    • -4
    • +9
    ./lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java
  8. … 97 more files in changeset.
Friday 17 Aug 2018
4:06 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Grade book

Options
    • -2
    • +2
    ./lams/gradebook/web/controller/GradebookLearningController.java
  2. … 4 more files in changeset.
Thursday 16 Aug 2018
5:28 am

Marcin Cieslak

LDEV-4609 Export previous lesson attempts

Options
    • -1
    • +65
    ./lams/gradebook/service/GradebookService.java
  2. … 1 more file in changeset.
4:43 am

Marcin Cieslak

LDEV-4609 Remove "restart date" column of previous attempts in gradebook

Options
    • -5
    • +1
    ./lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -3
    • +1
    ./lams/gradebook/service/GradebookService.java
  3. … 2 more files in changeset.
Tuesday 14 Aug 2018
3:01 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Learning and Gradebook

Options
    • -668
    • +0
    ./lams/gradebook/web/action/GradebookAction.java
    • -120
    • +0
    ./lams/gradebook/web/action/GradebookLearningAction.java
    • -484
    • +0
    ./lams/gradebook/web/action/GradebookMonitoringAction.java
    • -0
    • +642
    ./lams/gradebook/web/controller/GradebookController.java
    • -0
    • +106
    ./lams/gradebook/web/controller/GradebookLearningController.java
    • -0
    • +452
    ./lams/gradebook/web/controller/GradebookMonitoringController.java
  7. … 59 more files in changeset.
Thursday 19 Jul 2018
9:17 am

Marcin Cieslak

Merge to lams31 after a vital commit to master

Options
    • -0
    • +39
    ./lams/gradebook/web/action/GradebookAction.java
  2. … 4 more files in changeset.
Tuesday 17 Jul 2018
2:08 pm

Marcin Cieslak

LDEV-4609 Sort attempts in reverse order

Options
    • -2
    • +2
    ./lams/gradebook/service/GradebookService.java
2:03 pm

Marcin Cieslak

LDEV-4609 Adjust restart date with time zone

Options
    • -3
    • +6
    ./lams/gradebook/service/GradebookService.java
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/service/GradebookService.java
    • -1
    • +1
    ./lams/gradebook/web/action/GradebookAction.java
  3. … 1 more file 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
    • -20
    • +75
    ./lams/gradebook/service/GradebookService.java
    • -1
    • +2
    ./lams/gradebook/service/IGradebookService.java
  3. … 9 more files in changeset.
Friday 29 Jun 2018
5:14 pm

Marcin Cieslak

LDEV-4440 Show archived activity attempts in gradebook

Options
    • -0
    • +57
    ./lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -3
    • +12
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +34
    ./lams/gradebook/service/GradebookService.java
    • -3
    • +6
    ./lams/gradebook/service/IGradebookService.java
    • -0
    • +39
    ./lams/gradebook/web/action/GradebookAction.java
  6. … 5 more files in changeset.
Thursday 28 Jun 2018
8:41 am

Marcin Cieslak

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

Options
    • -4
    • +5
    ./lams/gradebook/service/GradebookService.java
  2. … 6 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
    • -11
    • +24
    ./lams/gradebook/service/GradebookService.java
    • -1
    • +4
    ./lams/gradebook/service/IGradebookService.java
  3. … 10 more files in changeset.
Thursday 21 Jun 2018
12:54 pm

Marcin Cieslak

LDEV-4606 Remove lesson mark if there are no activity marks left

Options
    • -6
    • +13
    ./lams/gradebook/service/GradebookService.java
8:34 am

Marcin Cieslak

Revert "LDEV_NTU-10 Add a column "LAMS group" in exported summary"

This reverts commit 502290bd52d375ca2661924f6c80ff5590e5aaaf.

Options
    • -67
    • +11
    ./lams/gradebook/service/GradebookService.java
  2. … 1 more file in changeset.
Wednesday 06 Jun 2018
10:21 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV_NTU-10 Add a column "LAMS group" in exported summary

Options
    • -11
    • +67
    ./lams/gradebook/service/GradebookService.java
  2. … 1 more file 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
    • -1
    • +1
    ./lams/gradebook/web/action/GradebookAction.java
  2. … 22 more files in changeset.
7:05 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4585 Activity names in Greek appear properly in export file.

Options
    • -3
    • +21
    ./lams/gradebook/dto/GBActivityGridRowDTO.java
    • -9
    • +10
    ./lams/gradebook/service/GradebookService.java
    • -2
    • +2
    ./lams/gradebook/service/IGradebookService.java
    • -1
    • +1
    ./lams/gradebook/web/action/GradebookAction.java
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

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

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.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/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

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

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -1
    • +42
    ./lams/gradebook/web/action/GradebookAction.java
  2. … 83 more files in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -2
    • +2
    ./lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    ./lams/gradebook/dto/GBUserGridRowDTO.java
    • -3
    • +3
    ./lams/gradebook/service/GradebookService.java
  4. … 32 more files in changeset.
11:39 am

Marcin Cieslak

LDEV-4523 Add method to remove actitivy mark

Options
    • -9
    • +34
    ./lams/gradebook/service/GradebookService.java
    • -2
    • +6
    ./lams/gradebook/service/IGradebookService.java
  3. … 1 more file in changeset.
Sunday 04 Mar 2018
2:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Merge work replacing audit logs with LogEvent entries

Resolved conflicts for lams.jar and the Admin language file.

Options
    • -9
    • +10
    ./lams/gradebook/service/GradebookService.java
  2. … 13 more files in changeset.
Wednesday 28 Feb 2018
7:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4505 Learners identified by Lastname, Surname in Monitoring

Options
    • -1
    • +1
    ./lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 8 more files in changeset.
Tuesday 27 Feb 2018
3:29 am

Andrey Balan

LKC-89 add auxiliary methods required for TBL monitoring

Options
    • -0
    • +5
    ./lams/gradebook/service/GradebookService.java
    • -0
    • +9
    ./lams/gradebook/service/IGradebookService.java
  3. … 3 more files in changeset.
Thursday 22 Feb 2018
4:46 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Gradebook audit log entry parameter order corrected

Options
    • -1
    • +1
    ./lams/gradebook/service/GradebookService.java
Monday 12 Feb 2018
6:52 pm

Andrey Balan

LDEV-4512 Move isWeightedMarks method to LamsCoreToolService

Move isWeightedMarks(LearningDesign design) from GradebookService

to LamsCoreToolService in order to avoid creation of a new

dependency on lams_gradebook.

Options
    • -25
    • +13
    ./lams/gradebook/service/GradebookService.java
    • -3
    • +0
    ./lams/gradebook/service/IGradebookService.java
  3. … 2 more files in changeset.
Tuesday 06 Feb 2018
12:37 pm

Marcin Cieslak

LDEV-4504 Use just first part of grouped activity ID

We know there will be no name clash as this is a single learner table,

not an aggregate in monitoring.

Options
    • -1
    • +8
    ./lams/gradebook/web/action/GradebookAction.java
5:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -1
    • +1
    ./lams/gradebook/gradebookApplicationContext.xml
    • -8
    • +9
    ./lams/gradebook/service/GradebookService.java
    • -4
    • +9
    ./lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java
  4. … 60 more files in changeset.
Friday 02 Feb 2018
10:16 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -0
    • +109
    ./lams/gradebook/model/GradebookUserActivityArchive.java
    • -0
    • +86
    ./lams/gradebook/model/GradebookUserLessonArchive.java
    • -17
    • +16
    ./lams/gradebook/service/GradebookService.java
    • -0
    • +278
    ./lams/gradebook/service/IGradebookFullService.java
    • -337
    • +0
    ./lams/gradebook/service/IGradebookService.java
    • -13
    • +0
    ./lams/gradebook/util/GradebookConstants.java
    • -7
    • +8
    ./lams/gradebook/util/GradebookUtil.java
    • -17
    • +0
    ./lams/gradebook/util/UserComparator.java
    • -20
    • +21
    ./lams/gradebook/web/action/GradebookAction.java
    • -48
    • +38
    ./lams/gradebook/web/action/GradebookMonitoringAction.java
    • -3
    • +3
    ./lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java
  12. … 46 more files in changeset.
Thursday 01 Feb 2018
11:11 pm

Andrey Balan

LDEV-4407 Introduce new LearnerService interfaces

LearnerService interfaces are redefined now:

1. ILearnerService is used by core modules. Also tools no longer

use it.

2. ILearnerFullService is used inside of lams_learning only and

nowhere else, as it contains lams_learning's internal logic and

classes.

3. ICoreLearnerService is removed, its method are split between

ILearnerService and ILearnerFullService.

Options
    • -7
    • +6
    ./lams/gradebook/service/GradebookService.java
  2. … 34 more files in changeset.