lams

lams_learning

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 32,912
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 03 Jul 2006
8:21 am

fmalikoff

Updated so that they compile - errors existed due to changes in the user service. Not tested - the test cases may be broken.

Options
    • -3
    • +4
    ./test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
    • -4
    • +5
    ./test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
Saturday 01 Jul 2006
8:49 pm

fmalikoff

Converted to the learner content styles

Options
    • -0
    • +1
    ./conf/xdoclet/struts-forms.xml
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -6
    • +22
    ./web/error.jsp
    • -27
    • +0
    ./web/exit.jsp
    • -5
    • +16
    ./web/exportWaitingPage.jsp
    • -4
    • +18
    ./web/lessonComplete.jsp
    • -5
    • +23
    ./web/loadToolActivity.jsp
    • -15
    • +28
    ./web/optionsActivity.jsp
    • -3
    • +18
    ./web/partialCompleted.jsp
    • -6
    • +22
    ./web/previewDefineLater.jsp
    • -1
    • +18
    ./web/welcome.jsp
    • -6
    • +1
    ./web/WEB-INF/web.xml
    • -0
    • +1
    ./web/WEB-INF/struts/struts-config.xml
    • -19
    • +8
    ./web/WEB-INF/struts/tiles-defs.xml
    • -341
    • +0
    ./web/css/learner.css
  16. … 11 more files in changeset.
Friday 30 Jun 2006
4:26 pm

mseaton

updated UI

Options
    • binary
    ./web/lams_learner.swf
4:26 pm

mseaton

added some js methods called from flash

Options
    • -0
    • +15
    ./web/controlFrame.jsp
3:04 pm

fyang

remove ContextLoaderServlet, it's deprecated for servlet 2.4 container(like tomcat 5 bundled with jboss 4.x) . Use ContextLoadListener instead

Options
    • -6
    • +1
    ./conf/xdoclet/servlets.xml
  2. … 14 more files in changeset.
12:07 pm

Ernie Ghiglione

Update Spanish. Add Greek

Options
    • -0
    • +46
    ./conf/language/ApplicationResources_el.properties
    • -1
    • +1
    ./conf/language/ApplicationResources_es.properties
11:44 am

fmalikoff

Updating export portfolio for the new stylesheets. New sheets applied and some extra data added to the page (such as learner name). Doesn't look right yet as the images aren't available and the css references have had to be hardcoded and this should be done via the css tag.

Options
    • -0
    • +4
    ./conf/language/ApplicationResources.properties
    • -1
    • +32
    ./src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -3
    • +3
    ./web/exportWaitingPage.jsp
    • -15
    • +45
    ./web/exportPortfolio/main.jsp
Thursday 29 Jun 2006
7:10 am

fmalikoff

Converting to the new CSS look

Options
    • -11
    • +4
    ./web/error.jsp
    • -10
    • +3
    ./web/exit.jsp
    • -2
    • +5
    ./web/exportWaitingPage.jsp
    • -4
    • +3
    ./web/lessonComplete.jsp
    • -10
    • +2
    ./web/loadToolActivity.jsp
    • -97
    • +46
    ./web/optionsActivity.jsp
    • -5
    • +2
    ./web/partialCompleted.jsp
    • -15
    • +6
    ./web/previewDefineLater.jsp
    • -10
    • +1
    ./web/welcome.jsp
    • -17
    • +27
    ./web/exportPortfolio/main.jsp
    • -0
    • +6
    ./web/exportPortfolio/notSupported.jsp
    • -17
    • +11
    ./web/gate/gateNext.jsp
    • -6
    • +3
    ./web/gate/permissionGateContent.jsp
    • -9
    • +4
    ./web/gate/scheduleGateContent.jsp
    • -18
    • +7
    ./web/gate/synchGateContent.jsp
  16. … 17 more files in changeset.
Wednesday 28 Jun 2006
3:45 pm

mseaton

updated passon - make sure delete send connection

Options
    • binary
    ./web/lams_learner.swf
    • binary
    ./web/passon.swf
2:33 pm

fmalikoff

Slow down the redirect to the tool, otherwise the passon.swf doesn't get a chance to make the connection to the progress bar.

Options
    • -1
    • +1
    ./web/loadToolActivity.jsp
1:47 pm

mseaton

recompiled for dto changes

Options
    • binary
    ./web/lams_learner.swf
Tuesday 27 Jun 2006
11:15 am

mseaton

passon updates working in both browsers

Options
    • binary
    ./web/lams_learner.swf
    • binary
    ./web/WEB-INF/tags/Passon.tag
    • -0
    • +1
    ./web/layout/layout.jsp
7:32 am

fmalikoff

Added user id as a parameter to the export portfolio url for learner. This allows the teacher to download the portfolio for a particular user.

Options
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
Monday 26 Jun 2006
2:16 pm

fmalikoff

Spanish translation

Options
    • -0
    • +46
    ./conf/language/ApplicationResources_es.properties
  2. … 3 more files in changeset.
1:47 pm

Ernie Ghiglione

Adding Korean translation

