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 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
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  2. … 8 more files in changeset.
Thursday 12 Oct 2017
11: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
12:43 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
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
    • -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
8: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
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
    ./src/java/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
    ./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
12:42 am

Andrey Balan

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

Options
    • -0
    • +52
    ./src/java/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
    ./src/java/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
    ./src/java/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
    • -1
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -10
    • +107
    ./src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
    • -10
    • +20
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -2
    • +64
    ./web/gradebookMonitor.jsp
  10. … 8 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 44 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 73 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 74 more files in changeset.
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
    ./src/java/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
    • -0
    • +2
    ./.classpath
    • -18
    • +15
    ./src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
  3. … 134 more files in changeset.
Monday 07 Aug 2017
3:03 pm

Marcin Cieslak

LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 23 more files in changeset.
Saturday 05 Aug 2017
5:36 pm

Marcin Cieslak

LDEV-4400 Update dependecies to embedded libraries

WildFly 10 is shipped with newer versions of libraries that LAMS uses.

LAMS now points to proper JAR files. Following libraries were updated:

beanutils 1.8.3 -> 1.9.2

codec 1.9 -> 1.10

collection 3.2.1 -> 3.2.2

xerces 2.11.0.SP3 -> 2.11.0.SP4

httpclient 4.2.1 -> 4.5

httpcore 4.2.1 -> 4.4.1

wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was

changed)

jboss-dmr 1.2.0 -> 1.3.0

Hibernate 4.3.7 -> 5.0.10

log4j-jboss-logmanager 1.1.0 -> 1.1.2

jcl-over-slf4j 1.7.2 -> 1.7.7

undertow-core 1.1.8 -> 1.4.0

undertow-servlet 1.1.8 -> 1.4.0

javax.mail 1.5.0 -> 1.5.5

jboss-jstl 1.1.2 -> 1.1.3

jboss-logging 3.1.4 -> 3.3.0

remoting-jmx 2.0.0 -> 2.0.1

slf4j-api 1.7.2 -> 1.7.7

picketbox 4.0.21 -> 4.9.6

jboss-websocket-api 1.1.0 -> 1.1.1

joda-time 1.6.2 -> 2.7

Options
    • -1
    • +1
    ./.classpath
  2. … 47 more files in changeset.
2:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Sizing tweaks

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
1:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -0
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 87 more files in changeset.
Monday 31 Jul 2017
11:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
    • -0
    • +26
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 53 more files in changeset.
Saturday 29 Jul 2017
4:17 pm

Marcin Cieslak

Clean up unnecessary settings file

Options
    • -59
    • +0
    ./.settings/org.eclipse.jdt.ui.prefs
Thursday 27 Jul 2017
6:04 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -6
    • +5
    ./web/WEB-INF/tags/Page.tag
  2. … 37 more files in changeset.
Tuesday 25 Jul 2017
8:05 pm

Marcin Cieslak

LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

Options
    • -4
    • +14
    ./web/WEB-INF/tags/Page.tag
  2. … 37 more files in changeset.
Wednesday 19 Jul 2017
6:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +12
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    ./web/gradebookMonitor.jsp
  4. … 154 more files in changeset.
Tuesday 11 Jul 2017
11:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -9
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +29
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 49 more files in changeset.
Monday 10 Jul 2017
9:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4372 Tooltips in Monitoring tabs no longer clash

Options
    • -1
    • +1
    ./web/gradebookCourseLearner.jsp
    • -1
    • +1
    ./web/gradebookCourseMonitor.jsp
    • -7
    • +6
    ./web/gradebookMonitor.jsp
    • -11
    • +0
    ./web/includes/css/gradebook.scss
    • -2
    • +6
    ./web/includes/jsp/jqGridIncludes.jsp
  6. … 4 more files in changeset.
12:21 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4369 Date show/hide status preserved across page changes

Options
    • -23
    • +15
    ./web/gradebookMonitor.jsp
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 CSS Files removed if they are now generated files using SASS

Options
    • -0
    • +1
    ./.gitignore
    • -47
    • +0
    ./web/includes/css/gradebook.css
  3. … 41 more files in changeset.
Saturday 01 Jul 2017
11:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -0
    • +16
    ./.externalToolBuilders/SASS_lams_gradebook.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +9
    ./.project
    • -1
    • +4
    ./build.properties
    • -0
    • +1
    ./web/gradebookMonitor.jsp
    • -30
    • +28
    ./web/includes/css/gradebook.css
    • -0
    • +62
    ./web/includes/css/gradebook.scss
    • -13
    • +0
    ./web/includes/jsp/jqGridIncludes.jsp
  9. … 151 more files in changeset.