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
Saturday 13 Jul 2019
5:21 am

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -6
    • +4
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +18
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -14
    • +11
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -22
    • +0
    ./lamsfoundation/lams/tool/assessment/model/QuestionReference.java
    • -0
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -6
    • +7
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -407
    • +337
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  8. … 70 more files in changeset.
Thursday 04 Jul 2019
3:25 am

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
    • -2
    • +3
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +0
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -28
    • +108
    ./lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -64
    • +67
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -73
    • +24
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  6. … 50 more files in changeset.
Tuesday 02 Jul 2019
9:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  3. … 13 more files in changeset.
Thursday 27 Jun 2019
8:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Error msg and text improvements, supports mark entry

Options
    • -2
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 13 more files in changeset.
Wednesday 26 Jun 2019
1:09 am

Andrey Balan

LDEV-4833 Move import/export questions in XML format feature to QB

Options
    • -132
    • +0
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 7 more files in changeset.
Wednesday 19 Jun 2019
6:33 am

Andrey Balan

LDEV-4832 Add ability to create/edit questions from the central QB pages

Options
    • -36
    • +0
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -27
    • +8
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -6
    • +0
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -328
    • +55
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -254
    • +0
    ./lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
  7. … 23 more files in changeset.
Monday 17 Jun 2019
9:26 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4826

Options
    • -13
    • +12
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

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

Options
    • -438
    • +0
    ./lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -36
    • +0
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  3. … 11 more files in changeset.
Wednesday 29 May 2019
10: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
    • -3
    • +4
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 9 more files in changeset.
9:02 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Assessment tool monitoring

Options
    • -618
    • +632
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
7:27 am

Andrey Balan

LDEV-4823 Fix exception on adding and removing questions simultaneously

Options
    • -13
    • +12
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Saturday 18 May 2019
7:16 am

Andrey Balan

LDEV-4821 Switch to using qbQuestionUid for competence levels

Options
    • -5
    • +16
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 3 more files in changeset.
5:50 am

Andrey Balan

LDEV-4821 remove obsolete hash field

Options
    • -0
    • +16
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -17
    • +0
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +7
    ./lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -12
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  5. … 4 more files in changeset.
Thursday 16 May 2019
2:53 am

Andrey Balan

LDEV-4820 Show user names for confidence levels

Options
    • -2
    • +6
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 5 more files in changeset.
Saturday 11 May 2019
5:59 am

Andrey Balan

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

Options
    • -76
    • +54
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 14 more files in changeset.
Friday 10 May 2019
9:45 pm

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -11
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -13
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -11
    • +16
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
6:10 pm

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +3
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -27
    • +46
    ./lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -1
    • +4
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -30
    • +0
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -38
    • +45
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -61
    • +66
    ./lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -1
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  12. … 3 more files in changeset.
Wednesday 08 May 2019
5:11 am

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -35
    • +13
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +0
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java
    • -41
    • +73
    ./lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -70
    • +73
    ./lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -5
    • +9
    ./lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
    • -12
    • +0
    ./lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -6
    • +6
    ./lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java
    • -4
    • +3
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -376
    • +23
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -248
    • +0
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
    • -23
    • +43
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -136
    • +0
    ./lamsfoundation/lams/tool/assessment/model/AssessmentUnit.java
  16. … 66 more files in changeset.
Tuesday 23 Apr 2019
7:47 pm

Marcin Cieslak

LDEV-4813 Add a missing foreign key in Assessment tool

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
Tuesday 19 Mar 2019
1:57 am

Andrey Balan

Merge branch 'LDEV-4765' into LDEV-4777

Options
    • -73
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
Friday 15 Mar 2019
10:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

Options
    • -8
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 5 more files in changeset.
10:32 pm

Andrey Balan

LDEV-4762 Fix saving ordering type of questions that happens on autosave

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

Options
    • -8
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 5 more files in changeset.
Wednesday 13 Mar 2019
6:13 am

Andrey Balan

LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

Options
    • -1
    • +62
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 14 more files in changeset.
Tuesday 12 Feb 2019
6:58 am

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

Options
    • -2
    • +0
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -56
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  4. … 5 more files in changeset.
6:58 am

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

Options
    • -2
    • +0
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -56
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  4. … 5 more files in changeset.
Thursday 31 Jan 2019
8:09 am

Andrey Balan

LDEV-4765 Add sorting of the question answers

Also some other improvements.

Options
    • -73
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 7 more files in changeset.
Saturday 26 Jan 2019
2:35 pm

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +0
    ./lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -23
    • +101
    ./lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  4. … 21 more files in changeset.
Tuesday 08 Jan 2019
6:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4743 Squash/Update SQL scripts ready for LAMS 3.1 release

Options
    • -16
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20130216.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20131118.sql
    • -20
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20140101.sql
    • -19
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20140102.sql
    • -16
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20140428.sql
    • -17
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20140612.sql
    • -17
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20140707.sql
    • -15
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20150706.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -14
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20150928.sql
    • -25
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20151204.sql
    • -91
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20151217.sql
  16. … 115 more files in changeset.
Friday 21 Dec 2018
7:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -5
    • +0
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 20 more files in changeset.
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -0
    • +5
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -16
    • +2
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  4. … 140 more files in changeset.