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
Friday 10 May 2019
6:10 pm

Andrey Balan

LDEV-4746 Fix issues arose after migrating Assessment to QB

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -27
    • +46
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -30
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -38
    • +45
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -61
    • +66
    ./src/java/org/lamsfoundation/lams/tool/assessment/util/QTIUtil.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    ./src/java/org/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
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -35
    • +13
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentSessionDAOHibernate.java
    • -41
    • +73
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/OptionDTO.java
    • -70
    • +73
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -5
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
    • -12
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/TblAssessmentQuestionDTO.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/UserSummaryItem.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -376
    • +23
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -248
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionOption.java
    • -23
    • +43
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
  16. … 66 more files in changeset.
Tuesday 30 Apr 2019
5:31 am

Andrey Balan

LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

Options
    • -17
    • +17
    ./web/common/authoringQuestionHeader.jsp
    • -13
    • +22
    ./web/includes/css/addQuestion.scss
    • -2
    • +34
    ./web/includes/javascript/authoring-question.js
    • -6
    • +10
    ./web/pages/authoring/parts/addessay.jsp
    • -13
    • +14
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -8
    • +14
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -8
    • +16
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -9
    • +19
    ./web/pages/authoring/parts/addnumerical.jsp
    • -7
    • +13
    ./web/pages/authoring/parts/addordering.jsp
    • -8
    • +16
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -12
    • +19
    ./web/pages/authoring/parts/addtruefalse.jsp
    • -1
    • +3
    ./web/pages/authoring/parts/optionlist.jsp
  13. … 1 more file in changeset.
Thursday 25 Apr 2019
5:04 am

Andrey Balan

LDEV-4814 Wrap text properly in jqGrid

Move responsible CSS rules to the _learner_base.scss, so it affects all

jqGrid instances.

Options
    • -5
    • +0
    ./web/includes/css/monitoring.scss
    • -1
    • +0
    ./web/pages/monitoring/monitoring.jsp
    • -1
    • +0
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +0
    ./web/pages/monitoring/parts/usersummary.jsp
  5. … 4 more files in changeset.
Wednesday 24 Apr 2019
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -3
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +8
    ./web/pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/masterDetailLoadUp.jsp
    • -17
    • +9
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -19
    • +8
    ./web/pages/monitoring/parts/usersummary.jsp
    • -12
    • +16
    ./web/pages/monitoring/summary.jsp
  7. … 22 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
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
Thursday 18 Apr 2019
4:45 am

Andrey Balan

LDEV-4765 UI improvements

* Use switches instead of checkboxes

* Properly use toggle in Mark hedging question type

Options
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +62
    ./web/includes/css/addQuestion.scss
    • -0
    • +28
    ./web/includes/css/bootstrap-toggle.scss
    • -0
    • +9
    ./web/includes/javascript/bootstrap-toggle.js
    • -6
    • +12
    ./web/pages/authoring/parts/addessay.jsp
    • -66
    • +13
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -4
    • +10
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -12
    • +24
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +5
    ./web/pages/authoring/parts/addnumerical.jsp
    • -2
    • +5
    ./web/pages/authoring/parts/addordering.jsp
    • -3
    • +6
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -3
    • +6
    ./web/pages/authoring/parts/addtruefalse.jsp
    • -1
    • +2
    ./web/pages/authoring/parts/optionhedgingmark.jsp
    • -74
    • +4
    ./web/pages/authoring/parts/optionlist.jsp
Wednesday 17 Apr 2019
5:28 am

Andrey Balan

LDEV-4765 UI improvements

* Show CKEditor placeholder properly in cases when it's initially not

blank

* Proper transition on expanding/collapsing options

Options
    • -0
    • +3
    ./web/includes/css/addQuestion.scss
    • -1
    • +1
    ./web/pages/authoring/parts/optionhedgingmark.jsp
    • -6
    • +18
    ./web/pages/authoring/parts/optionlist.jsp
  4. … 1 more file in changeset.
Friday 05 Apr 2019
5:13 pm

Ernie Ghiglione

LDEV-4769 Updating labels

English and Español

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
5:09 pm

Ernie Ghiglione

LDEV-4769 Updating labels

English and Español

Options
    • -3
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +10
    ./conf/language/lams/ApplicationResources_es_ES.properties
Wednesday 03 Apr 2019
6:38 am

Andrey Balan

LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

