lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4607 LDEV-4593 and LDEV-4614

Adding policy and consent labels, No score labels for gradebook in authoring, removing country labels as they moved to lams_common

LDEV-4593: Adding English labels. LDEV-4605: removing country list from admin

LDEV-4593: Adding Spanish labels

LDEV-4614: Moving labels around

Moving labels for countries out of lams_admin and lams_central to lams_common instead.

Merge branch 'LDEV-4614'

LDEV-4614 Sort country list by name rather than code

    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -2
    • +2
    /lams_central/web/signup/singupTab.jsp
Merge branch 'LDEV-4620'

LDEV-4620 Include tool name to a log event description

LDEV-4611: minor UI changes

Removing label improved layout

LDEV-4612 Mindmap has full screen mode.

    • -0
    • +67
    /lams_central/web/css/_learner_base.scss
    • -0
    • +54
    /lams_central/web/includes/javascript/fullscreen.js
    • -65
    • +0
    /lams_monitoring/web/css/timer.scss
    • -4
    • +19
    /lams_tool_mindmap/web/common/mapjs.jsp
Merge branch 'LDEV-4620'

LDEV-4620 Submit Files tool to log release marks event

LDEV-4620 Change return type of getLessonActivityIdsForToolContentId

Merge branch 'master' of github.com:lamsfoundation/lams

LDEV-4611: minor UI changes

LDEV-4440 Started learning migration

Merge branch 'LDEV-4610'

LDEV-4610 Remove tooltips from jqGrid in gradebook

    • -27
    • +27
    /lams_gradebook/web/gradebookCourseLearner.jsp
    • -22
    • +22
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -16
    • +13
    /lams_gradebook/web/gradebookMonitor.jsp
Merge branch 'LDEV-4611'

LDEV-4611 minor changes to release marks feature

* Slightly modify CSS of release mark alert message

* Don't display old message at the top of a page on releasing marks

LDEV-4501 adding missing labels

Merge branch 'LDEV-4611'

LDEV-4611 Release marks auto pushes marks to gradebook now

Release marks needs to be a "state" within the tool rather than

something that is transient. If this option is marks are already

released, then marks entered in SF monitor should be auto pushed to

monitor and disclosed to students via SF learner.

Also once you release marks you should not be able to unrelease them.

View all marks page should also state the release marks state.

  1. … 3 more files in changeset.
LDEV-4611 Code clean up

LDEV-4605: Adding country list in Greek

LDEV-4605: Adding country list in Greek

LDEV-4605: Adding country list in Spanish

Adding country list in Español

LDEV-4605 adding missing country/territory

I forgot to include BQ = Bonaire, Saint Eustatius and Saba. Glad no one noticed ;-)

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.

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
Merge branch 'LDEV-4605'