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
Thursday 23 Dec 2010
8:45 pm

Andrey Balan

LDEV-2624 fixing "method does not override a method from its superclass" error

*merge to HEAD

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentAttachment.java
Wednesday 15 Dec 2010
7:17 am

Andrey Balan

LDEV-2105 changing location of class files

Options
    • -1
    • +1
    ./.classpath
    • -6
    • +0
    ./build.xml
7:14 am

Andrey Balan

LDEV-2624 it is possible now to upload several instruction files

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentAttachment.java
    • -6
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
7:13 am

Andrey Balan

LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

Options
    • -0
    • +1
    ./web/pages/authoring/parts/overallfeedbacklist.jsp
5:21 am

Andrey Balan

LDEV-2623 fixing Poor work of assessment tool with new CKEditor

fixing 1-3 errors

Options
    • -3
    • +1
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -3
    • +1
    ./web/pages/authoring/parts/addnumerical.jsp
    • -6
    • +2
    ./web/pages/authoring/parts/addordering.jsp
    • -3
    • +1
    ./web/pages/authoring/parts/addshortanswer.jsp
4:57 am

Andrey Balan

LDEV-2622 reinitializes thickbox after moving the questions

Options
    • -0
    • +9
    ./web/pages/authoring/basic.jsp
Tuesday 14 Dec 2010
8:22 am

Andrey Balan

LDEV-2623 fixing Poor work of assessment tool with new CKEditor

fixing 1-3 errors

Options
    • -2
    • +2
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -9
    • +9
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +5
    ./web/pages/authoring/parts/addnumerical.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/addordering.jsp
    • -1
    • +5
    ./web/pages/authoring/parts/addshortanswer.jsp
7:53 am

Andrey Balan

LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

Options
    • -1
    • +1
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addnumerical.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addordering.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addshortanswer.jsp
7:47 am

Andrey Balan

LDEV-2504 upgrading jqGrid, jQuery and jQuery-UI to the latest versions

Options
    • -30
    • +26
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentBundler.java
    • -1
    • +0
    ./web/common/header.jsp
    • -1
    • +0
    ./web/common/tabbedheader.jsp
    • -449
    • +0
    ./web/includes/css/jqGrid.grid.css
    • -0
    • +295
    ./web/includes/css/jquery-ui-1.8.6.custom.css
    • -0
    • +138
    ./web/includes/css/ui.jqgrid.css
    • binary
    ./web/includes/images/jqGrid.basic.theme/cd_run.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/dirty.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/down.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/find.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/first.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/folder.png
    • binary
    ./web/includes/images/jqGrid.basic.theme/grid-blue-ft.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/grid-blue-hd.gif
    • binary
    ./web/includes/images/jqGrid.basic.theme/headerbg.gif
  16. … 132 more files in changeset.
Sunday 12 Dec 2010
10:35 pm

Marcin Cieslak

LDEV-2577: Upgraded jQuery Form plugin to the latest version which fixed a bug in file uploading - previously impacting Shared Resources in Planner. The new version is compatible with jQuery 1.3.2 which LAMS currently is using and should be backwards compatible, but it has not been tested in other projects than lams_central - sorry!

Options
    • -486
    • +645
    ./web/includes/javascript/jquery.form.js
  2. … 2 more files in changeset.
10:31 pm

Marcin Cieslak

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

Options
    • -7
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Friday 10 Dec 2010
2:33 am

Andrey Balan

LDEV-2621 fixed "Error on export summary for essay type of questions"

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Monday 06 Dec 2010
4:52 am

Marcin Cieslak

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 24 Nov 2010
2:36 am

Marcin Cieslak

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 26 more files in changeset.
Tuesday 23 Nov 2010
12:03 am

Andrey Balan

LDEV-2504 Answers in HTML format get displayed in export portfolio now

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
Monday 22 Nov 2010
11:49 pm

Andrey Balan

LDEV-2390 fixing "Empty individual report in Assessment tool monitor"

*merge from lams2_3_release

Options
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
3:13 pm

Marcin Cieslak

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

Options
    • -0
    • +4
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Thursday 18 Nov 2010
6:28 am

Marcin Cieslak

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
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