lams-github

lams_tool_assessment

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0

Lines of code count not available

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 15 Nov 2010
7:48 pm

Andrey Balan

LDEV-2569 fixed problem with 2 ordering question on the same page

*merge from lams2_3_release

Options
    • -1
    • +3
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/parts/ordering.jsp
Friday 12 Nov 2010
10:38 pm

erniegx <ernieg@gmail.com>

Adding Maori

Options
    • -0
    • +246
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
Friday 05 Nov 2010
4:24 am

Marcin Cieslak

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

Options
    • -17
    • +27
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 28 more files in changeset.
Sunday 24 Oct 2010
9:39 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.
Friday 22 Oct 2010
2:57 am

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. … 24 more files in changeset.
Monday 18 Oct 2010
11:59 am

erniegx <ernieg@gmail.com>

LDEV-2586 removing HTML tags on export to xls

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Sunday 10 Oct 2010
7:48 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
6:18 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
    • -138
    • +156
    ./test/java/org/lamsfoundation/lams/tool/assessment/selenium/TestAssessment.java
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -129
    • +0
    ./web/WEB-INF/tlds/fckeditor/FCKeditor.tld
    • -2
    • +2
    ./web/WEB-INF/tlds/lams/lams.tld
    • -8
    • +1
    ./web/WEB-INF/web.xml
    • -1
    • +0
    ./web/common/taglibs.jsp
    • -3
    • +3
    ./web/includes/javascript/assessmentoption.js
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
    • -6
    • +6
    ./web/pages/authoring/parts/addessay.jsp
    • -7
    • +7
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -17
    • +17
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -7
    • +7
    ./web/pages/authoring/parts/addnumerical.jsp
    • -14
    • +14
    ./web/pages/authoring/parts/addordering.jsp
    • -7
    • +7
    ./web/pages/authoring/parts/addshortanswer.jsp
  16. … 1082 more files in changeset.
Thursday 18 Mar 2010
8:59 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.
Wednesday 03 Mar 2010
4:15 am

Andrey Balan

LDEV-2504 fixing AssessmentBundler so that now it will properly export auxiliary js and image files

Options
    • -8
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java
Tuesday 02 Mar 2010
9:10 pm

Andrey Balan

LDEV-2516 Show wrong and right answers separately (merge from lams2_3_release branch to HEAD)

Options
    • -1
    • +1
    ./build.properties
    • -4
    • +5
    ./db/sql/create_lams_tool_assessment.sql
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20100225_updateTo234.sql
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.hbm.xml
    • -6
    • +22
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
    • -3
    • +11
    ./web/pages/authoring/advance.jsp
    • -5
    • +7
    ./web/pages/learning/parts/matchingpairs.jsp
    • -13
    • +15
    ./web/pages/learning/parts/multiplechoice.jsp
    • -9
    • +9
    ./web/pages/learning/parts/numerical.jsp
    • -9
    • +9
    ./web/pages/learning/parts/shortanswer.jsp
    • -13
    • +32
    ./web/pages/learning/parts/truefalse.jsp
    • -2
    • +18
    ./web/pages/monitoring/parts/advanceoptions.jsp
4:58 am

Andrey Balan

LDEV-2500 Increased the size of the fckeditor area

Options
    • -2
    • +2
    ./web/pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -6
    • +6
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addnumerical.jsp
    • -5
    • +5
    ./web/pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -4
    • +4
    ./web/pages/authoring/parts/addtruefalse.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/matchingpairoption.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/numericaloption.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/option.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/orderingoption.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/shortansweroption.jsp
4:04 am

Andrey Balan

LDEV-2518 Penalty factor to be 0 by default

rolling back changes in sql script as LDEV-2516 (Show wrong and right answers separately) doesn't affect Lams 2.4 version

Options
    • -5
    • +4
    ./db/sql/create_lams_tool_assessment.sql
Friday 26 Feb 2010
3:04 pm

erniegx <ernieg@gmail.com>

Adding Spanish, updating English

Options
    • -189
    • +191
    ./conf/language/lams/ApplicationResources.properties
    • -189
    • +191
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +246
    ./conf/language/lams/ApplicationResources_es_ES.properties
2:50 pm

erniegx <ernieg@gmail.com>

LDEV-2518: Default penalty factor to 0

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
2:47 pm

erniegx <ernieg@gmail.com>

LDEV-2518: Default penalty factor to 0

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
1:05 pm

erniegx <ernieg@gmail.com>

LDEV-2518: penalty factor to be 0 by default

Options
    • -4
    • +5
    ./db/sql/create_lams_tool_assessment.sql
Thursday 14 Jan 2010
6:16 am

erniegx <ernieg@gmail.com>

LDEV-2491: change color for individual color feedback

Options
    • -1
    • +11
    ./web/pages/learning/parts/multiplechoice.jsp
Friday 18 Dec 2009
11:01 am

erniegx <ernieg@gmail.com>

Adding German, Updating English

Options
    • -3
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +243
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
Tuesday 15 Dec 2009
9:58 pm

Andrey Balan

LDEV-2478 added Option to allow the student to have a rich text editor to answer

Options
    • -1
    • +1
    ./build.properties
    • -0
    • +1
    ./db/sql/create_lams_tool_assessment.sql
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20091215_updateFrom233.sql
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.hbm.xml
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +5
    ./web/pages/authoring/parts/addessay.jsp
    • -1
    • +11
    ./web/pages/learning/parts/essay.jsp
Friday 13 Nov 2009
11:14 am

jliew

LDEV-2459 use double quotes when enclosing i18n text in javascript

Options
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
    • -4
    • +4
    ./web/pages/export/parts/exportlearner.jsp
    • -5
    • +5
    ./web/pages/export/parts/exportteacher.jsp
    • -3
    • +3
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -4
    • +4
    ./web/pages/monitoring/parts/usersummary.jsp
    • -5
    • +5
    ./web/pages/monitoring/summary.jsp
  7. … 42 more files in changeset.
Monday 09 Nov 2009
2:48 pm

jliew

translation update

Options
    • -0
    • +243
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
Tuesday 22 Sep 2009
6:31 pm

jliew

LDEV-2444 check for null

Options
    • -9
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Monday 14 Sep 2009
1:26 pm

erniegx <ernieg@gmail.com>

LDEV-2152: Changes to make it work with IE6

Options
    • -3
    • +3
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/runoffline.jsp
  3. … 13 more files in changeset.
Friday 28 Aug 2009
12:46 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 12 more files in changeset.
Wednesday 05 Aug 2009
3:15 am

Andrey Balan

LDEV-2394 solved the problem with getting flicked back up to the FCK editor for the question text

Options
    • -2
    • +2
    ./web/pages/authoring/parts/addessay.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addordering.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addtruefalse.jsp
1:37 am

Andrey Balan

LDEV-2114 improving learning design (affects only IE)

Options
    • -2
    • +2
    ./web/pages/learning/learning.jsp
12:35 am

Andrey Balan

LDEV-2389 fixed problem with accessing userMasterDetail when user hasn't submitted anything

Options
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Tuesday 04 Aug 2009
8:16 pm

Andrey Balan

LDEV-2372 modifications to selenium tests (according to the last changes in selenium core classes)

Options
    • -6
    • +3
    ./test/java/org/lamsfoundation/lams/tool/assessment/selenium/TestAssessment.java
  2. … 3 more files in changeset.
Friday 31 Jul 2009
2:23 am

Andrey Balan

LDEV-2372 modified ant builds to support Selenium tests also added selenium server port property to common.properties

Options
    • -3
    • +33
    ./build.xml
  2. … 4 more files in changeset.