lams-github / lams_tool_assessment / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 16
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 24 Dec 2019
10:47 pm

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -6
    • +5
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 63 more files in changeset.
Monday 23 Dec 2019
1:25 pm

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

Options
    • -5
    • +9
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 1 more file in changeset.
Friday 20 Dec 2019
3:27 pm

Andrey Balan

LDEV-4933 Take care about null/100.0 case

Options
    • -4
    • +7
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
Thursday 19 Dec 2019
8:42 pm

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
    • -19
    • +24
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 16 more files in changeset.
Wednesday 18 Dec 2019
11:21 pm

Andrey Balan

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

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -18
    • +23
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 42 more files in changeset.
Thursday 05 Dec 2019
3:53 pm

Marcin Cieslak

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

Add numbering in authoring and excel export.

Options
    • -1
    • +4
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -1
    • +9
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +9
    ./lamsfoundation/lams/tool/assessment/dao/AssessmentConfigDAO.java
    • -0
    • +20
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentConfigDAOHibernate.java
    • -0
    • +23
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191205.sql
    • -0
    • +20
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -12
    • +11
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +65
    ./lamsfoundation/lams/tool/assessment/web/controller/AdminController.java
    • -0
    • +35
    ./lamsfoundation/lams/tool/assessment/web/form/AdminForm.java
  10. … 5 more files in changeset.
12:43 am

Marcin Cieslak

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

Options
    • -1001
    • +1023
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Tuesday 26 Nov 2019
3:26 pm

Andrey Balan

LDEV-4860 Fix matching pairs excel export

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
Monday 25 Nov 2019
6:34 pm

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -5
    • +24
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 5 more files in changeset.
Friday 22 Nov 2019
6:51 pm

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql
    • -0
    • +11
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +0
    ./lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
  6. … 15 more files in changeset.
Tuesday 19 Nov 2019
2: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
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -45
    • +79
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  5. … 18 more files in changeset.
1:50 pm

Marcin Cieslak

LDEV-4884 Fix attributes received from TBL template

Options
    • -3
    • +2
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Tuesday 12 Nov 2019
8:32 pm

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
    • -6
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  4. … 58 more files in changeset.
Friday 08 Nov 2019
11:00 pm

Andrey Balan

LDEV-4900 Fix issues

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
  2. … 4 more files in changeset.
4: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
    • -293
    • +212
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -644
    • +642
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -9
    • +11
    ./lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  5. … 24 more files in changeset.
Thursday 07 Nov 2019
11:50 pm

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
    • -46
    • +77
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 8 more files in changeset.
Thursday 31 Oct 2019
3:54 pm

Andrey Balan

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

Options
    • -77
    • +42
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 15 more files in changeset.
8:58 am

Andrey Balan

LDEV-4897 Roll back to the previous calculation

Options
    • -19
    • +32
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Wednesday 30 Oct 2019
5:35 pm

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
    • -273
    • +219
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +4
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  4. … 30 more files in changeset.
Friday 25 Oct 2019
9:19 pm

Andrey Balan

LDEV-4859 Include time with dates

Options
    • -64
    • +70
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
Thursday 24 Oct 2019
3:02 pm

Marcin Cieslak

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

Options
    • -5
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
1:49 pm

Marcin Cieslak

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

Options
    • -2
    • +20
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
1:22 pm

Marcin Cieslak

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

Options
    • -55
    • +65
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 9 more files in changeset.
Wednesday 23 Oct 2019
9:55 pm

Andrey Balan

LDEV-4891 Calculate iRA percentages for VSA questions in TBL monitoring

Options
    • -4
    • +6
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
8:39 pm

Andrey Balan

LDEV-4890 IRA student choices percentages should be <= than 100%

Options
    • -4
    • +1
    ./lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -8
    • +6
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
8:26 pm

Andrey Balan

LDEV-4888 Prevent exception thrown on answering ordering type of question

Options
    • -5
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Tuesday 22 Oct 2019
2: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
    • +1
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -76
    • +336
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 8 more files in changeset.
Monday 21 Oct 2019
4:03 pm

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

Options
    • -50
    • +57
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.
Wednesday 16 Oct 2019
9:30 am

Marcin Cieslak

LDEV-4813 Improve slow queries

Options
    • -0
    • +16
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
  2. … 1 more file in changeset.
Thursday 10 Oct 2019
9:47 pm

Andrey Balan

LDEV-4875 Fixes for TBL monitoring pages

Options
    • -6
    • +15
    ./lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -0
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  3. … 2 more files in changeset.