lams-github / lams_gradebook / src

java

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
Friday 26 Jan 2018
9:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 78 more files in changeset.
Tuesday 19 Dec 2017
8:47 pm

Marcin Cieslak

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

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.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/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.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/service/ResourceServiceImpl.java

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

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

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

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

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

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

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

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -9
    • +59
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  2. … 45 more files in changeset.
Monday 04 Dec 2017
3:19 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4481 Add full implementation of min/max time taken.

Options
    • -0
    • +39
    ./org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -2
    • +15
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  3. … 4 more files in changeset.
Friday 10 Nov 2017
2:25 am

Andrey Balan

LDEV-4464 Fix Gradebook export: problem displaying Chinese characters

StringEscapeUtils.escapeHtml() method has a bug (in version of

commons-lang prior to 3.0): it escapes multibyte characters like

Chinese, Japanese, etc. Thus it was replaced it with Spring's

HtmlUtils.htmlEscape().

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
Thursday 09 Nov 2017
4:41 pm

Marcin Cieslak

LDEV-4453 Fix an error when a learner has no marks at all in a lesson

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
Wednesday 08 Nov 2017
3:52 pm

Marcin Cieslak

LDEV-4453 Clean up unused methods

Options
    • -43
    • +7
    ./org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
3:50 pm

Marcin Cieslak

LDEV-4453 Prevent errors when marks are null

Options
    • -4
    • +8
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
12:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Fixed error, improved performance of mark recalculation

Options
    • -4
    • +8
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
12:02 am

Marcin Cieslak

LDEV-4453 Rewrite code to follow method single responsibility principle

Options
    • -20
    • +33
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +5
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -8
    • +8
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
Tuesday 07 Nov 2017
11:26 pm

Marcin Cieslak

LDEV-4453 Show raw activity marks, consistent with Gradebook

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
6:50 pm

Marcin Cieslak

Merge branch 'LDEV-4453'

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
6:48 pm

Marcin Cieslak

LDEV-4453 Format marks is they are weighted

Options
    • -2
    • +1
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -4
    • +5
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
6:21 pm

Marcin Cieslak

LDEV-4453 Add "Your mark" in lesson complete gradebook

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +5
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -2
    • +5
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  4. … 2 more files in changeset.
Monday 06 Nov 2017
7:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Course gradebook exports include weighting

Options
    • -54
    • +62
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +21
    ./org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
  3. … 4 more files in changeset.
Saturday 04 Nov 2017
8:10 pm

Marcin Cieslak

LDEV-4453 Add gradebook on lesson complete front end

Options
    • -62
    • +107
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +5
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -9
    • +48
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  4. … 4 more files in changeset.
Tuesday 17 Oct 2017
7:56 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +8
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  3. … 14 more files in changeset.
Friday 13 Oct 2017
8:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

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

Options
    • -10
    • +20
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  2. … 8 more files in changeset.
Wednesday 11 Oct 2017
10:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Merging LDEV-4433 changes from Master

Added weighting % markers to the new activity summary.

Options
    • -3
    • +71
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 2 more files in changeset.
Friday 06 Oct 2017
8:02 pm

Andrey Balan

LDEV-4433 Move simplified activities info to Lesson summary tab

Besides, display info only for those activities that have numeric

outputs (which are Assessment, MCQ or Sratchie. Also activity must be

set to produce tool outputs in Authoring)

Options
    • -55
    • +67
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
6:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4431 Portraits shown in Monitor and Course Gradebook

Options
    • -6
    • +19
    ./org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  2. … 3 more files in changeset.
12:42 am

Andrey Balan

LDEV-4433 Add 'Simplified activity' tab to the lesson gradebook export

Options
    • -0
    • +52
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
Wednesday 04 Oct 2017
8:56 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Lesson marks always recalculated after Live Edit

Also tries to respect any teacher modified lesson marks when

activity marks are changed by doing a 'take the old marks off

and add the new mark on' calculation for weighting.

Options
    • -6
    • +11
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 1 more file in changeset.
Wednesday 27 Sep 2017
3:43 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Course export uses percentages, tour supports weights

Options
    • -3
    • +11
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 2 more files in changeset.
2:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +11
    ./org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -10
    • +107
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +6
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +9
    ./org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -10
    • +20
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  8. … 10 more files in changeset.
Wednesday 30 Aug 2017
2:30 am

Marcin Cieslak

LDEV-4415 Add tool output weight. Rewrite activity evaluations.

Activity evaluations have been implemented as a list, even though always

only the first element is meaningful. They were rewritten as one-to-one

association with Activity. The primary key is activity ID now instead of

DB generated UID.

Weight column was added.

Server version was bumped so a filter can pick up activityEvaluations ->

evaluation field rename when importing older LDs.

A convention without date was used for server version as it seems good

enough.

Unnecessary versions of clients were removed from configuration table as

they server the abandoned Flash authoring.

Options
    • -26
    • +37
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 18 more files in changeset.
Thursday 10 Aug 2017
12:28 am

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
    • -18
    • +15
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  2. … 135 more files in changeset.
Wednesday 07 Jun 2017
9:48 pm

Andrey Balan

LDEV-4349 flush the session in order to make updated mark be available at calculating lesson total mark

Options
    • -2
    • +3
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
Tuesday 23 May 2017
11:57 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV-4347:Improve date/time for spreadsheet exports

Options
    • -12
    • +8
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
  2. … 2 more files in changeset.
Thursday 04 May 2017
12:17 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4334: Moving Lesson Gradebook into Monitoring window so that it is always available and adding a Marks chart. Both the standalone Gradebook window (using the original call) and an "in tabs" version are supported by the existing jsp. Tweaked buttons in Course screen to match the buttons in the standalone Lesson screen.

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +9
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +34
    ./org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  4. … 6 more files in changeset.
Friday 24 Mar 2017
2:58 am

Marcin Cieslak

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

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -117
    • +154
    ./org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -4
    • +8
    ./org/lamsfoundation/lams/gradebook/service/IGradebookService.java
  4. … 13 more files in changeset.