lams-github / lams_tool_assessment

src

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
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
    • -293
    • +212
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -644
    • +642
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -9
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  5. … 24 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
    • -46
    • +77
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 8 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
    • -77
    • +42
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 15 more files in changeset.
3:58 pm

Andrey Balan

LDEV-4897 Roll back to the previous calculation

Options
    • -19
    • +32
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
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
    • -273
    • +219
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  4. … 30 more files in changeset.
Saturday 26 Oct 2019
3:19 am

Andrey Balan

LDEV-4859 Include time with dates

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

Marcin Cieslak

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

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

Marcin Cieslak

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

Options
    • -2
    • +20
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.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
    • -55
    • +65
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 9 more files in changeset.
3:55 am

Andrey Balan

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

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

Andrey Balan

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

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

Andrey Balan

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

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

Marcin Cieslak

LDEV-4745 Fix authoring templates for new QB structure

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

Marcin Cieslak

LDEV-4813 Improve slow queries

Options
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
  2. … 1 more file in changeset.
Friday 11 Oct 2019
3:47 am

Andrey Balan

LDEV-4875 Fixes for TBL monitoring pages

Options
    • -6
    • +15
    ./java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  3. … 2 more files in changeset.
Thursday 10 Oct 2019
5:32 am

Andrey Balan

LDEV-4875 Fixes for VSA feature

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  2. … 22 more files in changeset.
Wednesday 09 Oct 2019
5:27 am

Andrey Balan

LDEV-4875 Recalculate all assessments and scratchies after answer allocation into group

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +13
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -49
    • +104
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  4. … 14 more files in changeset.
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
    • -0
    • +13
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -0
    • +14
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +21
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -11
    • +208
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -8
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -3
    • +42
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  14. … 63 more files in changeset.
Monday 30 Sep 2019
9:07 pm

Marcin Cieslak

LKC-221 Fill Scratchie and Assessment with WA questions

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -3
    • +44
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 4 more files in changeset.
Saturday 07 Sep 2019
5:22 am

Andrey Balan

LDEV-4842 Show the same random questions on learning and results pages

Options
    • -2
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -4
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -20
    • +46
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
Thursday 05 Sep 2019
5:14 am

Andrey Balan

Merge branch 'LDEV-4841' into LDEV-4745

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -17
    • +17
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 1 more file in changeset.
Friday 16 Aug 2019
8:23 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4844

Options
    • -6
    • +204
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -0
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 5 more files in changeset.
12:52 am

Marcin Cieslak

LDEV-4846 Export/import QB questions' content folders

Options
    • -0
    • +19
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -0
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 5 more files in changeset.
Thursday 15 Aug 2019
11:48 pm

Marcin Cieslak

LDEV-4846 Set LD's content folder ID when importing old questions

In pre-QB LAMS version only LD had content folder ID. In QB each

question has its own content folder ID. When importing pre-QB questions

and converting them into QB questions, we give them the LD's (shared)

content folder ID.

Options
    • -19
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
  2. … 5 more files in changeset.
8:53 pm

Marcin Cieslak

LDEV-4847 Do not export question IDs, versions etc. when exporting a LD

Options
    • -1
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
8:31 pm

Marcin Cieslak

LDEV-4847 Look for existing QB question UUIDs when importing a LD

Options
    • -2
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 5 more files in changeset.
8:16 pm

Marcin Cieslak

LDEV-4845 Move QB question insert to QB service

There are various cascades set up in QB entities. They do not seem to

work when importing a QB question, so questions need to be inserted

manually.

Options
    • -35
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
8:16 pm

Marcin Cieslak

LDEV-4845 Move QB question insert to QB service

There are various cascades set up in QB entities. They do not seem to

work when importing a QB question, so questions need to be inserted

manually.

Options
    • -35
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 4 more files in changeset.
7:10 pm

Marcin Cieslak

LDEv-4845 Add imported QB questions to public collection

Options
    • -0
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.