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
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.
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
    ./lams/qb/dao/IQbDAO.java
    • -6
    • +6
    ./lams/qb/dao/hibernate/QbDAO.java
    • -7
    • +7
    ./lams/qb/service/IQbService.java
    • -15
    • +15
    ./lams/qb/service/QbService.java
    • -2
    • +2
    ./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
    ./lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -1
    • +8
    ./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
    ./lams/dbupdates/patch20190531.sql
    • -5
    • +9
    ./lams/qb/dao/IQbDAO.java
    • -29
    • +55
    ./lams/qb/dao/hibernate/QbDAO.java
    • -15
    • +24
    ./lams/qb/service/IQbService.java
    • -32
    • +69
    ./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
    ./lams/dbupdates/patch20190110.sql
Wednesday 26 Jun 2019
3:54 pm

Andrey Balan

LDEV-4745 Remove redundant 'local' field

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

Andrey Balan

LDEV-4745 Fix getCountQbQuestions() DAO method

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

Marcin Cieslak

LDEV-4828 Sort collections according to their names

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

Marcin Cieslak

LDEV-4828 Put private collection first in the list

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

Marcin Cieslak

Merge branch 'LDEV-4828' into LDEV-4745

Options
    • -3
    • +17
    ./lams/qb/service/IQbService.java
    • -32
    • +98
    ./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
    ./lams/dbupdates/patch20190531.sql
    • -0
    • +1
    ./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
    ./lams/qb/service/QbService.java
11:12 am

Marcin Cieslak

LDEV-4828 Allow changing collection name

Options
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -0
    • +8
    ./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
    ./lams/qb/dao/IQbDAO.java
    • -1
    • +7
    ./lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -0
    • +4
    ./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
    ./lams/qb/dao/IQbDAO.java
    • -1
    • +1
    ./lams/qb/dao/hibernate/QbDAO.java
    • -12
    • +0
    ./lams/qb/model/QbCollection.java
    • -1
    • +3
    ./lams/qb/service/IQbService.java
    • -20
    • +21
    ./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
    ./lams/dao/IBaseDAO.java
    • -602
    • +604
    ./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
    ./lams/qb/service/IQbService.java
    • -4
    • +10
    ./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
    ./lams/qb/QbConstants.java
    • -0
    • +263
    ./lams/qb/form/QbQuestionForm.java
    • -2
    • +19
    ./lams/qb/service/IQbService.java
    • -1
    • +22
    ./lams/qb/service/QbService.java
    • -0
    • +352
    ./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
    ./lams/qb/service/IQbService.java
    • -0
    • +5
    ./lams/qb/service/QbService.java
  3. … 5 more files in changeset.
Sunday 16 Jun 2019
6:04 pm

Marcin Cieslak

LDEV-4828 Allow adding a question to a collection from its stats page

Options
    • -1
    • +1
    ./lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +4
    ./lams/qb/service/IQbService.java
    • -2
    • +23
    ./lams/qb/service/QbService.java
  4. … 3 more files in changeset.
5:21 pm

Marcin Cieslak

LDEV-4828 Prevent question removal from last collection

If a question is in its last collection, it gets permanently removed.

Unless it is used in Learning Designs - then the user gets a message

that the question could not be removed.

Options
    • -0
    • +4
    ./lams/qb/dao/IQbDAO.java
    • -2
    • +13
    ./lams/qb/dao/hibernate/QbDAO.java
    • -2
    • +2
    ./lams/qb/service/IQbService.java
    • -4
    • +29
    ./lams/qb/service/QbService.java
  5. … 2 more files in changeset.
Thursday 06 Jun 2019
8:31 pm

Marcin Cieslak

LDEV-4746 Update question with richer data from other tool

Options
    • -555
    • +618
    ./lams/dbupdates/patch20190110.sql
11:42 am

Marcin Cieslak

LDEV-4828 Rewrite layout to bootstrap grid. Add comments. Minor fixes.

Options
    • -1
    • +3
    ./lams/qb/service/QbService.java
  2. … 2 more files in changeset.
10:23 am

Marcin Cieslak

LDEV-4828 Allow question copy and collection sharing in QB

Options
    • -0
    • +1
    ./lams/commonContext.xml
    • -0
    • +11
    ./lams/qb/model/QbCollection.java
    • -4
    • +6
    ./lams/qb/service/IQbService.java
    • -6
    • +60
    ./lams/qb/service/QbService.java
  5. … 2 more files in changeset.
9:31 am

Marcin Cieslak

LDEV-4828 Add "Remove collection" button to QB collections page

Options
    • -1
    • +6
    ./lams/qb/service/QbService.java
  2. … 2 more files in changeset.
Wednesday 05 Jun 2019
6:14 pm

Marcin Cieslak

LDEV-4828 Add "Add question" button to QB collections page

Options
    • -2
    • +3
    ./lams/qb/dao/IQbDAO.java
    • -8
    • +28
    ./lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +4
    ./lams/qb/service/IQbService.java
    • -2
    • +15
    ./lams/qb/service/QbService.java
  5. … 2 more files in changeset.
4:17 pm

Marcin Cieslak

LDEV-4828 Add remove button to QB collections

Options
    • -1
    • +1
    ./lams/commonContext.xml
    • -0
    • +3
    ./lams/qb/dao/IQbDAO.java
    • -0
    • +10
    ./lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -0
    • +5
    ./lams/qb/service/QbService.java
  6. … 2 more files in changeset.
9:54 am

Marcin Cieslak

LDEV-4828 Fix displaying HTML options in chart

Options
    • -3
    • +2
    ./lams/qb/service/QbService.java
8:56 am

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -1
    • +6
    ./lams/qb/dao/IQbDAO.java
    • -9
    • +54
    ./lams/qb/dao/hibernate/QbDAO.java
    • -1
    • +6
    ./lams/qb/service/IQbService.java
    • -2
    • +13
    ./lams/qb/service/QbService.java
    • -63
    • +68
    ./lams/util/CommonConstants.java
    • -512
    • +538
    ./lams/util/WebUtil.java
  7. … 5 more files in changeset.
7:12 am

Marcin Cieslak

LDEV-4828 Initial implementation of QB collections front end

Options
    • -1
    • +1
    ./lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +1
    ./lams/qb/model/QbCollection.java
    • -0
    • +2
    ./lams/qb/service/IQbService.java
    • -1
    • +9
    ./lams/qb/service/QbService.java
  5. … 2 more files in changeset.