Options
    • -1
    • +13
    ./web/WEB-INF/tags/CKEditor.tag
    • -11
    • +41
    ./web/includes/css/addQuestion.scss
    • -5
    • +0
    ./web/includes/css/assessment.scss
    • -6
    • +5
    ./web/includes/javascript/authoring-options.js
    • -14
    • +23
    ./web/pages/authoring/parts/addessay.jsp
    • -5
    • +8
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -12
    • +20
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -45
    • +50
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -12
    • +20
    ./web/pages/authoring/parts/addnumerical.jsp
    • -12
    • +20
    ./web/pages/authoring/parts/addordering.jsp
    • -20
    • +31
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -12
    • +20
    ./web/pages/authoring/parts/addtruefalse.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/numericaloption.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/option.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/optionhedgingmark.jsp
  16. … 4 more files in changeset.
Wednesday 27 Mar 2019
7:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 85 more files in changeset.
Tuesday 26 Mar 2019
3:52 am

Andrey Balan

LDEV-4794 TBLmonitor display question numbering only if setting is ON

Options
    • -1
    • +6
    ./web/pages/tblmonitoring/assessment.jsp
Monday 25 Mar 2019
8:07 am

Ernie Ghiglione

LDEV-4739 Updating translations

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 8 more files in changeset.
Tuesday 19 Mar 2019
1:57 am

Andrey Balan

Merge branch 'LDEV-4765' into LDEV-4777

Options
    • -73
    • +9
    ./src/java/org/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -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
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -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
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -0
    • +17
    ./web/pages/authoring/parts/questionlist.jsp
  3. … 13 more files in changeset.
Tuesday 12 Mar 2019
10:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 62 more files in changeset.
Thursday 28 Feb 2019
3:13 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

Options
    • -3
    • +2
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 34 more files in changeset.
10:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -1
    • +0
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -9
    • +1
    ./web/common/header.jsp
    • -9
    • +1
    ./web/common/tabbedheader.jsp
    • -14
    • +28
    ./web/pages/authoring/advance.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -2
    • +2
    ./web/pages/monitoring/statisticpart.jsp
    • -5
    • +5
    ./web/pages/tblmonitoring/assessment.jsp
    • -3
    • +3
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -3
    • +3
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  10. … 35 more files in changeset.
Tuesday 26 Feb 2019
5:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Fixing responsive behaviour on front page and tabs.

Options
    • -5
    • +7
    ./web/WEB-INF/tags/Tabs.tag
  2. … 43 more files in changeset.
Monday 25 Feb 2019
3:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tablesorter, Learner Progress Bar tweaked

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +1
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TSTable.tag
  4. … 120 more files in changeset.
Friday 22 Feb 2019
7:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -6
    • +19
    ./web/WEB-INF/tags/Page.tag
  2. … 50 more files in changeset.
Friday 15 Feb 2019
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Togglebutton and checkbox css functional

Options
    • -3
    • +4
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +7
    ./web/WEB-INF/tags/headItems.tag
  3. … 81 more files in changeset.
Thursday 14 Feb 2019
11:21 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

Options
    • -26
    • +23
    ./web/pages/learning/learning.jsp
    • -29
    • +9
    ./web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    ./web/pages/learning/results/ordering.jsp
  4. … 1 more file in changeset.
10:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -5
    • +5
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -9
    • +9
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +2
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -8
    • +6
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -4
    • +4
    ./web/WEB-INF/tags/TextSearch.tag
    • -0
    • +14
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/pages/authoring/parts/optionlist.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/overallfeedbacklist.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/questionlist.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/questionlistRestricted.jsp
    • -1
    • +1
    ./web/pages/learning/parts/essay.jsp
    • -1
    • +1
    ./web/pages/learning/parts/markhedging.jsp
    • -1
    • +1
    ./web/pages/learning/parts/matchingpairs.jsp
    • -1
    • +1
    ./web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    ./web/pages/learning/parts/numerical.jsp
  16. … 377 more files in changeset.
Tuesday 12 Feb 2019
10:17 am

Ernie Ghiglione

LDEV-4587 LDEV-4607 Adding missing labels

Options
    • -4
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -56
    • +9
    ./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
    • -29
    • +9
    ./web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    ./web/pages/learning/results/ordering.jsp
  8. … 1 more file in changeset.
6:58 am

Andrey Balan

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

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -56
    • +9
    ./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
    • -29
    • +9
    ./web/pages/learning/parts/ordering.jsp
    • -6
    • +0
    ./web/pages/learning/results/ordering.jsp
  8. … 1 more file in changeset.