lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 05 Aug 2019
1:43 pm

Marcin Cieslak

LDEV-4746, LDEV-4841 Move answer field to QbToolAnswer for inheritance

Fix several issues Q&A migration

Options
    • -6
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -4
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -35
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -26
    • +27
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -22
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -20
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/essay.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/numerical.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/results/historyresponses.jsp
  16. … 9 more files in changeset.
Sunday 04 Aug 2019
9:48 pm

Marcin Cieslak

LDEV-4841 Initial Q&A tool back end migration to Question Bank

Options
    • -5
    • +104
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -55
    • +76
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolQuestion.java
    • -18
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -31
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
    • -3
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQuestionDAO.java
    • -8
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQuestionDAO.java
    • -4
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaConditionDTO.java
    • -11
    • +9
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dto/QaQuestionDTO.java
    • -12
    • +9
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaCondition.java
    • -169
    • +16
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaQueContent.java
    • -133
    • +15
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java
    • -0
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
    • -7
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
  16. … 6 more files in changeset.
5:10 am

Andrey Balan

LDEV-4838 Scratchie authoring to work similarly to Assessment (instantaneous changes to QbQuestions)

* Also changed addItem.jsp to look similarly to Assessment add question

pages

* Proper handling of collections in Scratchie

Options
    • -4
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -3
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -2
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieItemDAO.java
    • -5
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
    • -14
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -4
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -34
    • +10
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -173
    • +125
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -97
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieItemForm.java
    • -0
    • +2
    /lams_tool_scratchie/web/pages/authoring/authoring.jsp
    • -25
    • +28
    /lams_tool_scratchie/web/pages/authoring/basic.jsp
    • -41
    • +58
    /lams_tool_scratchie/web/pages/authoring/parts/additem.jsp
    • -14
    • +21
    /lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp
    • -14
    • +19
    /lams_tool_scratchie/web/pages/authoring/parts/optionlist.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/authoring/start.jsp
5:07 am

Andrey Balan

LDEV-4838 Move collection processing to common utils method

Options
    • -55
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addessay.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addordering.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -2
    • +2
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -2
    • +2
    /lams_central/web/qb/collection.jsp
    • -0
    • +54
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -26
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
5:02 am

Andrey Balan

LDEV-4836 Fix restricted authoring page

Options
    • -6
    • +4
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
Wednesday 31 Jul 2019
8:49 pm

Andrey Balan

LDEV-4745 Fix exception on importing QTI questions and XML ones

Options
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -6
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
4:31 am

Andrey Balan

LDEV-4836 Add questions drag and drop feature

Options
    • -3
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -3
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -123
    • +69
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -64
    • +41
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -18
    • +50
    /lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp
Tuesday 30 Jul 2019
3:35 am

Andrey Balan

LDEV-4745 Add uuid to QbQuestion

* reintroduce fill content_folder_id command

Options
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
1:07 am

Marcin Cieslak

LDEV-4782 Fix question stats calculation

Options
    • -13
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -4
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
Saturday 27 Jul 2019
5:47 am

Andrey Balan

LDEV-4836 Update edit in monitor feature after migration to QB

Options
    • -23
    • +50
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -17
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -13
    • +2
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
4:40 am

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -13
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
4:14 am

Marcin Cieslak

LDEV-4746 Fix migration script for Talca issues

Options
    • -433
    • +444
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
Friday 26 Jul 2019
6:26 pm

Marcin Cieslak

LDEV-4746 Detect if a foreign key was already created

We may migrate DBs which already have a foreign key in one of Assessment

tables and ones which do not. Instead of manual shuffling of scripts, we

prepare scripts to never fail.

Options
    • -1
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -2
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
Thursday 25 Jul 2019
7:21 pm

Marcin Cieslak

Bump patches version so they come on top of changes coming from develop

Options
    • -11
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190109.sql
    • -677
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -20
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190530.sql
    • -46
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190531.sql
    • -14
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190721.sql
    • -0
    • +677
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql
    • -0
    • +46
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190725.sql
7:10 pm

Marcin Cieslak

LDEV-4746 Removed "correct" field from QbOption

It can be inferred from maxMark.

Also fix incorrect overwriting of QB question names with Assessment

question descriptions.

Options
    • -3
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -7
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -172
    • +169
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbOption.java
6:26 am

Andrey Balan

LDEV-4745 Cache references max marks before importing QB question

Options
    • -6
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -0
    • +12
    /lams_tool_assessment/web/pages/authoring/basic.jsp
5:47 am

Andrey Balan

Merge branch 'LDEV-4840' into LDEV-4745

Options
5:46 am

Andrey Balan

LDEV-4840 Refine import QB questions feature

Options
    • -0
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -11
    • +55
    /lams_tool_laqa/web/authoring/BasicContent.jsp
    • -15
    • +2
    /lams_tool_laqa/web/authoring/itemlist.jsp
    • -2
    • +5
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp
Wednesday 24 Jul 2019
9:09 pm

Marcin Cieslak

LDEV-4746 Delete corrupted Scratchie data. Remove an index.

The index actually broke matching of question content.

Options
    • -9
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
5:10 pm

Andrey Balan

LDEV-4836 Hide ${questionDto.version} from jsp processing

As questionDto doesn't have version property yet

Options
    • -2
    • +2
    /lams_tool_lamc/web/authoring/itemlist.jsp
5:04 pm

Andrey Balan

LDEV-4836 Display limited set of question types for MCQ and Scratchie

Options
    • -8
    • +14
    /lams_central/web/qb/search.jsp
11:04 am

Marcin Cieslak

LDEV-4746 Make description field longer

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
4:51 am

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -20
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -5
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
4:45 am

Andrey Balan

LDEV-4836 No need for removeNewLineCharacters() method anymore

Options
    • -23
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
4:44 am

Andrey Balan

LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -6
    • +29
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -0
    • +6
    /lams_central/web/css/bootstrap-select.css
    • -0
    • +9
    /lams_central/web/includes/javascript/bootstrap-select.js
    • -14
    • +19
    /lams_central/web/includes/javascript/qb-search.js
    • -1
    • +1
    /lams_central/web/qb/authoring/addQuestionFooter.jsp
    • -16
    • +74
    /lams_central/web/qb/search.jsp
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -20
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -5
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -100
    • +99
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -4
    • +4
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -3
    • +3
    /lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp
    • -52
    • +94
    /lams_tool_assessment/web/pages/authoring/randomQuestion.jsp
Tuesday 23 Jul 2019
9:19 pm

Marcin Cieslak

LDEV-4746 Skip validation CKEditor for question description

jQuery validation plugin does not seem to work well with CKEditor.

Options
    • -1
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
9:08 pm

Marcin Cieslak

LDEV-4746 Extra question name clean up

Options
    • -5
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
8:48 pm

Marcin Cieslak

LDEV-4834 Allow LO widget on add new QB question screen

Options
    • -3
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -3
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -3
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190703.sql
8:31 pm

Marcin Cieslak

LDEV-4746 Use table as question ID generator for QbQuestion

In the future we can add new columns to lams_sequence_generator, so we

have a single table for generating new IDs instead table-per-ID.

Options
    • -1
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -0
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -0
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
  16. … 3 more files in changeset.
7:13 pm

Marcin Cieslak

LDEV-4834 Revert to panel LO widget in QB question authoring

Options
    • -1
    • +1
    /lams_central/web/qb/authoring/addessay.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addordering.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    /lams_central/web/qb/authoring/addtruefalse.jsp