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
Friday 02 Jun 2006
4:09 pm

fmalikoff

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +4
    /lams_common/conf/language/ApplicationResources.properties
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
    • -0
    • +53
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupComparator.java
    • -8
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -40
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -18
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -1
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +23
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -7
    • +91
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -0
    • +73
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonServiceException.java
    • -2
    • +2
    /lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestChosenGrouper.java
    • -14
    • +14
    /lams_common/test/java/org/lamsfoundation/lams/learningdesign/TestRandomGrouper.java
    • -2
    • +2
    /lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestGroupingDAO.java
3:57 pm

fmalikoff

Fixed more grouping/gate issues in authoring - if the user changed the type of grouping or gate after saving, the gate/grouping type was not updated. Now a new record is created with the new type.

Options
    • -18
    • +36
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
3:56 pm

fmalikoff

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping. I18N the grouping screen and added a wait page for the chosen grouping.

Options
    • -2
    • +7
    /lams_learning/conf/language/ApplicationResources.properties
    • -22
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -46
    • +25
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +25
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceException.java
    • -17
    • +23
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -2
    • +2
    /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
    • -1
    • +1
    /lams_learning/web/controlFrame.jsp
    • -79
    • +0
    /lams_learning/web/grouping/grouping.jsp
    • -0
    • +62
    /lams_learning/web/grouping/show.jsp
    • -0
    • +46
    /lams_learning/web/grouping/wait.jsp
    • -0
    • +46
    /lams_learning/web/layout/groupWaitLayout.jsp
3:55 pm

ozgurd

Jsp formating updates

Export portfolio skeleton implementation

Options
    • -1
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +149
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
    • -66
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McExportServlet.java
    • -2
    • +2
    /lams_tool_lamc/web/authoring/AuthoringMaincontent.jsp
    • -0
    • +35
    /lams_tool_lamc/web/export/ExportContent.jsp
    • -0
    • +65
    /lams_tool_lamc/web/export/exportportfolio.jsp
    • -3
    • +1
    /lams_tool_lamc/web/learning/AnswersContent.jsp
    • -3
    • +1
    /lams_tool_lamc/web/learning/IndividualLearnerResults.jsp
    • -5
    • +2
    /lams_tool_lamc/web/learning/Preview.jsp
    • -4
    • +1
    /lams_tool_lamc/web/learning/RedoQuestions.jsp
    • -4
    • +1
    /lams_tool_lamc/web/learning/ResultsSummary.jsp
    • -4
    • +1
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
    • -0
    • +1
    /lams_tool_lamc/web/learning/learningHeader.jsp
    • -1
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -0
    • +150
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java
  16. … 9 more files in changeset.
3:54 pm

fmalikoff

Clean up grouping code so that the shared code is in lams.jar, and making it so that learner can't trigger the chosen grouping.

Options
    • -0
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -2
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -9
    • +19
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
3:29 pm

steven

Import tool content works!!! in rsrc and submit tool with sigle file and pacakge testing!!!

Options
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
3:20 pm

steven

Update all ResourceUser relation to "save-update".

Options
    • -1
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.hbm.xml
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/Resource.java
    • -1
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
    • -1
    • +1
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.hbm.xml
    • -2
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItemVisitLog.java
2:57 pm

fyang

extends BaseDAO and implements IBaseDAO to simplify the DAOs

Options
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodDAO.java
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IAuthenticationMethodTypeDAO.java
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
    • -28
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationTypeDAO.java
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IRoleDAO.java
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserDAO.java
    • -29
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationDAO.java
    • -29
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IUserOrganisationRoleDAO.java
    • -33
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodDAO.java
    • -32
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/AuthenticationMethodTypeDAO.java
    • -26
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
    • -34
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java
    • -31
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationTypeDAO.java
    • -33
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/RoleDAO.java
  16. … 4 more files in changeset.
2:37 pm

mseaton

updated FLA with time selector changes

