lams-github / lams_tool_assessment / web / pages / learning / parts

matchingpairs.jsp

Clone Tools

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 17 Sep 23
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
Sunday 17 Sep 2023
3:49 am

Andrey Balan

LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 105 more files in changeset.
Thursday 07 Sep 2023
12:28 am

Andrey Balan

LDEV-5397 migrate Assessment's learning to Bootstrap 5

Options
    • -26
    • +29
    ./matchingpairs.jsp
  2. … 34 more files in changeset.
Wednesday 02 Feb 2022
12:53 pm

Marcin Cieslak

LDEV-4385 List possible and chosen matching pairs answers

Options
    • -0
    • +9
    ./matchingpairs.jsp
  2. … 3 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

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
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 54 more files in changeset.
Friday 14 Jun 2019
7:11 am

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
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 94 more files in changeset.
Tuesday 07 May 2019
11:11 pm

Andrey Balan

LDEV-4746 Migrate Assessment to QB

Options
    • -3
    • +3
    ./matchingpairs.jsp
  2. … 80 more files in changeset.
Friday 15 Mar 2019
3:32 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 5 more files in changeset.
3:32 pm

Andrey Balan

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

(cherry picked from commit d70c019fa4fcaff50a36c3c343e654a738751e86)

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 5 more files in changeset.
Thursday 14 Feb 2019
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 391 more files in changeset.
Friday 07 Sep 2018
1:55 pm

Andrey Balan

LDEV-4440 Assessment noStruts

Options
    • -6
    • +7
    ./matchingpairs.jsp
  2. … 74 more files in changeset.
Thursday 20 Apr 2017
5:27 pm

Andrey Balan

LDEV-4326 Matching pairs answer options should be sorted alphanumerically

Options
    • -2
    • +8
    ./matchingpairs.jsp
  2. … 3 more files in changeset.
Friday 17 Mar 2017
7:03 pm

Andrey Balan

LDEV-4271 Refactor Assessment code * use DTO instead of model classes for carrying interim information * split learning.jsp into two pages: actual learning.jsp where user enters his answers and results.jsp where we display results to him

Options
    • -17
    • +3
    ./matchingpairs.jsp
  2. … 44 more files in changeset.
Thursday 10 Mar 2016
5:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3716: Tweaked colours to match and switched images to font awesome

Options
    • -2
    • +2
    ./matchingpairs.jsp
  2. … 9 more files in changeset.
Monday 07 Mar 2016
10:17 pm

Andrey Balan

LDEV-3716 Update Assessment learner to bootstrap

Options
    • -29
    • +31
    ./matchingpairs.jsp
  2. … 23 more files in changeset.
Saturday 26 Jul 2014
2:00 am

Andrey Balan

LDEV-3274 Ability to set min and max amount of words limit for essay type of questions

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 22 more files in changeset.
Saturday 28 Jun 2014
1:18 am

Andrey Balan

LDEV-3252 Fixed Assessment individual mark showing incorrectly * moved CSS properties to separate file * slightly improved CSS

Options
    • -7
    • +7
    ./matchingpairs.jsp
  2. … 19 more files in changeset.
Tuesday 22 Apr 2014
12:14 am

Andrey Balan

LDEV-3173 * Prevent Assessment Tool from creating excessive amount of question and option results on doing autosave * renaming AssessmentQuestion.questionOptions --> AssessmentQuestion.options

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 11 more files in changeset.
Wednesday 08 Jan 2014
6:50 pm

Andrey Balan

LDEV-3155 Added leader aware feature

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 95 more files in changeset.
Tuesday 02 Mar 2010
2:10 pm

Andrey Balan

LDEV-2516 Show wrong and right answers separately (merge from lams2_3_release branch to HEAD)

Options
    • -5
    • +7
    ./matchingpairs.jsp
  2. … 13 more files in changeset.
Tuesday 10 Mar 2009
10:39 pm

Andrey Balan

LDEV-2114 Learning

* several bug fixes

* "History of Responses" added

* time limitation

Options
    • -3
    • +3
    ./matchingpairs.jsp
  2. … 29 more files in changeset.
Friday 06 Mar 2009
5:15 pm

Andrey Balan

LDEV-2114 Learning

fixing small bugs

Options
    • -5
    • +0
    ./matchingpairs.jsp
  2. … 16 more files in changeset.
Thursday 05 Mar 2009
4:37 pm

Andrey Balan

LDEV-2114 Learning

* processing of penalties and total grades

* corrected attempt's start time and finish time

* added attempt summary

* overall feedbacks

* implemented options from advanced tab

Options
    • -2
    • +2
    ./matchingpairs.jsp
  2. … 21 more files in changeset.
Wednesday 04 Mar 2009
7:06 pm

Andrey Balan

LDEV-2114 Learning

fixes to assessment tool:

* added numbering offset to the question list

* shuffle questions and their options

* matching pairs' <select> is also shuffled now

* fixed assessment of ordering question type

* improved short answer and numerical jsps

* short answer now supports wildcard "*"

* "Notify teacher after student completes attempt" implemented

Options
    • -1
    • +1
    ./matchingpairs.jsp
  2. … 10 more files in changeset.
Monday 02 Mar 2009
11:58 pm

Andrey Balan

LDEV-2114 * support for a whole new control flow * a lot of refactoring connected with this * changed structure of DTO objects * available to store multiple attempts * changed "Attempts allowed" default value to 1

Options
    • -3
    • +3
    ./matchingpairs.jsp
  2. … 32 more files in changeset.
Wednesday 25 Feb 2009
11:16 pm

Andrey Balan

LDEV-2114 Learning main features implemented

Options
    • -0
    • +40
    ./matchingpairs.jsp
  2. … 55 more files in changeset.