Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

  1. … 14 more files in changeset.
LDEV-4838 Move collection processing to common utils method

    • -0
    • +54
    ./lamsfoundation/lams/qb/QbUtils.java
    • -26
    • +48
    ./lamsfoundation/lams/qb/form/QbQuestionForm.java
  1. … 11 more files in changeset.
LDEV-4745 Add uuid to QbQuestion

* reintroduce fill content_folder_id command

LDEV-4782 Fix question stats calculation

    • -13
    • +14
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
LDEV-4746 Fix migration script for Talca issues

    • -433
    • +444
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
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.

  1. … 1 more file in changeset.
Bump patches version so they come on top of changes coming from develop

    • -0
    • +11
    ./lamsfoundation/lams/dbupdates/patch20190721.sql
    • -0
    • +677
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +20
    ./lamsfoundation/lams/dbupdates/patch20190723.sql
    • -0
    • +46
    ./lamsfoundation/lams/dbupdates/patch20190724.sql
    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20190725.sql
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.

    • -172
    • +169
    ./lamsfoundation/lams/qb/model/QbOption.java
  1. … 1 more file in changeset.
LDEV-4746 Delete corrupted Scratchie data. Remove an index.

The index actually broke matching of question content.

LDEV-4746 Make description field longer

Merge branch 'LDEV-4836' into LDEV-4745

    • -2
    • +5
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -20
    • +58
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 1 more file in changeset.
LDEV-4836 Advanced search on authoring basic tab

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

button + collections dropdown

    • -2
    • +5
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -20
    • +58
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 11 more files in changeset.
LDEV-4746 Extra question name clean up

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

  1. … 8 more files in changeset.
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.

    • -1
    • +1
    ./lamsfoundation/lams/qb/dao/IQbDAO.java
    • -5
    • +8
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 13 more files in changeset.
LDEV-4746 Trim questions' names and descriptions

LDEV-4746 Add improved migration script

It runs faster and makes matching more efficient.

    • -0
    • +11
    ./lamsfoundation/lams/dbupdates/patch20190109.sql
    • -624
    • +676
    ./lamsfoundation/lams/dbupdates/patch20190110.sql
LDEV-4834 Add Learning Outcomes widget to edit QB question screen

    • -6
    • +16
    ./lamsfoundation/lams/qb/form/QbQuestionForm.java
  1. … 10 more files in changeset.
LDEV-4745 Make service methods do what they claim to do

Getting max question ID and version returned already incremented version

instead of actual max. Now they return real max value and need to be

manually incremented afterwards.

    • -2
    • +2
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 3 more files in changeset.
LDEV-4745 Make Assessment questions comparable by order ID

    • -71
    • +88
    ./lamsfoundation/lams/qb/model/QbToolQuestion.java
  1. … 3 more files in changeset.
LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

    • -1
    • +1
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 12 more files in changeset.
LDEV-4828 Allow question sorting by usage in lessons on collection page

    • -6
    • +17
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 1 more file in changeset.
LDEV-4782 Sort lessons by organisation. Include only active lessons.

    • -2
    • +3
    ./lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
  1. … 1 more file in changeset.
LDEV-4782 Discar grades with NULL mark before calculating indexes

LDEV-4834 Fetch outcomes using DAO instead of entity relationship

Various question versions share same outcomes. Hibernate does not like

having same collection bound to two entity instances, though, even if

the collection is read-only. In this case we get rid of the collection

and just fetch it using DAO. It probably is a better solution anyway.

  1. … 1 more file in changeset.
Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

    • -471
    • +488
    ./lamsfoundation/lams/qb/model/QbQuestion.java
    • -131
    • +133
    ./lamsfoundation/lams/qb/service/IQbService.java
    • -567
    • +572
    ./lamsfoundation/lams/qb/service/QbService.java
  1. … 8 more files in changeset.
LDEV-4836 Fix autopatch script

  1. … 1 more file in changeset.
LDEV-4836 Properly assign collections

    • -5
    • +13
    ./lamsfoundation/lams/qb/form/QbQuestionForm.java
  1. … 12 more files in changeset.
Merge branch 'LDEV-4745' into LDEV-4836

  1. … 7 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

    • -17
    • +28
    ./lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -352
    • +0
    ./lamsfoundation/lams/qb/service/QbUtils.java
  1. … 73 more files in changeset.