Options
    • binary
    /lams_central/src/flash/lam_addseq_wiz.fla
2:35 pm

mseaton

updated wizard with meaningful system error dialog

Options
    • binary
    /lams_monitoring/web/lams_wizard.swf
2:34 pm

mseaton

made Debugger work across all applications and use correct model data to dump

Options
    • binary
    /lams_common/src/flash/org/lamsfoundation/lams/common/util/Debugger.as
2:33 pm

mseaton

dictionary label change on Ok alert button

Options
    • binary
    /lams_common/src/flash/org/lamsfoundation/lams/common/util/LFError.as
2:33 pm

mseaton

updated onServerResponse to not show actual error message in system error dialog

Options
    • binary
    /lams_common/src/flash/org/lamsfoundation/lams/common/comms/Communication.as
2:29 pm

mseaton

update dict - added Alert button label, updated system messages

Options
    • -1
    • +1
    /lams_central/web/flashxml/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/web/flashxml/authoring/en_dictionary.xml
    • -1
    • +1
    /lams_central/web/flashxml/wizard/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/web/flashxml/wizard/en_dictionary.xml
2:28 pm

mseaton

fixed date output

Options
    • binary
    /lams_central/src/flash/org/lamsfoundation/lams/wizard/WizardView.as
2:19 pm

steven

Update exception handle method.

Options
    • -2
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/ImportToolContentServlet.java
2:04 pm

steven

Update import tool content interface.

Options
    • -3
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
    • -2
    • +2
    /lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardServicePOJO.java
    • -2
    • +9
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -1
    • +1
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
2:03 pm

fyang

added OrganisationStateId constants

Options
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationState.java
2:03 pm

fyang

added getOrganisationTypeById method

Options
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
1:51 pm

steven

Update import tool content interface.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -129
    • +132
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -2
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
    • -2
    • +9
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
12:09 pm

fyang

Added code field and its getter and setter which was missing

Options
    • -1
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/Organisation.java
12:09 pm

fyang

Added organisationState related methods

Options
    • -1
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
12:08 pm

fyang

OrganisationState DAO hibernate implementation

Options
    • -0
    • +117
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationStateDAO.java
12:08 pm

fyang

OrganisationState DAO Interface

Options
    • -0
    • +102
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationStateDAO.java
12:07 pm

fyang

added organisationStateDAO to userManagementService

Options
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
7:01 am

fmalikoff

Random grouping now working. Fixed issues in authoring - was trying to look up grouping by UUID and that won't work for more than one design with grouping (as the UUIDs may be duplicated). Modified authoring to get all the existing groupings via the grouping activities.

Options
    • -76
    • +92
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
7:00 am

fmalikoff

Random grouping now working.

Fixed issues in authoring - was trying to look up grouping by UUID and that won't work for more than one design with grouping (as the UUIDs may be duplicated). Modified authoring to get all the existing groupings via the grouping activities.

Changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run. Also reduced the amount of data needed to be cached in the session - only the lesson id is needed not the complete lesson.

Options
    • binary
    /lams_build/lib/lams/lams-learning.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -8
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java
    • -15
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -6
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -7
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -7
    • +7
    /lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLearnerProgressDAO.java
6:58 am

fmalikoff

Random grouping now working. Changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run. Also reduced the amount of data needed to be cached in the session - only the lesson id is needed not the complete lesson.

Options
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -7
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -9
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -24
    • +17
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DummyLearnerAction.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -23
    • +18
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -2
    • +2
    /lams_learning/test/java/org/lamsfoundation/lams/learning/export/service/TestExportPortfolioService.java
    • -16
    • +16
    /lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
6:57 am

fmalikoff

Random grouping now working - changed to make learner service changes to stop a hibernate lazy initialisation exception when grouping has just been run.

Options
    • -4
    • +4
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Thursday 01 Jun 2006
5:26 pm

ozgurd

made css to refer to local link

Options
    • -1
    • +1
    /lams_tool_vote/web/export/exportportfolio.jsp