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 04 May 2006
2:58 pm

fmalikoff

Rejigging contribute activities list. Still have to do the urls for grouping and gates

Options
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -16
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +41
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -0
    • +125
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -13
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
    • -107
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java
    • -2
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java
    • -4
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/GroupingActivityStrategy.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/PermissionGateActivityStrategy.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ScheduleGateActivityStrategy.java
    • -15
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SimpleActivityStrategy.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SynchGateActivityStrategy.java
    • -5
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java
    • -10
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
  16. … 9 more files in changeset.
2:01 pm

steven

adjust export content.

Options
    • -1
    • +2
    /lams_tool_larsrc/conf/language/ApplicationResources.properties
    • -3
    • +10
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -3
    • +18
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -3
    • +6
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
    • -0
    • +14
    /lams_tool_larsrc/web/pages/export/exportportfolio.jsp
12:24 pm

steven

Add zero access item into summary

Options
    • -13
    • +4
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/ResourceItemVisitDAO.java
    • -21
    • +8
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java
    • -3
    • +31
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +55
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -15
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -4
    • +11
    /lams_tool_larsrc/web/pages/monitoring/statistic.jsp
    • -4
    • +11
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
9:21 am

steven

merge add url/file learing page into one page.

Options
    • -1
    • +1
    /lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
    • -4
    • +1
    /lams_tool_larsrc/web/pages/learning/finish.jsp
    • -17
    • +66
    /lams_tool_larsrc/web/pages/learning/learning.jsp
    • -8
    • +0
    /lams_tool_larsrc/web/pages/learning/learningframe.jsp
    • -1
    • +1
    /lams_tool_larsrc/web/pages/learning/start.jsp
    • -1
    • +1
    /lams_tool_larsrc/web/pages/learning/success.jsp
Wednesday 03 May 2006
1:40 pm

fmalikoff

Added deploy-jar to make development time builds easier

Options
    • -1
    • +20
    /lams_monitoring/build.xml
1:39 pm

fmalikoff

Give groups a default name, so that even if the name isn't supplied a database error isn't thrown (group name cannot be null in the db).

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -3
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
1:38 pm

fmalikoff

Got the existing grouping and gate screens working from the learner interface. More work yet to be done on them.

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -16
    • +64
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -31
    • +95
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -9
    • +14
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -11
    • +27
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -4
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -5
    • +5
    /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
1:37 pm

fmalikoff

Changed to UTF-8 encoding

Options
    • -2
    • +2
    /lams_learning/web/layout/activityLayout.jsp
    • -2
    • +2
    /lams_learning/web/layout/layout.jsp
12:01 pm

steven

export portfolio works.

Options
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceSessionDAOHibernate.java
    • -4
    • +7
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
    • -14
    • +5
    /lams_tool_larsrc/web/pages/export/exportportfolio.jsp
    • -2
    • +2
    /lams_tool_larsrc/web/pages/monitoring/statistic.jsp
    • -5
    • +7
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
10:55 am

psharma

added moviclip selectClass and staff_learner_dataRow

Options
    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
10:15 am

steven

Export portfolio.

Options
    • -3
    • +6
    /lams_tool_larsrc/conf/language/ApplicationResources.properties
    • -2
    • +52
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/Summary.java
    • -3
    • +4
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -4
    • +45
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -5
    • +5
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceProxy.java
    • -263
    • +0
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/Download.java
    • -0
    • +133
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/ExportServlet.java
    • -1
    • +1
    /lams_tool_larsrc/web/WEB-INF/web.xml
    • -0
    • +126
    /lams_tool_larsrc/web/pages/export/exportportfolio.jsp
    • -1
    • +4
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
10:14 am

steven

Change Params name

Options
    • -3
    • +5
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceUserDAOHibernate.java
7:46 am

psharma

change in the set size setting s for Monitor

Options
    • binary
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as
Tuesday 02 May 2006
3:43 pm

mseaton

LessonTabView created/initialised in MonitorView scrollpane

Options
    • binary
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
    • binary
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
3:21 pm

mseaton

changed trace comment

Options
    • binary
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
2:34 pm

steven

Improvement in nav instructions.

