fmalikoff in lams

About

1,899 commits
  • Committer is not mapped to a user
  • First commit: 21 December 2004
  • Last commit: 24 November 2010
Last Week All Time
Commits: 0 1,899
Files changed: 0 30,118
Change in LOC: 0 136,233

Line History

Line Count Graph
Line Count Graph

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
 
Wednesday 24 Nov 2010
10:11 pm

fmalikoff

LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

Options
    • -0
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
10:05 pm

fmalikoff

LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

Options
    • -0
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java
Monday 01 Nov 2010
8:20 pm

fmalikoff

Merging changes from 2.3 release branch for LDEV-2524.

Options
    • -1
    • +1
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
    • -0
    • +10
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
    • -0
    • +1
    /lams_tool_laqa/db/sql/create_lams_tool_qa.sql
    • -0
    • +9
    /lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
    • -22
    • +5
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
    • -16
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
    • -18
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
    • -27
    • +23
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
    • -2
    • +33
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
    • -12
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
    • -103
    • +44
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -12
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
  16. … 15 more files in changeset.
8:18 pm

fmalikoff

Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

Options
    • -1
    • +1
    /lams_tool_laqa/build.properties
    • -33
    • +97
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
7:01 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option.

Options
    • -3
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
6:44 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

Options
    • -73
    • +28
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
6:43 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option. Make the question object more complex so we don't have a new map for every field added, and ensure all the necessary data is set up when we redisplay a screen with the error message.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

LDEV-2581 Make sure the rich text field setting is honoured for more than just the first screen!

Options
    • -33
    • +97
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
6:39 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

Options
    • -12
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
    • -4
    • +10
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
6:33 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option.

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

Options
    • -103
    • +44
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -17
    • +11
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
    • -33
    • +22
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
    • -6
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
    • -42
    • +13
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
6:30 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option. Add a new required field, and removed the optional field that had never been implemented properly.

Options
    • -41
    • +23
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
6:28 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option. Removed excess debugging to make debug level run faster.

Options
    • -12
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
6:27 pm

fmalikoff

LDEV-2524, LDEV-2578 and LDEV-2581. Needed new database field for LDEV-2524

Options
    • -1
    • +1
    /lams_tool_laqa/build.properties
6:26 pm

fmalikoff

LDEV-2578 Make questions appear in their display order, not in the database order, in authoring and monitoring.

Options
    • -1
    • +1
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
6:24 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option.

Options
    • -0
    • +10
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
    • -0
    • +1
    /lams_tool_laqa/db/sql/create_lams_tool_qa.sql
    • -0
    • +9
    /lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
    • -16
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
    • -2
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
    • -18
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
    • -2
    • +33
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaPedagogicalPlannerAction.java
6:24 pm

fmalikoff

file updateTo20101022.sql was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    /lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
6:24 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option. Made the question map contain a complex object rather than a single string so that we didn't have to keep adding maps every time we added more data for each question.

Options
    • -22
    • +5
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
    • -2
    • +6
    /lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
    • -15
    • +6
    /lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
    • -2
    • +5
    /lams_tool_laqa/web/learning/SequentialAnswersContent.jsp
6:22 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option - adding error message on screen if question not answered.

Options
    • -2
    • +7
    /lams_tool_laqa/web/learning/AnswersContent.jsp
6:07 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option - adding the checkbox.

Options
    • -0
    • +9
    /lams_tool_laqa/web/authoring/editQuestionBox.jsp
    • -0
    • +9
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp
    • -0
    • +12
    /lams_tool_laqa/web/monitoring/editQuestionBox.jsp
    • -0
    • +12
    /lams_tool_laqa/web/monitoring/newQuestionBox.jsp
6:06 pm

fmalikoff

LDEV-2524 Implementing the compulsory question option.

Options
    • -3
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
Monday 14 Jul 2008
11:58 am

fmalikoff

LDEV-1662: Fixing up the advanced options in monitoring so that they look correct in RTL locales.

Options
    • -7
    • +7
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -7
    • +7
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +14
    /lams_tool_task/web/pages/monitoring/summary.jsp
11:33 am

fmalikoff

LDEV-1662: Adding new style to support the advanced options

Options
    • -12
    • +14
    /lams_tool_task/web/pages/monitoring/summary.jsp
11:32 am

fmalikoff

LDEV-1662: Entries for On and Off were not internationalised.

Options
    • -2
    • +3
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
11:30 am

fmalikoff

LDEV-1662: Adding a new section to each monitoring summary screen, to show the advanced options.

Options
    • -0
    • +12
    /lams_central/web/css/defaultHTML.css
Wednesday 25 Jun 2008
2:40 pm

fmalikoff

LDEV-1208: Preview's special define later screen to update the Flash progress bar.

Options
    • -3
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
    • -0
    • +6
    /lams_learning/web/previewDefineLater.jsp
12:33 pm

fmalikoff

LDEV-1217: Check the length of the description so that it doesn't trigger a database error.

Options
    • -1
    • +2
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java
    • -1
    • +3
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
Tuesday 24 Jun 2008
12:12 pm

fmalikoff

Updating project property for the correct version

Options
    • -1
    • +1
    /lams_build/common.properties
Wednesday 18 Jun 2008
10:01 am

fmalikoff

LDEV-1833: Was throwing exception if asked for the tool output for a user that has not answered the questions. Now returns null.

Options
    • -14
    • +25
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
Tuesday 17 Jun 2008
6:59 pm

fmalikoff

Updating scripts to call deploy.xml, rather than deploy.properties

Options
    • -1
    • +2
    /lams_build/deploy-tool/deploy.bat
    • -3
    • +2
    /lams_build/deploy-tool/deploy.sh
3:52 pm

fmalikoff

Version updated for 2.1 release

Options
    • -1
    • +1
    /lams_tool_nb/build.properties
Monday 16 Jun 2008
10:49 am

fmalikoff

LDEV-1825: When we copy a learning design, make sure any grouping details and associated mappings attached to a teacher chosen branching or a define later grouped branching are not copied. If we don't do this, we encounter problems when run a design that has been attached to a lesson. Otherwise we either throw an exception (as the grouping doesn't exist) or we use the groupings that were used in the previous lesson and they may not be wanted.

Options
    • -14
    • +28
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java