Options
    • -0
    • +46
    ./conf/language/ApplicationResources_ko.properties
  2. … 2 more files in changeset.
Friday 23 Jun 2006
4:26 pm

mseaton

using Active Content (js) method for embedding flash.

Options
    • -28
    • +37
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
    • -2
    • +0
    ./web/loadToolActivity.jsp
    • binary
    ./web/passon.swf
    • binary
    ./web/WEB-INF/tags/Passon.tag
    • -1
    • +2
    ./web/layout/activityLayout.jsp
  7. … 4 more files in changeset.
3:58 pm

fmalikoff

Finishing off I18N of learning

Options
    • -0
    • +4
    ./conf/language/ApplicationResources.properties
    • -4
    • +0
    ./conf/xdoclet/error-pages.xml
    • -5
    • +0
    ./test/web/WEB-INF/web.xml
    • -1
    • +0
    ./web/403.html
    • -1
    • +2
    ./web/error.jsp
    • -8
    • +2
    ./web/login.jsp
    • -5
    • +0
    ./web/WEB-INF/web.xml
3:57 pm

fmalikoff

Fixing null ptr exception - previous activity is sometimes null when doing a subactivity within an optional activity.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
3:54 pm

fmalikoff

Optional activity wasn't showing title and description - values were missing from the form.

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
10:01 am

mseaton

need to delete connection after send

Options
    • binary
    ./web/passon.swf
  2. … 2 more files in changeset.
9:40 am

mseaton

generate tag id param not required

Options
    • -7
    • +4
    ./web/WEB-INF/lams.tld
Wednesday 21 Jun 2006
8:02 pm

fmalikoff

Implementing gate and grouping screens for export portfolio.

Options
    • -1
    • +2
    ./conf/language/ApplicationResources.properties
    • -5
    • +1
    ./conf/xdoclet/filter-mappings.xml
    • -1
    • +1
    ./conf/xdoclet/filters.xml
    • -36
    • +38
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -22
    • +51
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -7
    • +51
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -0
    • +74
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingExportPortfolioServlet.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -3
    • +9
    ./web/WEB-INF/lams.tld
    • -6
    • +13
    ./web/WEB-INF/web.xml
    • -5
    • +5
    ./web/WEB-INF/struts/struts-config.xml
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +59
    ./web/WEB-INF/tags/ExportPortOutput.tag
    • -7
    • +8
    ./web/exportPortfolio/main.jsp
    • -0
    • +3
    ./web/grouping/show.jsp
  16. … 28 more files in changeset.
Monday 19 Jun 2006
3:12 pm

fmalikoff

The activityId was changed to activityID in a previous check in, but the change seems to have got lost.

Options
    • -1
    • +1
    ./web/optionsActivity.jsp
11:48 am

mseaton

appended id to unique connection name to avoid conflicts with preview/learner

Options
    • -1
    • +1
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
    • -1
    • +1
    ./web/lessonComplete.jsp
    • -1
    • +1
    ./web/loadToolActivity.jsp
    • -1
    • +1
    ./web/main.jsp
    • -2
    • +2
    ./web/optionsActivity.jsp
    • binary
    ./web/passon.swf
    • -11
    • +20
    ./web/WEB-INF/lams.tld
    • binary
    ./web/WEB-INF/tags/Passon.tag
  10. … 4 more files in changeset.
11:34 am

fmalikoff

Adding lessonID to the activity form, so that the passon.swf can have it separately and make it part of the connection name.

Changed form.activityId to form.activityID for consistency.

Options
    • -7
    • +8
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -6
    • +17
    ./src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
    • -1
    • +1
    ./web/optionsActivity.jsp
2:51 am

fyang

remove userDAO reference , use baseDAO instead

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
2:05 am

fyang

remove userDAO reference , use baseDAO instead

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -14
    • +8
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
2:01 am

fyang

update user related method calls only

Options
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
Sunday 18 Jun 2006
9:06 pm

fmalikoff

Removing learnerProgress from the user's shared session. This should allow preview and learner to run without interfering with each other.

Options
    • -13
    • +27
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -43
    • +56
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -29
    • +10
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -9
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -8
    • +22
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -43
    • +15
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -12
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -9
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -5
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -81
    • +54
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  16. … 11 more files in changeset.
12:55 pm

fmalikoff

Changed export portfolio to

* reduce the number of error messages

* move the html out of the I18N file and into jsps

* use the learning design processor so that the activities are processed (and hence displayed) in the correct order.

Options
    • -0
    • +1
    ./build.xml
    • -17
    • +9
    ./conf/language/ApplicationResources.properties
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +129
    ./src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -13
    • +4
    ./src/java/org/lamsfoundation/lams/learning/export/ExportPortfolioConstants.java
    • -12
    • +38
    ./src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
    • -117
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/ToolPortfolio.java
    • -428
    • +133
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -64
    • +5
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -0
    • +206
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
    • -95
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportNotSupportedServlet.java
    • -162
    • +12
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -195
    • +2
    ./test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
  16. … 3 more files in changeset.