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
Wednesday 13 Jan 2021
2:43 pm

Marcin Cieslak

LDEV-5101 Populate question version in all cases.

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
Tuesday 12 Jan 2021
1:42 am

Marcin Cieslak

LDEV-5025, LDEV-5120 Softly remove duplicate rating criteria

For Assessment and Dokumaran we only allow one rating criterion each. On

high load, after a gate was opened, there is a chance that 2 learners

will detect no criteria and both will create one, resulting a duplicate

criterion. Instead of throwing a hard exception and rendering the

activity unusable, just remove the duplicate criterion ignoring any

exceptions. This is lighter than having a multi-node synchronization.

Options
    • -2
    • +12
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 2 more files in changeset.
Monday 04 Jan 2021
2:43 pm

Marcin Cieslak

LDEV-5097 Skip empty sessions for rating calculation

Options
    • -16
    • +5
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 1 more file in changeset.
Wednesday 30 Dec 2020
5:05 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

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/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -16
    • +0
    ./lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -425
    • +715
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +12
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +62
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  5. … 26 more files in changeset.
Monday 28 Dec 2020
7:26 pm

Marcin Cieslak

LDEV-5097 Skip empty sessions for rating calculation

Options
    • -22
    • +35
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 1 more file in changeset.
Saturday 26 Dec 2020
7:24 pm

Marcin Cieslak

LDEV-5097 Skip empty sessions for rating calculation

Options
    • -0
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
Sunday 20 Dec 2020
1:57 am

Marcin Cieslak

LDEV-5138 Set leader only on his activity entry, not on any user entry

Options
    • -12
    • +4
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 26 more files in changeset.
Wednesday 16 Dec 2020
1:41 am

Marcin Cieslak

LDEV-5128 Match VS answers more loosely

Remove all characters other than letters and numbers when matching

answers.

Options
    • -2
    • +6
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -43
    • +42
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +14
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
  4. … 3 more files in changeset.
Sunday 13 Dec 2020
11:28 pm

Marcin Cieslak

LDEV-5124 Correctly order results in Summary By Learner export

Options
    • -2
    • +8
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
11:17 pm

Marcin Cieslak

LDEV-4520 Correctly order question in TBL monitor iRAT student choices

Options
    • -2
    • +5
    ./lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -3
    • +5
    ./lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
10:53 pm

Marcin Cieslak

LDEV-5041 Do not export students' time limit adjustments in Assessment

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Tuesday 01 Dec 2020
8:58 pm

Marcin Cieslak

LDEV-4944 Recalculate Scratchie marks only for given VSA answer

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -22
    • +23
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  3. … 6 more files in changeset.
8:15 pm

Marcin Cieslak

LDEV-4944 Synchronise only answer allocation

Mark recalculation can run in parallel.

Options
    • -80
    • +70
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +6
    ./lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +12
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Monday 30 Nov 2020
7:35 pm

Marcin Cieslak

LDEV-4944 Recalculate marks only for learners with matching VSA answer

Recalculating all results bound to a given QB question is an enormous

job. We need to focus on results that actually changed.

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -3
    • +15
    ./lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -19
    • +21
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
7:31 pm

Marcin Cieslak

LDEV-4944 Synchronise VSA answer allocation

We need to synchronise this operation.

When multiple requests are made to modify the same option, for example

to add a VSA answer, we have a case of dirty reads. One answer gets

added, but while DB is still flushing, another answer reads the option

without the first answer, because it is not there yet.

The second answer gets added, but the first one gets lost.

We can not synchronise the method in service as the "dirty" transaction

is already started before synchronisation kicks in.

We do it in MonitoringController, before transaction starts.

It will not work for distributed environment, though.

If teachers allocate answers on different LAMS servers, we can still get

the same problem. We will need a more sophisticated solution then.

Options
    • -2
    • +21
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Saturday 28 Nov 2020
12:05 am

Marcin Cieslak

LDEV-3261 Correctly order question in Assessment monitoring summary

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Friday 27 Nov 2020
2:15 pm

Marcin Cieslak

LDEV-5124, LDEV-2169 Put correct time and answer in learner history

Options
    • -2
    • +1
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +9
    ./lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  3. … 2 more files in changeset.
2:01 pm

Marcin Cieslak

LDEV-5124, LDEV-3173 Fix answer print out in user response history

Options
    • -1
    • +6
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
1:43 pm

Marcin Cieslak

LDEV-5124 Add question numbering in front of title

Options
    • -0
    • +4
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Thursday 26 Nov 2020
4:23 pm

Marcin Cieslak

LDEV-5124 Fix result ordering when generating Assessment Excel report

Options
    • -12
    • +2
    ./lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -0
    • +4
    ./lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
  3. … 2 more files in changeset.
Wednesday 25 Nov 2020
9:04 pm

Marcin Cieslak

LDEV-5124 Add i18n labels instead of hardcoded ones

Options
    • -9
    • +10
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 1 more file in changeset.
7:52 pm

Marcin Cieslak

LDEV-5124 Put empty rows between each group, not each user

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
7:50 pm

Marcin Cieslak

LDEV-5124 Fix putting interaction time when no answer was provided

Options
    • -27
    • +28
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
7:49 pm

Marcin Cieslak

LDEV-5124 Fix empty cell highlighting in Assessment Excel export

Options
    • -171
    • +179
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -28
    • +29
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
Tuesday 24 Nov 2020
11:31 pm

Marcin Cieslak

LDEV-5124 Highlight cell with correct true/false answer

Options
    • -2
    • +5
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
11:13 pm

Marcin Cieslak

LDEV-5124 Add new format of user summary in Assessment Excel export

Options
    • -0
    • +3
    ./lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -133
    • +309
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -35
    • +57
    ./lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
  4. … 6 more files in changeset.
Monday 23 Nov 2020
5:45 pm

Marcin Cieslak

LDEV-5121 Fix checking if TBL question needs to be added to collection

Options
    • -2
    • +4
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
4:36 pm

Marcin Cieslak

LDEV-5123 Log learner interaction with questions in Assessment

Options
    • -0
    • +20
    ./lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 8 more files in changeset.
Sunday 22 Nov 2020
5:02 am

Marcin Cieslak

LDEV-5121 Add TBL template imported questions to chosen QB collection

Options
    • -8
    • +20
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 7 more files in changeset.
Saturday 21 Nov 2020
6:16 pm

Marcin Cieslak

Merge branch 'LDEV-5101' into v4.0

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -0
    • +15
    ./lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 9 more files in changeset.