lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
Net change in LoC this week: 0

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
Thursday 05 Jul 2007
1:59 pm

mseaton

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

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -6
    • +27
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as
    • -4
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -0
    • +14
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -8
    • +23
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -4
    • +5
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
9:48 am

jliew

fixed due to change in service method signature

Options
    • -2
    • +15
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationWDDXAction.java
9:29 am

jliew

display federation server lesson links for learners on index page

Options
    • -0
    • +33
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +20
    /lams_central/web/includes/javascript/openUrls.js
Wednesday 04 Jul 2007
4:16 pm

fmalikoff

Avoid copying class files to WEB-INF when doing synchronise deploy - don't want multiple versions of the classes floating around.

Options
    • -0
    • +1
    /lams_monitoring/build.xml
4:16 pm

fmalikoff

Should have been removed when we split LAMS and RAMS

Options
    • -62
    • +0
    /lams_monitoring/conf/language/ApplicationResources.properties
    • -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
4:15 pm

fmalikoff

Branching: Teacher chosen branch screen basically working. Still a bit of clean up on the messages to go.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -6
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -3
    • +40
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -6
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -6
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +9
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -14
    • +24
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -11
    • +89
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -70
    • +23
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -4
    • +4
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -173
    • +67
    /lams_monitoring/web/branching/chosenSelection.jsp
    • -0
    • +70
    /lams_monitoring/web/branching/viewBranches.jsp
2:14 pm

mseaton

remove NONE type option for Gate Activity(s)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
2:11 pm

jliew

file GetFedServerGroupsServlet.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/GetFedServerGroupsServlet.java
2:11 pm

jliew

file GetFedServerLessonsServlet.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/GetFedServerLessonsServlet.java
2:11 pm

jliew

add 2 servlets at /servlet/getFedServerGroups and /servlet/getFedServerLessons for flash to use

Options
    • -0
    • +40
    /lams_central/src/java/org/lamsfoundation/lams/web/GetFedServerGroupsServlet.java
    • -0
    • +40
    /lams_central/src/java/org/lamsfoundation/lams/web/GetFedServerLessonsServlet.java
    • -11
    • +53
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
2:10 pm

jliew

add new column to lams_lesson_fed to store local lesson state of external lessons (for later)

Options
    • -0
    • +2
    /lams_admin/web/federation/federation.jsp
    • -0
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/LessonFederation.hbm.xml
    • -0
    • +1
    /lams_common/db/sql/create_sharedlesson_tables.sql
    • -1
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java
2:03 pm

mseaton

removed unused CA duplicate

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
2:02 pm

mseaton

added labels for Branching

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -7
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
1:26 pm

mseaton

fixes for PI (branching activity)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -0
    • +15
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • binary
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasBranchingActivity.as
    • -4
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -3
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -28
    • +32
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
11:35 am

fmalikoff

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.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -9
    • +17
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +60
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -1
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -2
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -2
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -0
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/IContributionTypeStrategy.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
11:33 am

fmalikoff

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!

Options
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
11:31 am

fmalikoff

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.

Options
    • -0
    • +72
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/BranchDTO.java
    • -0
    • +86
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/BranchingDTO.java
    • -2
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeActivityDTO.java
    • -12
    • +36
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -5
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -14
    • +36
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -126
    • +131
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
11:18 am

mseaton

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

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -3
    • +21
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
    • -9
    • +16
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -1
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -5
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -162
    • +193
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
Tuesday 03 Jul 2007
2:50 pm

mseaton

fixed wddxtags type (firstActivityUIID) + improvement in loading sequences for branching activity

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -8
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
2:15 pm

mseaton

branching activity saves start/end connector coords + update to contribute activity in monitor

Options
    • -1
    • +58
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -2
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -0
    • +13
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
    • -1
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -4
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as
    • -89
    • +36
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
2:09 pm

mseaton

branching activity saves start/end connector coords

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
10:23 am

jliew

make name validation work

Options
    • -2
    • +5
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java
10:07 am

fmalikoff

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.

Options
    • -1
    • +1
    /lams_monitoring/build.xml
    • -9
    • +31
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -38
    • +95
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +392
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -5
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +477
    /lams_monitoring/web/branching/chosenSelection.jsp
10:05 am

fmalikoff

Branching: moved the types to the BranchingActivity so they can be accessed from learner and monitor.

Options
    • -8
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
10:00 am

fmalikoff

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.

Options
    • -0
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -2
    • +54
    /lams_common/db/model/lams_11.clay
    • -1
    • +5
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +6
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -4
    • +65
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -85
    • +129
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -15
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
9:20 am

jliew

added collection of external servers, since it's stored locally in new table (lams_lesson_fed)

Options
    • -0
    • +19
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/FederationServer.hbm.xml
9:20 am

jliew

changed lessonId property to lesson object, since it's on the local server

Options
    • -7
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/FederationLesson.hbm.xml
9:18 am

jliew

file FedRegistryUpdateServlet.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/FedRegistryUpdateServlet.java
9:18 am

jliew

change update registry url from struts action to servlet so that it falls outside of web security context.

Options
    • -1
    • +1
    /lams_admin/web/federation/federation.jsp
    • -0
    • +43
    /lams_central/src/java/org/lamsfoundation/lams/web/FedRegistryUpdateServlet.java
    • -41
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/FederationRegistryAction.java
    • -0
    • +0
    /lams_central/web/federationUpdateResults.jsp
9:17 am

jliew

add validation for duplicate name

Options
    • -0
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java