lams-github

lams_gradebook

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
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 19 Jul 2018
9:17 am

Marcin Cieslak

Merge to lams31 after a vital commit to master

Options
    • -0
    • +39
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  2. … 4 more files in changeset.
Wednesday 18 Jul 2018
4:29 pm

Marcin Cieslak

Merge branch 'LDEV-4609'

Options
    • -7
    • +84
    ./web/gradebookMonitor.jsp
  2. … 3 more files in changeset.
Tuesday 17 Jul 2018
2:17 pm

Marcin Cieslak

LDEV-4609 Write archived attempts in gray in gradebook

Options
    • -1
    • +1
    ./web/gradebookMonitor.jsp
    • -0
    • +4
    ./web/includes/css/gradebook.scss
2:08 pm

Marcin Cieslak

LDEV-4609 Sort attempts in reverse order

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

Marcin Cieslak

LDEV-4609 Adjust restart date with time zone

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  3. … 1 more file in changeset.
Saturday 07 Jul 2018
8:04 pm

Andrey Balan

LDEV-4610 Remove testing message

Options
    • -1
    • +1
    ./web/gradebookMonitor.jsp
Wednesday 04 Jul 2018
11:31 am

Andrey Balan

LDEV-4610 Remove tooltips from jqGrid in gradebook

Options
    • -27
    • +27
    ./web/gradebookCourseLearner.jsp
    • -22
    • +22
    ./web/gradebookCourseMonitor.jsp
    • -16
    • +13
    ./web/gradebookMonitor.jsp
    • -77
    • +0
    ./web/includes/jsp/jqGridIncludes.jsp
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
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/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
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +57
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java
    • -3
    • +12
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +34
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +39
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -7
    • +84
    ./web/gradebookMonitor.jsp
  8. … 3 more files in changeset.
Thursday 28 Jun 2018
5:23 pm

Marcin Cieslak

LDEV-4434 Add a library required in monitoring

When gradebook is displayed in monitoring, it overwrites jquery.js.

Re-importing jquery-ui.js is required afterwards, otherwise Sequence tab

refresh does not work.

Options
    • -0
    • +1
    ./web/includes/jsp/jqGridIncludes.jsp
8:41 am

Marcin Cieslak

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

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/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
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -67
    • +11
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
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
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -11
    • +67
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Tuesday 22 May 2018
9:04 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -17
    • +17
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 46 more files in changeset.
Monday 21 May 2018
1:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_es_ES.properties
  3. … 37 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
    • -1
    • +1
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -9
    • +10
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
Wednesday 09 May 2018
7:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Monday 09 Apr 2018
3:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
Tuesday 03 Apr 2018
2:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

Options
    • -2
    • +12
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 8 more files in changeset.
Monday 02 Apr 2018
5:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 54 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  2. … 83 more files in changeset.
Thursday 22 Mar 2018
6:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -6
    • +13
    ./web/error.jsp
  2. … 34 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
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 8 more files in changeset.