lams-github / lams_tool_lamc / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 21
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 09 Aug 2019
4:01 pm

Marcin Cieslak

LDEv-4845 Initial LD XML transformation for MCQ tool.

Options
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20190809.sql
    • -1
    • +79
    ./org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -1
    • +21
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  4. … 3 more files in changeset.
Sunday 04 Aug 2019
3:48 pm

Marcin Cieslak

LDEV-4841 Initial Q&A tool back end migration to Question Bank

Options
    • -31
    • +1
    ./org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
  2. … 20 more files in changeset.
Tuesday 23 Jul 2019
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
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 17 more files in changeset.
Monday 22 Jul 2019
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
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
Friday 19 Jul 2019
10:21 am

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
    • -3
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  3. … 3 more files in changeset.
9:47 am

Marcin Cieslak

LDEV-4745 Order MCQ users to have consistent iteration results

Options
    • -14
    • +14
    ./org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -40
    • +39
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -14
    • +19
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
Thursday 18 Jul 2019
4:25 pm

Marcin Cieslak

LDEV-4745 Count MCQ attempts only for given question UID

Options
    • -11
    • +13
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
4:20 pm

Marcin Cieslak

LDEV-4745 Make Assessment questions comparable by order ID

Options
    • -16
    • +4
    ./org/lamsfoundation/lams/tool/mc/model/McQueContent.java
  2. … 3 more files in changeset.
4:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -4
    • +4
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 9 more files 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
    • -38
    • +44
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 10 more files in changeset.
Friday 12 Jul 2019
11:21 pm

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 76 more files in changeset.
Thursday 04 Jul 2019
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
  2. … 50 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
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +6
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -38
    • +44
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -6
    • +11
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -11
    • +14
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  10. … 46 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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 14 more files in changeset.
Thursday 30 May 2019
2:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -136
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 12 more files in changeset.
Wednesday 29 May 2019
4:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  2. … 9 more files in changeset.
1:55 pm

Marcin Cieslak

LDEV-4825 Display QB stats in MCQ tool monitoring

Options
    • -3
    • +14
    ./org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  2. … 4 more files in changeset.
Thursday 23 May 2019
1:14 pm

Andrey Balan

LDEV-4745 Fix the way confidence levels is calculated in MCQ

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
Saturday 18 May 2019
1:16 am

Andrey Balan

LDEV-4821 Switch to using qbQuestionUid for competence levels

Options
    • -6
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
Friday 17 May 2019
11:50 pm

Andrey Balan

LDEV-4821 remove obsolete hash field

Options
    • -0
    • +16
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20190517.sql
    • -21
    • +3
    ./org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/mc/service/McImportContentVersionFilter.java
    • -8
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  5. … 4 more files in changeset.
Wednesday 15 May 2019
8:53 pm

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 5 more files in changeset.
Tuesday 14 May 2019
11:23 pm

Andrey Balan

LDEV-4818 Add title property to MCQ questions

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -14
    • +3
    ./org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -12
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McQueContentDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -14
    • +18
    ./org/lamsfoundation/lams/tool/mc/dto/AnswerDTO.java
    • -9
    • +11
    ./org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -8
    • +24
    ./org/lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -19
    • +27
    ./org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -4
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java
    • -62
    • +54
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/util/LearningUtil.java
    • -55
    • +61
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  16. … 21 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  4. … 78 more files in changeset.
Wednesday 24 Apr 2019
2:14 pm

Marcin Cieslak

LDEV-4746 Fix a duplicate association in MCQ

Options
    • -4
    • +0
    ./org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
Tuesday 26 Feb 2019
8:56 pm

Andrey Balan

LDEV-4777 Search QB interface is now available in MCQ tool

* Further development of QB search feature

Options
    • -14
    • +4
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +52
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  3. … 7 more files in changeset.
Friday 22 Feb 2019
4:17 pm

Marcin Cieslak

LDEV-4746 Set tool content ID also on MCQ clone for lesson

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/model/McQueContent.java
Monday 18 Feb 2019
11:02 am

Marcin Cieslak

LDEV-4746 Prepare QB model for stats

Tool content ID was added to each tool QB question so we can track which

activity and lesson it belongs to.

Order ID and create date were moved from subclasses to top QB entities.

Options
    • -13
    • +3
    ./org/lamsfoundation/lams/tool/mc/model/McQueContent.java
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  4. … 8 more files in changeset.
Friday 15 Feb 2019
4:32 pm

Marcin Cieslak

LDEV-4746 Create a super class and table for tools' answers to inherit

Options
    • -16
    • +18
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -35
    • +11
    ./org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
  3. … 7 more files in changeset.
Thursday 14 Feb 2019
11:27 pm

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +6
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -42
    • +42
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -6
    • +13
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -11
    • +14
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  10. … 5 more files in changeset.
11:27 pm

Andrey Balan

LDEV-4775 update marks more skillfully after edit in monitor

(cherry picked from commit c5920711a0c7a8b4da40893f4d30d2dc26a0fba1)

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -2
    • +6
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -42
    • +42
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -6
    • +13
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -11
    • +14
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
  10. … 5 more files in changeset.