lams-github

lams_tool_assessment

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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 27 Jul 2019
5:47 am

Andrey Balan

LDEV-4836 Update edit in monitor feature after migration to QB

Options
    • -23
    • +50
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -17
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -13
    • +2
    ./web/pages/authoring/parts/questionlistRestricted.jsp
4:40 am

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
Friday 26 Jul 2019
6:26 pm

Marcin Cieslak

LDEV-4746 Detect if a foreign key was already created

We may migrate DBs which already have a foreign key in one of Assessment

tables and ones which do not. Instead of manual shuffling of scripts, we

prepare scripts to never fail.

Options
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
  2. … 1 more file in changeset.
Thursday 25 Jul 2019
6:26 am

Andrey Balan

LDEV-4745 Cache references max marks before importing QB question

Options
    • -6
    • +19
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -0
    • +12
    ./web/pages/authoring/basic.jsp
Wednesday 24 Jul 2019
4:45 am

Andrey Balan

LDEV-4836 No need for removeNewLineCharacters() method anymore

Options
    • -23
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
4:44 am

Andrey Balan

LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

Options
    • -100
    • +99
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -4
    • +4
    ./web/pages/authoring/basic.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/questionlistRestricted.jsp
    • -52
    • +94
    ./web/pages/authoring/randomQuestion.jsp
  5. … 11 more files in changeset.
Monday 22 Jul 2019
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Saturday 20 Jul 2019
1:25 am

Andrey Balan

LDEV-4836 Limit allowed operations so recalculateMarks can work properly

Options
    • -15
    • +15
    ./web/pages/authoring/basic.jsp
Thursday 18 Jul 2019
10:20 pm

Marcin Cieslak

LDEV-4745 Make Assessment questions comparable by order ID

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -11
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
  3. … 2 more files in changeset.
10:04 pm

Andrey Balan

LDEV-4839 Refine import QB questions feature

Options
    • -4
    • +6
    ./web/pages/authoring/basic.jsp
  2. … 9 more files in changeset.
9:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -7
    • +0
    ./web/pages/authoring/basic.jsp
  3. … 5 more files in changeset.
6:51 pm

Andrey Balan

LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -138
    • +190
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -14
    • +15
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java
    • -4
    • +6
    ./web/pages/authoring/parts/questionlist.jsp
    • -4
    • +6
    ./web/pages/authoring/parts/questionlistRestricted.jsp
    • -54
    • +117
    ./web/pages/authoring/randomQuestion.jsp
  10. … 6 more files in changeset.
Saturday 13 Jul 2019
4:00 pm

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
    • -1
    • +11
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -65
    • +68
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  4. … 8 more files in changeset.
6:10 am

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4836

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  3. … 6 more files in changeset.
5:21 am

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -64
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -14
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -22
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/QuestionReference.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -407
    • +337
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -18
    • +0
    ./web/common/authoringQuestionHeader.jsp
    • -394
    • +0
    ./web/includes/css/addQuestion.scss
    • -28
    • +0
    ./web/includes/css/bootstrap-toggle.scss
    • -135
    • +0
    ./web/includes/javascript/authoring-options.js
    • -80
    • +0
    ./web/includes/javascript/authoring-question.js
    • -9
    • +0
    ./web/includes/javascript/bootstrap-toggle.js
    • -55
    • +83
    ./web/pages/authoring/basic.jsp
  16. … 62 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -358
    • +359
    ./conf/language/lams/ApplicationResources.properties
    • -14
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 48 more files in changeset.
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
    • -0
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +16
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -28
    • +108
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -64
    • +67
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -73
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +10
    ./web/includes/css/assessment.scss
    • -26
    • +23
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./web/pages/learning/parts/multiplechoice.jsp
    • -29
    • +9
    ./web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    ./web/pages/learning/results/ordering.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/masterDetailLoadUp.jsp
  16. … 40 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/java/org/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
    ./src/java/org/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -6
    • +0
    ./web/pages/authoring/basic.jsp
    • -101
    • +0
    ./web/pages/authoring/importQuestions.jsp
    • -12
    • +0
    ./web/pages/authoring/parts/questionlist.jsp
  5. … 4 more files in changeset.
Tuesday 25 Jun 2019
1:18 am

Andrey Balan

LKC-202 AEs "Show student’s choices” page to show real question title

Options
    • -1
    • +10
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -27
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -6
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -328
    • +55
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -254
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +1
    ./web/pages/authoring/parts/addessay.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addnumerical.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addordering.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/addtruefalse.jsp
  15. … 15 more files in changeset.
Monday 17 Jun 2019
9:26 pm

Andrey Balan

Merge branch 'LDEV-4745' into LDEV-4826

Options
    • -13
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 1 more file in changeset.
Friday 14 Jun 2019
1:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -1
    • +1
    ./web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    ./web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    ./web/pages/learning/parts/ordering.jsp
    • -18
    • +9
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -20
    • +8
    ./web/pages/monitoring/parts/usersummary.jsp
    • -12
    • +16
    ./web/pages/monitoring/summary.jsp
    • -1
    • +6
    ./web/pages/tblmonitoring/assessment.jsp
  11. … 85 more files in changeset.
Thursday 30 May 2019
8:06 am

Andrey Balan

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

Options
    • -2
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -438
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -36
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -29
    • +1
    ./web/pages/authoring/basic.jsp
    • -9
    • +0
    ./web/pages/authoring/parts/questionlist.jsp
  6. … 8 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -3
    • +2
    ./web/pages/monitoring/statisticpart.jsp
  3. … 8 more files in changeset.
9:02 pm

Marcin Cieslak

LDEV-4825 Display QB stats in Assessment tool monitoring

Options
    • -348
    • +352
    ./conf/language/lams/ApplicationResources.properties
    • -618
    • +632
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -167
    • +231
    ./web/pages/monitoring/statisticpart.jsp
7:27 am

Andrey Balan

LDEV-4823 Fix exception on adding and removing questions simultaneously

Options
    • -13
    • +12
    ./src/java/org/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
    ./src/java/org/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentImportContentVersionFilter.java
    • -12
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  5. … 4 more files in changeset.