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
Thursday 14 Feb 2019
4: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.
3: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
3: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
Monday 11 Feb 2019
11:58 pm

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.
11:58 pm

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.
Sunday 10 Feb 2019
1:06 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tour and portrait pop ups appear correctly.

Options
    • -9
    • +10
    ./web/WEB-INF/tags/Tab.tag
  2. … 43 more files in changeset.
8:31 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
Friday 08 Feb 2019
2:40 pm

Andrey Balan

LDEV-4765 Fixed essay's slider CSS and validation

Options
    • -4
    • +9
    ./web/includes/css/addQuestion.scss
    • -5
    • +13
    ./web/pages/authoring/parts/addessay.jsp
Thursday 07 Feb 2019
10:50 pm

Andrey Balan

LDEV-4765 Experimental switch and radio button for Mark hedging question

Also several other CSS and JS fixes.

Options
    • -1
    • +10
    ./web/includes/css/addQuestion.scss
    • -65
    • +65
    ./web/pages/authoring/parts/addessay.jsp
    • -52
    • +127
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -43
    • +43
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -61
    • +61
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -1
    • +1
    ./web/pages/authoring/parts/addnumerical.jsp
    • -1
    • +0
    ./web/pages/authoring/parts/addordering.jsp
    • -4
    • +4
    ./web/pages/authoring/parts/numericaloption.jsp
    • -6
    • +12
    ./web/pages/authoring/parts/optionhedgingmark.jsp
    • -4
    • +4
    ./web/pages/authoring/parts/unitlist.jsp
9:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page functional

Options
    • -2
    • +2
    ./web/WEB-INF/tags/SimplePanel.tag
  2. … 35 more files in changeset.
Wednesday 06 Feb 2019
9:52 pm

Andrey Balan

LDEV-4765 Apply new UI to other question types

Options
    • -7
    • +11
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    ./web/WEB-INF/tags/CKEditor.tag
    • -0
    • +18
    ./web/common/authoringQuestionHeader.jsp
    • -7
    • +241
    ./web/includes/css/addQuestion.scss
    • -59
    • +0
    ./web/includes/javascript/assessmentoption.js
    • -0
    • +136
    ./web/includes/javascript/authoring-options.js
    • -0
    • +48
    ./web/includes/javascript/authoring-question.js
    • -96
    • +96
    ./web/pages/authoring/parts/addessay.jsp
    • -141
    • +105
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -116
    • +91
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -497
    • +154
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -144
    • +109
    ./web/pages/authoring/parts/addnumerical.jsp
    • -126
    • +93
    ./web/pages/authoring/parts/addordering.jsp
    • -116
    • +93
    ./web/pages/authoring/parts/addshortanswer.jsp
    • -104
    • +88
    ./web/pages/authoring/parts/addtruefalse.jsp
  16. … 9 more files in changeset.
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./web/WEB-INF/tags/DefineLater.tag
    • -36
    • +18
    ./web/WEB-INF/tags/Page.tag
    • -4
    • +4
    ./web/WEB-INF/tags/SimplePanel.tag
    • -1
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -0
    • +1
    ./web/common/header.jsp
    • -0
    • +1
    ./web/common/tabbedheader.jsp
    • -3
    • +3
    ./web/pages/authoring/advance.jsp
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
    • -4
    • +4
    ./web/pages/authoring/importQuestions.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addessay.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addmarkhedging.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addmatchingpairs.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addnumerical.jsp
  16. … 492 more files in changeset.
Friday 01 Feb 2019
3:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -2
    • +5
    ./web/WEB-INF/tags/Tab.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabBody.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabBodyArea.tag
    • -36
    • +27
    ./web/WEB-INF/tags/Tabs.tag
    • -0
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/common/header.jsp
    • -1
    • +1
    ./web/common/tabbedheader.jsp
  8. … 309 more files in changeset.
Thursday 31 Jan 2019
1:09 am

Andrey Balan

