Clone
 

fmalikoff in lams-github

LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

Merging changes from 2.3 release branch for LDEV-2524.

  1. … 15 more files in changeset.
Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

LDEV-1662: Fixing up the advanced options in monitoring so that they look correct in RTL locales.

LDEV-1662: Adding new style to support the advanced options

LDEV-1662: Entries for On and Off were not internationalised.

LDEV-1662: Adding a new section to each monitoring summary screen, to show the advanced options.

    • -0
    • +12
    /lams_central/web/css/defaultHTML.css
LDEV-1208: Preview's special define later screen to update the Flash progress bar.

    • -0
    • +6
    /lams_learning/web/previewDefineLater.jsp
LDEV-1217: Check the length of the description so that it doesn't trigger a database error.

Updating project property for the correct version

LDEV-1833: Was throwing exception if asked for the tool output for a user that has not answered the questions. Now returns null.

Updating scripts to call deploy.xml, rather than deploy.properties

Version updated for 2.1 release

LDEV-1825: When we copy a learning design, make sure any grouping details and associated mappings attached to a teacher chosen branching or a define later grouped branching are not copied. If we don't do this, we encounter problems when run a design that has been attached to a lesson. Otherwise we either throw an exception (as the grouping doesn't exist) or we use the groupings that were used in the previous lesson and they may not be wanted.

LI-161: Correcting constructors

LI-161: Replacing / in windows paths to \ to make all the paths consistent.

LI-161: Added a new build task deploy-tools-for-upgrader that only run the tool deploy part, and not the combined activities.

LI-161: Generate special version of deploy.xml for tools that has a generic parameter in the place of the drive paths. This is turned on in common.properties (generate for installer) in lams_build. Only use this option if you are writing an installer/updater.

LI-161: Generate special version of deploy.xml for tools that has a generic parameter in the place of the drive paths. This is turned on in common.properties (generate for installer) in lams_build. Only use this option if you are writing an installer/updater.

  1. … 7 more files in changeset.
LDEV-1819: Initialise branching activities properly after a live edit

    • binary
    /lams_build/lib/lams/lams-monitoring.jar
LDEV-1818: Adding validation to check that a tool based branch always has at least one condition

LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

    • -0
    • +10
    /lams_learning/web/previewDefineLater.jsp
LDEV-1820: Less than wasn't working as the BranchCondition was expecting start value to be 0, and it was null. Now accepts null.

LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

LDEV-1817: Define later branching was breaking Preview. Now the preview hack allows it to be used with Random Grouping and this required regetting the grouping at one point to avoid a CGLIB class cast exception (hack on hack). Bleah.

The chosen grouping now works as I clear the number of groups before creating a group (and then allocating to a branch), otherwise I could run into the max number of branches test. Another hack.

LDEV-1804: Tool urls on the Optional Activity page were missing the tool part - all there was was the lams part.

LDEV-1753: Ajax based selection screens in monitoring were not indicating to the user if any exceptions thrown on the server. Added some javascript to check if the return value from the server was the general struts error message. If it is, it extracts the message and displays that in an alert box.

    • -0
    • +18
    /lams_central/web/includes/javascript/error.js
LDEV-1763: Hiding the "Branching" and "Branch Blah" levels when the learner is in a branch.

LDEV-1786: On very rare occasions, we've had Hibernate try to save the branching entries before saving the branching activity which throws an exception as the branch_activity_id is null. So force any branching activities to save first.

Tweaking some wording