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 20 Dec 2019
3:42 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

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

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

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

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

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

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

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

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

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

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

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

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

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

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

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

# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

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

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

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

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

# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -12
    • +20
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
  2. … 16 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -12
    • +20
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
  2. … 42 more files in changeset.
Monday 16 Dec 2019
8:37 pm

Marcin Cieslak

LDEV-4884 Store MCQ questions' UUIDs in JSON so Scratchie can use them

Options
    • -1
    • +12
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 1 more file in changeset.
Tuesday 10 Dec 2019
10:31 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring IRA

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/web/controller/TblMonitoringController.java
  2. … 1 more file in changeset.
Thursday 05 Dec 2019
9:41 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Learner for MCQ

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

Marcin Cieslak

LDEV-4921 Introduce MCQ admin page. Allow hiding question titles.

Options
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/mc/dao/IMcConfigDAO.java
    • -0
    • +20
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McConfigDAO.java
    • -0
    • +23
    ./org/lamsfoundation/lams/tool/mc/dbupdates/patch20191205.sql
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -3
    • +19
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +61
    ./org/lamsfoundation/lams/tool/mc/web/controller/McAdminController.java
    • -0
    • +35
    ./org/lamsfoundation/lams/tool/mc/web/form/McAdminForm.java
  10. … 2 more files in changeset.
7:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 4 more files in changeset.
Wednesday 04 Dec 2019
9:44 pm

Marcin Cieslak

LDEV-4920 Import QTI questions to MCQ after adding them to QB

Options
    • -2
    • +16
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 8 more files in changeset.
Saturday 30 Nov 2019
1:42 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  4. … 1 more file in changeset.
Wednesday 27 Nov 2019
4:26 pm

Marcin Cieslak

LDEV-4916 Static fields can not be autowired

Spring does not support it.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -2
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
  5. … 6 more files in changeset.
Tuesday 26 Nov 2019
1:34 am

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  2. … 5 more files in changeset.
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 19 more files in changeset.
Tuesday 19 Nov 2019
9:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

lams_tool_scratchie/web/pages/learning/learning.jsp

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -20
    • +41
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -12
    • +20
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  5. … 18 more files in changeset.
Wednesday 13 Nov 2019
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -0
    • +8
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 60 more files in changeset.
Saturday 09 Nov 2019
6:00 am

Andrey Balan

LDEV-4900 Fix issues

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  5. … 1 more file in changeset.
Friday 08 Nov 2019
11:29 pm

Marcin Cieslak

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

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/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.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/service/AssessmentServiceImpl.java

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

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

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -14
    • +21
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  3. … 26 more files in changeset.
6:50 am

Andrey Balan

LDEV-4900 Mark autosave result as final and copy results to non leaders on leader's force completion

* Finalize non-leaders on leader's finish or force-completion

Options
    • -20
    • +33
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -11
    • +19
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
  3. … 7 more files in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -10
    • +17
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 15 more files in changeset.
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 32 more files in changeset.
Monday 28 Oct 2019
5:36 pm

Marcin Cieslak

LDEV-4895 Fix detection whether MCQ has already been attempted

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
Thursday 24 Oct 2019
9:02 pm

Marcin Cieslak

LDEV-4884 Several minor fixes for UUID and description QTI import

Options
    • -3
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 2 more files in changeset.
7:49 pm

Marcin Cieslak

LDEV-4745 Add QB questions to private collection for TBL template

Options
    • -0
    • +17
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 2 more files in changeset.
7:22 pm

Marcin Cieslak

LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

Options
    • -18
    • +29
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 9 more files in changeset.
Tuesday 22 Oct 2019
8:11 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 9 more files in changeset.
Monday 21 Oct 2019
10:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 3 more files in changeset.
Tuesday 15 Oct 2019
6:13 pm

Marcin Cieslak

LDEV-4836 Set QB question content folder ID for new MCQ questions

Also add a default content folder ID to template activities during

migration.

Options
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/mc/dto/McQuestionDTO.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -14
    • +18
    ./org/lamsfoundation/lams/tool/mc/web/controller/McController.java
  5. … 3 more files in changeset.
Monday 30 Sep 2019
9:07 pm

Marcin Cieslak

LKC-221 Fill Scratchie and Assessment with WA questions

Options
    • -2
    • +7
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 5 more files in changeset.
1:28 pm

Marcin Cieslak

LKC-221 Fill MCQ with RAT questions.

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml
    • -1
    • +21
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
  3. … 1 more file in changeset.
Monday 23 Sep 2019
8:14 pm

Andrey Balan

LDEV-4872 McSession to save users as Set instead of List

Options
    • -12
    • +14
    ./org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
8:14 pm

Andrey Balan

LDEV-4872 McSession to save users as Set instead of List

Options
    • -12
    • +14
    ./org/lamsfoundation/lams/tool/mc/model/McSession.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/mc/service/McService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java