lams-github / lams_common

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 35
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
Tuesday 16 Jul 2019
10:53 am

Marcin Cieslak

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

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

Andrey Balan

LDEV-4836 Fix autopatch script

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

Andrey Balan

LDEV-4836 Properly assign collections

Options
    • -5
    • +13
    ./java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -3
    • +4
    ./java/org/lamsfoundation/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
    ./java/org/lamsfoundation/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
    ./java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -17
    • +28
    ./java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -5
    • +61
    ./java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -352
    • +0
    ./java/org/lamsfoundation/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
    ./java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +10
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -131
    • +133
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -566
    • +571
    ./java/org/lamsfoundation/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
    ./java/org/lamsfoundation/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
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -604
    • +604
    ./java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
    • -0
    • +16
    ./java/org/lamsfoundation/lams/dbupdates/patch20190703.sql
    • -76
    • +101
    ./java/org/lamsfoundation/lams/outcome/OutcomeMapping.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/outcome/dao/IOutcomeDAO.java
    • -5
    • +40
    ./java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java
    • -49
    • +50
    ./java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java
    • -304
    • +306
    ./java/org/lamsfoundation/lams/outcome/service/OutcomeService.java
    • -68
    • +70
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -365
    • +374
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -415
    • +424
    ./java/org/lamsfoundation/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
    ./java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +12
    ./java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  4. … 52 more files in changeset.
Tuesday 02 Jul 2019
3:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -5
    • +5
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -6
    • +6
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -7
    • +7
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -15
    • +15
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/qb/service/QbUtils.java
  6. … 10 more files in changeset.
3:19 pm

Marcin Cieslak

LDEV-4828 Add subgrid with previous versions in QB collection view

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +8
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  4. … 2 more files in changeset.
10:48 am

Marcin Cieslak

LDEV-4828 Rewrite QB collections to use question ID instead of uid

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/dbupdates/patch20190531.sql
    • -5
    • +9
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -29
    • +55
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -15
    • +24
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -32
    • +69
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  6. … 7 more files in changeset.
Saturday 29 Jun 2019
6:41 pm

Marcin Cieslak

LDEV-4745 Remove redundant 'local' field

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
Wednesday 26 Jun 2019
3:54 pm

Andrey Balan

LDEV-4745 Remove redundant 'local' field

Options
    • -8
    • +6
    ./java/org/lamsfoundation/lams/dbupdates/patch20190110.sql
    • -5
    • +3
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -13
    • +0
    ./java/org/lamsfoundation/lams/qb/model/QbQuestion.java
Monday 24 Jun 2019
10:38 pm

Andrey Balan

LDEV-4745 Fix getCountQbQuestions() DAO method

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
12:05 pm

Marcin Cieslak

LDEV-4828 Sort collections according to their names

Options
    • -1
    • +8
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
6:50 am

Marcin Cieslak

LDEV-4828 Put private collection first in the list

Options
    • -1
    • +3
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
Thursday 20 Jun 2019
1:21 pm

Marcin Cieslak

Merge branch 'LDEV-4828' into LDEV-4745

Options
    • -3
    • +17
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -32
    • +98
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  3. … 2 more files in changeset.
12:02 pm

Marcin Cieslak

LDEV-4828 Toggle questions transfer and collection creation in sysadmin

Options
    • -0
    • +3
    ./java/org/lamsfoundation/lams/dbupdates/patch20190531.sql
    • -0
    • +1
    ./java/org/lamsfoundation/lams/util/ConfigurationKeys.java
  3. … 6 more files in changeset.
11:15 am

Marcin Cieslak

LDEV-4828 Change default private collection name

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
11:12 am

Marcin Cieslak

LDEV-4828 Allow changing collection name

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  3. … 1 more file in changeset.
10:11 am

Marcin Cieslak

LDEV-4828 Show usage in lessons on single collection page

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -1
    • +7
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +4
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  5. … 3 more files in changeset.
9:16 am

Marcin Cieslak

LDEV-4828 Split collection view into list and single collection views

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -12
    • +0
    ./java/org/lamsfoundation/lams/qb/model/QbCollection.java
    • -1
    • +3
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -20
    • +21
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  6. … 3 more files in changeset.
Wednesday 19 Jun 2019
3:49 pm

Marcin Cieslak

LDEV-3316 Add generics to base DAO so no casting is needed for results

Options
    • -301
    • +301
    ./java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -602
    • +604
    ./java/org/lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
2:25 pm

Marcin Cieslak

LDEV-4828 Removal and moving questions is available only on stats page

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -4
    • +10
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  3. … 4 more files in changeset.
12:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -0
    • +44
    ./java/org/lamsfoundation/lams/qb/QbConstants.java
    • -0
    • +263
    ./java/org/lamsfoundation/lams/qb/form/QbQuestionForm.java
    • -2
    • +19
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -1
    • +22
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +352
    ./java/org/lamsfoundation/lams/qb/service/QbUtils.java
  6. … 24 more files in changeset.
Monday 17 Jun 2019
6:11 pm

Andrey Balan

LDEV-4826 Add export QTI feature to QB questions page

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +5
    ./java/org/lamsfoundation/lams/qb/service/QbService.java
  3. … 5 more files in changeset.