lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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'

LDEV-4605 Codify country for users

Change the country field to ISO_3166-1 alpha-2 codes (two letters).

So in when editing the profile, a user should be able to set his/her

country based on the list of countries in the ISO list.

Country should be a compulsory when editing profile, editing user

as group manager and in signup pages.

For integrations, if the country is not passed, then we should default

to a default country server.

    • -6
    • +16
    /lams_central/web/profile/editprofile.jsp
    • -23
    • +40
    /lams_central/web/signup/singupTab.jsp
LDEV-4605 Introduce CommonConstants.java

For starters it will contain user portrait dimensions and the list of

country codes.

LDEV-4440 Almost finished authoring migration

    • binary
    /lams_build/lib/lams/lams-central.jar
  1. … 8 more files in changeset.
LDEV-4440 Show archived activity attempts in gradebook

    • -7
    • +84
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4440 Finishing authoring migration

    • binary
    /lams_build/lib/lams/lams-central.jar
  1. … 5 more files in changeset.
LDEV-4593: small UI changes

Adding a new label to explain the scope of minor changes to policies

    • -10
    • +19
    /lams_admin/web/policies/editPolicy.jsp
LDEV-4605 Move profile related jsps to /web/profile/ folder

    • -422
    • +0
    /lams_central/web/editprofile.jsp
    • -0
    • +422
    /lams_central/web/profile/editprofile.jsp
    • -0
    • +90
    /lams_central/web/profile/lessons.jsp
    • -0
    • +236
    /lams_central/web/profile/portrait.jsp
    • -0
    • +115
    /lams_central/web/profile/profile.jsp
Merge branch 'LDEV-4593'

LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

    • -1
    • +0
    /lams_admin/web/WEB-INF/struts-config.xml
    • -2
    • +1
    /lams_admin/web/policies/editPolicy.jsp
    • -12
    • +3
    /lams_admin/web/policies/policyTable.jsp
    • -0
    • +86
    /lams_central/web/profile/policyDetails.jsp
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.

LDEV-4440 Initial version of authoring on Spring MVC

    • -0
    • +17
    /lams_tool_task/web/WEB-INF/spring-servlet.xml
    • -22
    • +22
    /lams_tool_task/web/WEB-INF/web.xml
  1. … 10 more files in changeset.
LDEV-4440 Initial version of authoring on Spring MVC

    • -0
    • +17
    /lams_tool_survey/web/WEB-INF/spring-servlet.xml
    • -31
    • +24
    /lams_tool_survey/web/WEB-INF/web.xml
  1. … 11 more files in changeset.
Merge branch 'LDEV-4607'

LDEV-4607 Detach gradebook output from activity if "no score" is chosen

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