lams-github / lams_common / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
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
Friday 26 Jul 2019
10:14 pm

Marcin Cieslak

LDEV-4746 Fix migration script for Talca issues

Options
    • -433
    • +444
    ./lams/dbupdates/patch20190722.sql
12: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/dbupdates/patch20190722.sql
  2. … 1 more file in changeset.
Thursday 25 Jul 2019
1:21 pm

Marcin Cieslak

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

Options
    • -11
    • +0
    ./lams/dbupdates/patch20190109.sql
    • -677
    • +0
    ./lams/dbupdates/patch20190110.sql
    • -20
    • +0
    ./lams/dbupdates/patch20190530.sql
    • -46
    • +0
    ./lams/dbupdates/patch20190531.sql
    • -14
    • +0
    ./lams/dbupdates/patch20190703.sql
    • -0
    • +11
    ./lams/dbupdates/patch20190721.sql
    • -0
    • +677
    ./lams/dbupdates/patch20190722.sql
    • -0
    • +20
    ./lams/dbupdates/patch20190723.sql
    • -0
    • +46
    ./lams/dbupdates/patch20190724.sql
    • -0
    • +14
    ./lams/dbupdates/patch20190725.sql
1: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
    • -7
    • +6
    ./lams/dbupdates/patch20190110.sql
    • -172
    • +169
    ./lams/qb/model/QbOption.java
  3. … 1 more file in changeset.
Wednesday 24 Jul 2019
3: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/dbupdates/patch20190110.sql
5:04 am

Marcin Cieslak

LDEV-4746 Make description field longer

Options
    • -2
    • +2
    ./lams/dbupdates/patch20190110.sql
Tuesday 23 Jul 2019
10:51 pm

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
    • -2
    • +5
    ./lams/qb/dao/IQbDAO.java
    • -20
    • +58
    ./lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +5
    ./lams/qb/service/IQbService.java
    • -5
    • +11
    ./lams/qb/service/QbService.java
  5. … 1 more file in changeset.
10:44 pm

Andrey Balan

LDEV-4836 Advanced search on authoring basic tab

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

button + collections dropdown

Options
    • -2
    • +5
    ./lams/qb/dao/IQbDAO.java
    • -20
    • +58
    ./lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +5
    ./lams/qb/service/IQbService.java
    • -5
    • +11
    ./lams/qb/service/QbService.java
  5. … 11 more files in changeset.
3:08 pm

Marcin Cieslak

LDEV-4746 Extra question name clean up

Options
    • -5
    • +8
    ./lams/dbupdates/patch20190110.sql
2:48 pm

Marcin Cieslak

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

Options
    • -3
    • +1
    ./lams/dbupdates/patch20190703.sql
  2. … 8 more files in changeset.
2: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
    • +6
    ./lams/dbupdates/patch20190110.sql
    • -1
    • +1
    ./lams/qb/dao/IQbDAO.java
    • -5
    • +8
    ./lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    ./lams/qb/service/IQbService.java
    • -3
    • +3
    ./lams/qb/service/QbService.java
  6. … 13 more files in changeset.
Monday 22 Jul 2019
5:12 pm

Marcin Cieslak

LDEV-4746 Trim questions' names and descriptions

Options
    • -5
    • +5
    ./lams/dbupdates/patch20190110.sql
12:38 pm

Marcin Cieslak

LDEV-4746 Add improved migration script

It runs faster and makes matching more efficient.

Options
    • -0
    • +11
    ./lams/dbupdates/patch20190109.sql
    • -624
    • +676
    ./lams/dbupdates/patch20190110.sql
12:33 pm

Marcin Cieslak

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

Options
    • -6
    • +16
    ./lams/qb/form/QbQuestionForm.java
  2. … 10 more files in changeset.
12: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
    • -2
    • +2
    ./lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    ./lams/qb/service/QbService.java
  3. … 3 more files in changeset.
Thursday 18 Jul 2019
4:20 pm

Marcin Cieslak

LDEV-4745 Make Assessment questions comparable by order ID

Options
    • -71
    • +88
    ./lams/qb/model/QbToolQuestion.java
  2. … 3 more files in changeset.