Options
    • -2
    • +2
    /lams_tool_larsrc/conf/language/ApplicationResources.properties
    • -11
    • +11
    /lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
    • -9
    • +9
    /lams_tool_larsrc/db/sql/table-schema.sql
    • -7
    • +12
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -2
    • +14
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
    • -0
    • +1
    /lams_tool_larsrc/web/includes/images/.cvsignore
    • binary
    /lams_tool_larsrc/web/includes/images/tick.gif
    • -3
    • +3
    /lams_tool_larsrc/web/pages/learning/learning.jsp
2:15 pm

fmalikoff

Removing the unneeded swfs.

Options
    • -15
    • +40
    /lams_learning/web/controlFrame.jsp
1:47 pm

mseaton

updated lams jar

Options
    • binary
    /lams_build/lib/lams/lams.jar
1:42 pm

fmalikoff

Added the core lams tag files.

Options
    • -0
    • +6
    /lams_learning/build.xml
    • -22
    • +247
    /lams_learning/web/WEB-INF/lams.tld
    • -1
    • +1
    /lams_learning/web/WEB-INF/struts/struts-config.xml
    • -0
    • +58
    /lams_learning/web/WEB-INF/tags/HTMLEditor.tag
    • -0
    • +64
    /lams_learning/web/WEB-INF/tags/SetEditor.tag
    • -0
    • +79
    /lams_learning/web/WEB-INF/tags/Tab.tag
    • -0
    • +62
    /lams_learning/web/WEB-INF/tags/TabBody.tag
    • -0
    • +72
    /lams_learning/web/WEB-INF/tags/Tabs.tag
    • -0
    • +56
    /lams_learning/web/WEB-INF/tags/headItems.tag
1:42 pm

fmalikoff

Set up the string that will be used to inform Flash of the learner's progress. This string (attempted&=completed&=current) will be passed to Flash via passon.swf in the tool display jsp.

Options
    • -0
    • +1
    /lams_learning/web/loadToolActivity.jsp
1:41 pm

fmalikoff

Removing the unneeded swfs.

Options
    • binary
    /lams_learning/web/LearnerLeftUI.swf
    • binary
    /lams_learning/web/LearnerTopUI.swf
    • -75
    • +0
    /lams_learning/web/controlBottomFrame.jsp
    • -55
    • +0
    /lams_learning/web/controlTopFrame.jsp
    • -84
    • +0
    /lams_learning/web/dummyControlBottomFrame.jsp
    • -14
    • +48
    /lams_learning/web/dummyControlFrame.jsp
1:36 pm

mseaton

updated test service - removed WDDX test

Options
    • -5
    • +3
    /lams_common/test/java/org/lamsfoundation/lams/usermanagement/TestUserManagementService.java
1:36 pm

mseaton

removed WDDX test method

Options
    • -14
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -24
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
1:35 pm

mseaton

Added parentID

Options
    • -2
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
1:35 pm

mseaton

added hasRole method to check if set role matches an items in role list.

Options
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationRole.java
1:32 pm

mseaton

updated Service to get list of orgs for multiple roles

Options
    • -3
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -11
    • +17
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
1:30 pm

mseaton

updated getOrganisationsByUserRole to take list of roles as request parameter

Options
    • -4
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java
1:27 pm

fmalikoff

Worked on the learner progress. Was always going back to the first activity when we exited a lesson - the learner progress in the session was out of date (wasn't updated as the tool's called the complete tool method). The learner progress is now in the special LAMS session object and is updated when tool's call the complete method.

Also set up the string that will be used to inform Flash of the learner's progress. This string (attempted&=completed&=current) will be passed to Flash via passon.swf in the tool display jsp.

Options
    • -3
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -6
    • +49
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -5
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -10
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -16
    • +14
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -20
    • +43
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -4
    • +1
    /lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGateAction.java
    • -4
    • +1
    /lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestGroupingAction.java
    • -6
    • +1
    /lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/TestLearnerAction.java
12:07 pm

steven

Monitoring works

.

Options
    • -1
    • +1
    /lams_tool_larsrc/conf/xdoclet/struts-actions.xml
    • -1
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -1
    • +26
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -3
    • +4
    /lams_tool_larsrc/web/pages/monitoring/statistic.jsp
    • -6
    • +7
    /lams_tool_larsrc/web/pages/monitoring/summary.jsp
    • -2
    • +2
    /lams_tool_larsrc/web/pages/monitoring/userlist.jsp
11:41 am

psharma

added LessonTabView movieclip and components in library

Options
    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla