lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Wednesday 24 Jul 2019
4:51 am

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 4 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -6
    • +29
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -0
    • +6
    ./web/css/bootstrap-select.css
    • -0
    • +9
    ./web/includes/javascript/bootstrap-select.js
    • -14
    • +19
    ./web/includes/javascript/qb-search.js
    • -1
    • +1
    ./web/qb/authoring/addQuestionFooter.jsp
    • -16
    • +74
    ./web/qb/search.jsp
  8. … 8 more files in changeset.
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
    ./web/qb/authoring/addessay.jsp
    • -1
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    ./web/qb/authoring/addordering.jsp
    • -1
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    ./web/qb/authoring/addtruefalse.jsp
8:48 pm

Marcin Cieslak

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

Options
    • -3
    • +1
    ./web/qb/authoring/addessay.jsp
    • -3
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -3
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -3
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -3
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -3
    • +1
    ./web/qb/authoring/addordering.jsp
    • -3
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -3
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  9. … 1 more file in changeset.
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
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -0
    • +1
    ./web/qb/authoring/addessay.jsp
    • -0
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -0
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -0
    • +1
    ./web/qb/authoring/addordering.jsp
    • -0
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -0
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  12. … 7 more files in changeset.
7:13 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/qb/authoring/addessay.jsp
    • -1
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    ./web/qb/authoring/addordering.jsp
    • -1
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    ./web/qb/authoring/addtruefalse.jsp
Monday 22 Jul 2019
11:19 pm

Marcin Cieslak

LDEV-4836 Set an option as correct if it has 100% mark

Options
    • -56
    • +51
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    ./web/qb/authoring/addessay.jsp
    • -1
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    ./web/qb/authoring/addordering.jsp
    • -1
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  10. … 62 more files in changeset.
10:44 pm

Marcin Cieslak

LDEV-4834 Move Learning Outcomes widget to Settings tab

Options
    • -4
    • +4
    ./web/qb/authoring/addessay.jsp
    • -4
    • +4
    ./web/qb/authoring/addmarkhedging.jsp
    • -4
    • +4
    ./web/qb/authoring/addmatchingpairs.jsp
    • -4
    • +4
    ./web/qb/authoring/addmultiplechoice.jsp
    • -5
    • +5
    ./web/qb/authoring/addnumerical.jsp
    • -4
    • +4
    ./web/qb/authoring/addordering.jsp
    • -4
    • +4
    ./web/qb/authoring/addshortanswer.jsp
    • -4
    • +4
    ./web/qb/authoring/addtruefalse.jsp
6:37 pm

Marcin Cieslak

LDEV-4745 Ignore CSS files generated from SCSS

Options
    • -0
    • +2
    ./.gitignore
6:36 pm

Marcin Cieslak

LDEV-4745 Remove CSS files generated from SCSS

Options
    • -7
    • +0
    ./web/css/bootstrap-toggle.css
    • -1
    • +0
    ./web/css/qb-question.css
6:33 pm

Marcin Cieslak

LDEV-4834 Add Learning Outcomes widget to edit QB question screen

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -0
    • +2
    ./web/qb/authoring/addQuestionHeader.jsp
    • -1
    • +5
    ./web/qb/authoring/addessay.jsp
    • -1
    • +5
    ./web/qb/authoring/addmarkhedging.jsp
    • -0
    • +4
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +4
    ./web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +4
    ./web/qb/authoring/addnumerical.jsp
    • -0
    • +4
    ./web/qb/authoring/addordering.jsp
    • -0
    • +4
    ./web/qb/authoring/addshortanswer.jsp
    • -0
    • +4
    ./web/qb/authoring/addtruefalse.jsp
  11. … 1 more file in changeset.
6:04 pm

Marcin Cieslak

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.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 4 more files in changeset.
Friday 19 Jul 2019
4:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 3 more files in changeset.
Thursday 18 Jul 2019
10:17 pm

Andrey Balan

LDEV-4745 Add Stats button to QB search

Options
    • -0
    • +5
    ./web/qb/qbQuestionDetails.jsp
10:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -6
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -57
    • +241
    ./web/qb/search.jsp
    • -259
    • +0
    ./web/qb/searchWidget.jsp
  4. … 7 more files in changeset.
6:51 pm

Andrey Balan

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

Options
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -0
    • +44
    ./web/includes/javascript/qb-search.js
    • -45
    • +7
    ./web/qb/searchWidget.jsp
  4. … 12 more files in changeset.
Tuesday 16 Jul 2019
5:21 pm

Marcin Cieslak

LDEV-4828 Allow question sorting by usage in lessons on collection page

Options
    • -2
    • +2
    ./web/qb/collection.jsp
  2. … 1 more file in changeset.
4:53 pm

Marcin Cieslak

LDEV-4782 Sort lessons by organisation. Include only active lessons.

Options
    • -1
    • +1
    ./web/qb/stats.jsp
  2. … 1 more file in changeset.
4:34 pm

Marcin Cieslak

LDEV-4782 Add a link to open lesson monitor on QB stats page

Options
    • -2
    • +11
    ./web/qb/stats.jsp
4:18 pm

Marcin Cieslak

LDEV-4828 Fix encoding when sending XML with jqGrid collection data

Options
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
Monday 15 Jul 2019
11:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
11:34 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4837 Removing white line that appears on iPad partway down dialog

Options
    • -1
    • +0
    ./web/css/_learner_base.scss
Sunday 14 Jul 2019
8:43 pm

Marcin Cieslak

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.

Options
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
  2. … 1 more file in changeset.
Saturday 13 Jul 2019
4:00 pm

Marcin Cieslak

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

Options
    • -29
    • +40
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -254
    • +253
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -526
    • +566
    ./web/qb/collection.jsp
    • -461
    • +503
    ./web/qb/stats.jsp
  5. … 7 more files in changeset.
3:18 pm

Andrey Balan

LDEV-4836 Fix autopatch script

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 1 more file in changeset.
7:44 am

Andrey Balan

LDEV-4836 Properly assign collections

Options
    • -19
    • +20
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +1
    ./web/qb/authoring/addQuestionFooter.jsp
    • -2
    • +3
    ./web/qb/authoring/addessay.jsp
    • -2
    • +3
    ./web/qb/authoring/addmarkhedging.jsp
    • -2
    • +3
    ./web/qb/authoring/addmatchingpairs.jsp
    • -2
    • +3
    ./web/qb/authoring/addmultiplechoice.jsp
    • -2
    • +3
    ./web/qb/authoring/addnumerical.jsp
    • -2
    • +3
    ./web/qb/authoring/addordering.jsp
    • -2
    • +3
    ./web/qb/authoring/addshortanswer.jsp
    • -2
    • +3
    ./web/qb/authoring/addtruefalse.jsp
    • -0
    • +2
    ./web/qb/searchWidget.jsp
  13. … 3 more files in changeset.
6:10 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
    • -54
    • +35
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -35
    • +89
    ./web/qb/collection.jsp
    • -4
    • +7
    ./web/qb/stats.jsp
  5. … 4 more files in changeset.
5:21 am

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -0
    • +67
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -104
    • +472
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -0
    • +6
    ./web/common/taglibs.jsp
    • -0
    • +7
    ./web/css/bootstrap-toggle.css
    • -0
    • +28
    ./web/css/bootstrap-toggle.scss
    • -0
    • +1
    ./web/css/qb-question.css
    • -0
    • +394
    ./web/css/qb-question.scss
    • -0
    • +9
    ./web/includes/javascript/bootstrap-toggle.js
    • -0
    • +135
    ./web/includes/javascript/qb-option.js
    • -0
    • +80
    ./web/includes/javascript/qb-question.js
    • -0
    • +29
    ./web/qb/authoring/addQuestionFooter.jsp
    • -0
    • +28
    ./web/qb/authoring/addQuestionHeader.jsp
    • -0
    • +231
    ./web/qb/authoring/addessay.jsp
  16. … 62 more files in changeset.
Thursday 11 Jul 2019
1:28 am

Marcin Cieslak

LDEV-4834 Check if user can manage a QB question

If an user does not have access to a question, i.e. it is not in any

collection he/she sees, then prevent him/her from editing the question's

collections and learning outcomes.

Options
    • -32
    • +2
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -86
    • +107
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -4
    • +43
    ./web/qb/stats.jsp
  4. … 5 more files in changeset.