12: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
    • -0
    • +7
    ./lams/dbupdates/patch20190110.sql
    • -1
    • +1
    ./lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +1
    ./lams/qb/model/QbQuestion.java
  4. … 12 more files in changeset.
Tuesday 16 Jul 2019
11:21 am

Marcin Cieslak

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

Options
    • -6
    • +17
    ./lams/qb/dao/hibernate/QbDAO.java
  2. … 1 more file in changeset.
10:53 am

Marcin Cieslak

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

Options
    • -2
    • +3
    ./lams/qb/dao/hibernate/QbDAO.java
  2. … 1 more file in changeset.
9:55 am

Marcin Cieslak

LDEV-4782 Discar grades with NULL mark before calculating indexes

Options
    • -1
    • +3
    ./lams/qb/service/QbService.java
Sunday 14 Jul 2019
2: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
    • -20
    • +2
    ./lams/qb/model/QbQuestion.java
  2. … 1 more file in changeset.
Saturday 13 Jul 2019
10:00 am

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
    • -471
    • +488
    ./lams/qb/model/QbQuestion.java
    • -131
    • +133
    ./lams/qb/service/IQbService.java
    • -567
    • +572
    ./lams/qb/service/QbService.java
  4. … 8 more files in changeset.
9:18 am

Andrey Balan

LDEV-4836 Fix autopatch script

Options
    • -1
    • +1
    ./lams/dbupdates/patch20190110.sql
  2. … 1 more file in changeset.
1:44 am

Andrey Balan

LDEV-4836 Properly assign collections

Options
    • -5
    • +13
    ./lams/qb/form/QbQuestionForm.java
    • -1
    • +1
    ./lams/qb/service/IQbService.java
    • -3
    • +4
    ./lams/qb/service/QbService.java
  4. … 12 more files in changeset.
12:10 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
    • -1
    • +1
    ./lams/dbupdates/patch20190110.sql
  2. … 7 more files in changeset.
Friday 12 Jul 2019
11:21 pm

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -0
    • +1
    ./lams/dbupdates/patch20190110.sql
    • -17
    • +28
    ./lams/qb/form/QbQuestionForm.java
    • -5
    • +61
    ./lams/qb/model/QbQuestion.java
    • -352
    • +0
    ./lams/qb/service/QbUtils.java
  5. … 73 more files in changeset.
Wednesday 10 Jul 2019
7:28 pm

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
    • -0
    • +30
    ./lams/outcome/service/OutcomeService.java
    • -3
    • +4
    ./lams/qb/dao/IQbDAO.java
    • -0
    • +10
    ./lams/qb/dao/hibernate/QbDAO.java
    • -131
    • +133
    ./lams/qb/service/IQbService.java
    • -566
    • +571
    ./lams/qb/service/QbService.java
  6. … 3 more files in changeset.
Thursday 04 Jul 2019
7:27 pm

Marcin Cieslak

LDEV-4834 Show Learning Outcomes in single QB collection view

Options
    • -1
    • +9
    ./lams/qb/model/QbQuestion.java
  2. … 3 more files in changeset.
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -680
    • +682
    ./lams/commonContext.xml
    • -604
    • +604
    ./lams/dao/hibernate/LAMSBaseDAO.java
    • -0
    • +16
    ./lams/dbupdates/patch20190703.sql
    • -76
    • +101
    ./lams/outcome/OutcomeMapping.java
    • -1
    • +1
    ./lams/outcome/dao/IOutcomeDAO.java
    • -5
    • +40
    ./lams/outcome/dao/hibernate/OutcomeDAO.java
    • -49
    • +50
    ./lams/outcome/service/IOutcomeService.java
    • -304
    • +306
    ./lams/outcome/service/OutcomeService.java
    • -68
    • +70
    ./lams/qb/dao/IQbDAO.java
    • -365
    • +374
    ./lams/qb/dao/hibernate/QbDAO.java
    • -415
    • +424
    ./lams/qb/model/QbQuestion.java
  12. … 40 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

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

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -1
    • +6
    ./lams/commonContext.xml
    • -0
    • +12
    ./lams/confidencelevel/ConfidenceLevelDTO.java
    • -0
    • +3
    ./lams/util/ConfigurationKeys.java
  4. … 52 more files in changeset.