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
Friday 05 Jan 2018
3:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
  2. … 65 more files in changeset.
Tuesday 19 Dec 2017
1: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
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  2. … 45 more files in changeset.
Monday 04 Dec 2017
8:19 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

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

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +39
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -2
    • +15
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  4. … 3 more files in changeset.
Wednesday 22 Nov 2017
1:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Wednesday 15 Nov 2017
9:54 pm

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
  2. … 33 more files in changeset.
12:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4465 Error messages shown as popups, does not freeze screen

Options
    • -6
    • +6
    ./web/gradebookCourseMonitor.jsp
    • -21
    • +21
    ./web/gradebookMonitor.jsp
    • -0
    • +16
    ./web/includes/jsp/jqGridIncludes.jsp
Tuesday 14 Nov 2017
12:35 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
12:34 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4449: adding label

Options
    • -4
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
Thursday 09 Nov 2017
7:25 pm

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
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
9:41 am

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-4453 Clean up unused methods

Options
    • -43
    • +7
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
8:50 am

Marcin Cieslak

LDEV-4453 Prevent errors when marks are null

Options
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
5:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Fixed error, improved performance of mark recalculation

Options
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Tuesday 07 Nov 2017
5:02 pm

Marcin Cieslak

LDEV-4453 Rewrite code to follow method single responsibility principle

Options
    • -20
    • +33
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
4:26 pm

Marcin Cieslak

LDEV-4453 Show raw activity marks, consistent with Gradebook

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
11:50 am

Marcin Cieslak

Merge branch 'LDEV-4453'

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
11:48 am

Marcin Cieslak

LDEV-4453 Format marks is they are weighted

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

Marcin Cieslak

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

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4449 Course gradebook exports include weighting

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

Marcin Cieslak

LDEV-4453 Add gradebook on lesson complete front end

Options
    • -62
    • +107
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -9
    • +48
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
  4. … 4 more files in changeset.
Wednesday 01 Nov 2017
12:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4450: Learner icons in progress tab have portraits

Options
    • -1
    • +1
    ./web/gradebookCourseMonitor.jsp
    • -2
    • +2
    ./web/gradebookMonitor.jsp
  3. … 3 more files in changeset.
Tuesday 17 Oct 2017
9:53 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Updating greek

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
1:56 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -55
    • +29
    ./web/gradebookCourseLearner.jsp
    • -104
    • +94
    ./web/gradebookCourseMonitor.jsp
    • -48
    • +30
    ./web/gradebookMonitor.jsp
    • -13
    • +4
    ./web/includes/css/gradebook.scss
    • -14
    • +32
    ./web/includes/jsp/jqGridIncludes.jsp
  9. … 8 more files in changeset.
Friday 13 Oct 2017
2: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
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  2. … 8 more files in changeset.
Thursday 12 Oct 2017
5:31 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Spanish for various projects

Options
    • -4
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +11
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 4 more files in changeset.
Wednesday 11 Oct 2017
6:43 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
4: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
    • -4
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +71
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
  3. … 1 more file in changeset.
Saturday 07 Oct 2017
2:00 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4433: adding new label

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Friday 06 Oct 2017
2: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
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
12:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4431 Portraits shown in Monitor and Course Gradebook

Options
    • -6
    • +19
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -5
    • +18
    ./web/gradebookCourseMonitor.jsp
    • -7
    • +33
    ./web/gradebookMonitor.jsp
    • -2
    • +5
    ./web/includes/jsp/jqGridIncludes.jsp