lams

lams_monitoring

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 21
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 35,948
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
Monday 09 Jul 2007
1:41 pm

fmalikoff

View branch screen done for the group based branching and tool based branching activities.

Options
    • -3
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -0
    • +18
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +4
    ./web/WEB-INF/struts/tiles-defs.xml
    • -24
    • +22
    ./web/branching/viewBranches.jsp
Friday 06 Jul 2007
12:22 pm

fmalikoff

Make space for the loading message

Options
    • -1
    • +1
    ./web/branching/chosenSelection.jsp
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
    ./build.xml
4:16 pm

fmalikoff

Should have been removed when we split LAMS and RAMS

Options
    • -62
    • +0
    ./conf/language/ApplicationResources.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_da_DK.properties
    • -60
    • +0
    ./conf/language/ApplicationResources_de_DE.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_el_GR.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_es_ES.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_fr_FR.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_ko_KR.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_mi_NZ.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_no_NO.properties
    • -62
    • +0
    ./conf/language/ApplicationResources_pl_PL.properties
    • -62
    • +0
    ./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
    • -1
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -14
    • +24
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -11
    • +89
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -70
    • +23
    ./src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -173
    • +67
    ./web/branching/chosenSelection.jsp
    • -0
    • +70
    ./web/branching/viewBranches.jsp
  9. … 6 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/monitoring/BranchDTO.java
    • -0
    • +86
    ./src/java/org/lamsfoundation/lams/monitoring/BranchingDTO.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/ContributeActivityDTO.java
    • -12
    • +36
    ./src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/ContributeActivitiesProcessor.java
    • -14
    • +36
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -126
    • +131
    ./src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
Tuesday 03 Jul 2007
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
    ./build.xml
    • -9
    • +31
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -38
    • +95
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +392
    ./src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -0
    • +477
    ./web/branching/chosenSelection.jsp
Thursday 14 Jun 2007
2:12 pm

jliew

update lams:help tag with style attribute, mainly for lams_admin to display properly

Options
    • -0
    • +8
    ./web/WEB-INF/lams.tld
  2. … 16 more files in changeset.
Friday 08 Jun 2007
9:33 am

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages. Moved the utf-8 statements to the same tag so we don't have to remember to put them in all pages.

Options
    • -2
    • +0
    ./web/WEB-INF/tags/headItems.tag
  2. … 173 more files in changeset.
Tuesday 05 Jun 2007
1:52 pm

fmalikoff

LDEV-1255: Moving the code for stopping jsps caching to a new custom tag, so that it can be applied consistently across all pages.

Options
    • -3
    • +2
    ./web/addLesson.jsp
    • -6
    • +2
    ./web/monitorLesson.jsp
    • -3
    • +2
    ./web/previewdeleted.jsp
    • -0
    • +4
    ./web/WEB-INF/lams.tld
    • -0
    • +41
    ./web/WEB-INF/tags/Head.tag
    • -6
    • +2
    ./web/grouping/chosenGrouping.jsp
    • -5
    • +2
    ./web/template/template.jsp
  8. … 39 more files in changeset.
Friday 01 Jun 2007
4:26 pm

fmalikoff

Was caching in browser and causing problems in upgrades. Trying to stop it caching.

Options
    • -0
    • +4
    ./web/monitorLesson.jsp
3:26 pm

mseaton

updated dictionary load url to include build no/version param

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
    • binary
    ./web/lams_wizard.swf
    • binary
    ./web/lams_wizard_library.swf
  5. … 3 more files in changeset.
Thursday 31 May 2007
2:59 pm

mseaton

fixed learner icon drag/drop for force completing a learner

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 1 more file in changeset.
Wednesday 30 May 2007
5:01 pm

mseaton

fix for lock/unlocking complex acts on canvas

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 4 more files in changeset.
2:58 pm

mseaton

fixed learner icon bug where icon would hide behind activities if moving from an optional activity - fixed depth issue by creating a container for the learnerIcon(s)

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 6 more files in changeset.
11:48 am

mseaton

monitor update to change to locked view when another users is currently editing the lesson/design

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 5 more files in changeset.
Tuesday 29 May 2007
1:01 pm

mseaton

reload window if user clicks live edit and call returns unavailable (false)

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 2 more files in changeset.
12:40 pm

fmalikoff

LDEV-1237: Permission gate couldn't be opened if the class export portfolio had been done, as the export set the readonly flag to true and the readonly flag wasn't being reset. Now all fields are reset before the gate screen is displayed.

Options
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
12:06 pm

mseaton

on click of refresh if another user has live edit on, then the monitor window is reloaded + appended userID param to EOF setup call

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
    • -0
    • +6
    ./web/monitorLesson.jsp
  4. … 5 more files in changeset.
Monday 28 May 2007
3:09 pm

mseaton

fixes from todays test session: fix double var use in learner tab and container depths

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 1 more file in changeset.
2:33 pm

mseaton

fixes from todays test session: learner progress to scroll to current act when initially loaded + fix double var use in learner tab and container depths

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 3 more files in changeset.
Tuesday 22 May 2007
1:20 pm

mseaton

improved performance of learners data (movieclips) loaded in the Learners tab of Monitor and improved tab handling (reloading progress + redrawing)

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 5 more files in changeset.
Friday 18 May 2007
12:42 pm

mseaton

updated About dialog

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 9 more files in changeset.
Thursday 17 May 2007
4:05 pm

mseaton

updated About dialog

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
    • -1
    • +2
    ./web/monitorLesson.jsp
  4. … 8 more files in changeset.
Friday 11 May 2007
3:06 pm

mseaton

missing hasPlus init param for learnerIcon

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 1 more file in changeset.
Thursday 10 May 2007
11:10 am

mseaton

updated monitoring SWF

Options
    • binary
    ./web/lams_monitoring.swf
  2. … 1 more file in changeset.
Wednesday 09 May 2007
4:47 pm

mseaton

merged SWF files (recompiled) from editonfly branch to HEAD

Options
    • binary
    ./web/lams_monitoring_library.swf
    • binary
    ./web/lams_wizard.swf
    • binary
    ./web/lams_wizard_library.swf
4:08 pm

mseaton

merged SWF files (recompiled) from editonfly branch to HEAD

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_wizard.swf
  3. … 4 more files in changeset.
9:01 am

fmalikoff

Merging RAMS and Edit On Fly changes from branch to the head.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/web/InitializeLessonServlet.java
    • -1
    • +8
    ./web/monitorLesson.jsp
    • -0
    • +30
    ./web/WEB-INF/lams.tld
  6. … 70 more files in changeset.
8:51 am

fmalikoff

Merging RAMS and Edit On Fly changes from branch to the head.

Options
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -64
    • +74
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • binary
    ./web/lams_monitoring_library.swf
    • binary
    ./web/lams_wizard_library.swf
    • -1
    • +1
    ./web/WEB-INF/tags/ExportPortOutput.tag
    • -2
    • +2
    ./web/WEB-INF/tags/FCKEditor.tag
    • -81
    • +85
    ./web/WEB-INF/tags/Passon.tag
    • -99
    • +99
    ./web/WEB-INF/tags/Tab.tag
    • -52
    • +52
    ./web/WEB-INF/tags/TabBody.tag
    • -69
    • +69
    ./web/WEB-INF/tags/Tabs.tag
  11. … 150 more files in changeset.