LDEV-4765 Add sorting of the question answers

Also some other improvements.

Options
    • -73
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
    • -55
    • +1
    ./web/includes/javascript/assessmentoption.js
    • -62
    • +96
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/option.jsp
    • -52
    • +36
    ./web/pages/authoring/parts/optionlist.jsp
  7. … 2 more files in changeset.
Tuesday 29 Jan 2019
9:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4760 Fixed spacing in authoring criteria entry panel

Options
    • -2
    • +4
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 32 more files in changeset.
Sunday 27 Jan 2019
3:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Head.tag
    • -38
    • +30
    ./web/WEB-INF/tags/Page.tag
  3. … 262 more files in changeset.
Saturday 26 Jan 2019
7:35 am

Marcin Cieslak

Merge ordered branching LDEV-4587 into develop

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -23
    • +101
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
  5. … 20 more files in changeset.
Friday 25 Jan 2019
7:07 pm

Andrey Balan

LDEV-4765 introducing new question authoring UI

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./web/WEB-INF/tags/CKEditor.tag
    • -26
    • +38
    ./web/includes/javascript/assessmentoption.js
    • -68
    • +349
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    ./web/pages/authoring/parts/option.jsp
    • -4
    • +22
    ./web/pages/authoring/parts/optionlist.jsp
  7. … 7 more files in changeset.
7:07 pm

Andrey Balan

QB_UI introducing new question authoring UI

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./web/WEB-INF/tags/CKEditor.tag
    • -26
    • +38
    ./web/includes/javascript/assessmentoption.js
    • -68
    • +350
    ./web/pages/authoring/parts/addmultiplechoice.jsp
    • -20
    • +22
    ./web/pages/authoring/parts/option.jsp
    • -4
    • +30
    ./web/pages/authoring/parts/optionlist.jsp
  7. … 7 more files in changeset.
Monday 07 Jan 2019
11:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -1
    • +1
    ./build.properties
    • -18
    • +22
    ./db/sql/create_lams_tool_assessment.sql
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130216.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20131118.sql
    • -20
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140101.sql
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140102.sql
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140428.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140612.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140707.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150706.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150928.sql
  16. … 115 more files in changeset.
Wednesday 02 Jan 2019
12:16 pm

Andrey Balan

LDEV-4719 Remove incorrect warning for numerical question's units

Options
    • -1
    • +1
    ./web/pages/authoring/parts/unitlist.jsp
Friday 28 Dec 2018
4:18 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Assessment

Updating English, Spanish and Greek

Options
    • -10
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_es_ES.properties
Friday 21 Dec 2018
12:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -5
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 20 more files in changeset.
Thursday 20 Dec 2018
9:47 pm

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -16
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +1
    ./web/pages/learning/notebook.jsp
    • -1
    • +1
    ./web/pages/learning/results.jsp
    • -1
    • +1
    ./web/pages/learning/submissionDeadline.jsp
  7. … 137 more files in changeset.
7:05 pm

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -69
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceProxy.java
  2. … 51 more files in changeset.
Friday 14 Dec 2018
7:48 am

Marcin Cieslak

LDEV-4735 Fix an URL in learning outcomes in authoring

Options
    • -1
    • +1
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 31 more files in changeset.
Thursday 06 Dec 2018
7:50 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Options
    • -2
    • +2
    ./web/pages/tblmonitoring/assessment.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  4. … 12 more files in changeset.
7:19 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4569: simple TBL UI adjustments

Options
    • -2
    • +2
    ./web/pages/tblmonitoring/assessment.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  4. … 5 more files in changeset.
Wednesday 05 Dec 2018
12:27 pm

Marcin Cieslak

LDEV-4708 Fix a merge issue

Options
    • -5
    • +1
    ./web/pages/learning/results.jsp
Tuesday 04 Dec 2018
6:37 pm

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from web.xml

Options
    • -6
    • +0
    ./web/WEB-INF/web.xml
  2. … 30 more files in changeset.