lams

lams_tool_laqa

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): 47,336
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 01 Nov 2010
11:43 am

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
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
11:39 am

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
    ./src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
    • -4
    • +10
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
11:33 am

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
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -17
    • +11
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringForm.java
    • -33
    • +22
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
    • -42
    • +13
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
11:30 am

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
    ./src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
11:28 am

fmalikoff

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

Options
    • -12
    • +1
    ./src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
11:27 am

fmalikoff

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

Options
    • -1
    • +1
    ./build.properties
11:26 am

fmalikoff

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

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

fmalikoff

LDEV-2524 Implementing the compulsory question option.

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

fmalikoff

file updateTo20101022.sql was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./db/sql/updatescripts/updateTo20101022.sql
11:24 am

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
    ./src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
    • -2
    • +6
    ./web/learning/CombinedAnswersContent.jsp
    • -15
    • +6
    ./web/learning/IndividualLearnerResults.jsp
    • -2
    • +5
    ./web/learning/SequentialAnswersContent.jsp
11:22 am

fmalikoff

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

Options
    • -2
    • +7
    ./web/learning/AnswersContent.jsp
11:07 am

fmalikoff

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

Options
    • -0
    • +9
    ./web/authoring/editQuestionBox.jsp
    • -0
    • +9
    ./web/authoring/newQuestionBox.jsp
    • -0
    • +12
    ./web/monitoring/editQuestionBox.jsp
    • -0
    • +12
    ./web/monitoring/newQuestionBox.jsp
11:06 am

fmalikoff

LDEV-2524 Implementing the compulsory question option.

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
Friday 29 Oct 2010
5:05 pm

Andrey Balan

LDEV-2568 Q&A export portfolio to include teacher's comments

*merge from lams2_3_release

Options
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
    • -12
    • +15
    ./web/export/exportportfolio.jsp
1:43 am

Andrey Balan

LDEV-2568 Q&A export portfolio to include teacher's comments

Options
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredAnswersDTO.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java
    • -12
    • +15
    ./web/export/exportportfolio.jsp
Sunday 24 Oct 2010
3:36 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
Thursday 21 Oct 2010
8:50 pm

Marcin Cieslak

LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 25 more files in changeset.
Sunday 10 Oct 2010
1:46 pm

Marcin Cieslak

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
12:09 pm

Marcin Cieslak

LDEV-2577

The new CKEditor does not have Java Integration library (yet). We have been

using it to:

a) get the tag library to create our own tag <lams:FCKeditor>

But the new CKEditor uses AJAX to get the contents, so the library is

not needed anymore.

The references to it has been deleted from every tool.

FCKEditor.tag has been rewritten to use the new syntax.

b) get a FCKEditor internal file manager by a Connector from the jar

The new CKEditor does not provide a file manager - the license became

commercial and the whole thing became a separate project, CKFinder.

There were alternatives suggested on the web:

jasfinder - http://sourceforge.net/projects/jasfinder/support

kcfinder - http://kcfinder.sunhater.com/

some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/

but we have already nicely integrated with the old file manager. This page:

http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/

in polish says how to use the file manager from the old FCKEditor.

The steps that have to be done:

- download the new CKEditor

- download the old FCKEditor

- copy the filemanager to ckeditor directory

- in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to:

window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' );

- in the file browser/default/browser.html add in line 80:

document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

Options
    • -5
    • +1
    ./test/web/WEB-INF/web.xml
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -5
    • +1
    ./web/WEB-INF/web.xml
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • binary
    ./web/WEB-INF/tags/FCKEditor.tag
    • -2
    • +2
    ./web/authoring/BasicContent.jsp
    • -2
    • +2
    ./web/authoring/editQuestionBox.jsp
    • -3
    • +3
    ./web/authoring/newQuestionBox.jsp
    • -6
    • +6
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/includes/taglibs.jsp
    • -4
    • +3
    ./web/learning/CombinedAnswersContent.jsp
    • -4
    • +3
    ./web/learning/SequentialAnswersContent.jsp
    • -2
    • +2
    ./web/monitoring/editQuestionBox.jsp
  16. … 1082 more files in changeset.
Thursday 10 Jun 2010
2:44 am

lfoxton

LDEV-2552 MErging changes with head

Options
    • -2
    • +1
    ./web/authoring/BasicContent.jsp
    • -1
    • +1
    ./web/authoring/newQuestionBox.jsp
2:42 am

lfoxton

LDEV-2552 Fixing a cognitive skills wizard bug that resizes the new question iframe when it shouldnt be resized

Options
    • -2
    • +1
    ./web/authoring/BasicContent.jsp
    • -1
    • +1
    ./web/authoring/newQuestionBox.jsp
Friday 16 Apr 2010
8:48 am

Ernie Ghiglione

Adding Spanish (Mexico), Updating German, Greek, English, Spanish (Spain), French, Japanese, Korean, Maori, Norwegian, Polish, Turkish

Options
    • -192
    • +192
    ./conf/language/lams/ApplicationResources.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +244
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -137
    • +138
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  14. … 7 more files in changeset.
8:41 am

Ernie Ghiglione

file ApplicationResources_es_MX.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
  2. … 6 more files in changeset.
Thursday 18 Mar 2010
1:58 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
1:13 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Friday 05 Mar 2010
4:16 am

jliew

LDEV-2526 merged from branch

Options
    • -18
    • +37
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
1:11 am

jliew

LDEV-2526 sessionMap not properly updated

Options
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
Thursday 04 Mar 2010
8:50 am

jliew

LDEV-2526 persisting to db based on displayOrder and question text isn't a good idea, hopefully this fix is robust enough

Options
    • -16
    • +34
    ./src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
Wednesday 03 Mar 2010
7:43 am

Ernie Ghiglione

Updating translations for LAMS 2.3.4

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  12. … 126 more files in changeset.
Friday 19 Feb 2010
5:25 am

Ernie Ghiglione

LDEV-2514: updating all labels for 2.3.4 release

Options
    • -192
    • +192
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -203
    • +203
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -192
    • +192
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -197
    • +197
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -210
    • +210
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -206
    • +206
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -200
    • +200
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -196
    • +196
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -139
    • +210
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -206
    • +207
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  12. … 63 more files in changeset.