lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Make space for the loading message

LDEV-1256: Added admin_url column to tool and system tool tables

    • -0
    • +2
    /lams_common/db/sql/create_lams_11_tables.sql
LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

Branching: The start and end co-ordinates were missing during the import.

Branching: The start and end co-ordinates were missing during the import.

LDEV-1261: Fixing a lazy loading exception that started when we removed the hibernate session filter on the user role import. The organisation can't be passed in from the web layer as it isn't connected to the session, and so when it tries to get the user organisation from the organisation, it throws a lazy loading exception.

a few neat UI improvements for branching - utilise scroll pane in branching view + move the bin into the view with open + fixed up transition/system tool x/y positioning on-drop

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

    • -173
    • +67
    /lams_monitoring/web/branching/chosenSelection.jsp
    • -0
    • +70
    /lams_monitoring/web/branching/viewBranches.jsp
Avoid copying class files to WEB-INF when doing synchronise deploy - don't want multiple versions of the classes floating around.

Should have been removed when we split LAMS and RAMS

    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_da_DK.properties
    • -60
    • +0
    /lams_monitoring/conf/language/ApplicationResources_de_DE.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_el_GR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_es_ES.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_fr_FR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_ko_KR.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_mi_NZ.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_no_NO.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_pl_PL.properties
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources_sv_SE.properties
remove NONE type option for Gate Activity(s)

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
removed unused CA duplicate

    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
added labels for Branching

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
fixes for PI (branching activity)

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
Branching: Tweaking the branch objects so that the contribution flags are right for teacher chosen activities (and hence the button will appear to do the selection in monitoring) and some changes to make the teacher chosen screen logic easier.

Branching: Branching activities always have a grouping during a lesson, as this is set up at lesson creation time. But they might not have any groups!

Further work on the teacher chosen branching screen. This included ensuring that the tool sessions aren't created for the activities within a branch when a lesson is created (as the users aren't known in advance) and also ensuring that there is always a grouping object attached to a branching activity during a lesson so that the grouping logic doesn't have to create it.

updated branching types + fixed end connector position (applying dto data)

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
fixed wddxtags type (firstActivityUIID) + improvement in loading sequences for branching activity

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
branching activity saves start/end connector coords + update to contribute activity in monitor

branching activity saves start/end connector coords

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
Branching: Create the Teacher Chosen branching screen, based on the existing Chosen Grouping screen. Not working yet but the changes have required changing the LessonService (in lams.jar) to take Grouping as a parameter, rather than GroupingActivity, so checking in Monitoring changes to match.

    • -0
    • +477
    /lams_monitoring/web/branching/chosenSelection.jsp
Branching: moved the types to the BranchingActivity so they can be accessed from learner and monitor.

Branching: Adding x and y co-ordinates for the start and stop points. This is to support to UI - the details are not used by the progress engine.

    • -0
    • +4
    /lams_common/db/sql/create_lams_11_tables.sql
improved canvas branch view - adding canvas activities (group, branching, optional activities etc)

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
LI-120 creating the build ant scipt for the unix installer package.

Updating with changes that fiona made for 2.0.4 release. Some files replace with code downloaded from the installer package website

File is generated by installer, so should not be in the build package

Branching: Improved validation logic for adding branch connectors or transitions in Branching Activity view. Added firstActivityUIID field to SequenceActivity. Creating branches on fly (onload of sequence activities in branching activity).

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
added firstActivityUIID field to SequenceActivity + improve branching validation logic + creating branches on fly (onload of sequence activities in branching activity)

Rolling back previous update as the validation changes caused problems with drawing the "transitions" from the start hub.

    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf