lams-github / lams_tool_assessment

src

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 10 Feb 2021
11:49 pm

Marcin Cieslak

LDEV-5142 Extract logic for time limit servers

The abstract class can then be used in other tools with time limits

feature.

Options
    • -4
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -4
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -239
    • +42
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
  5. … 2 more files in changeset.
Monday 08 Feb 2021
8:24 pm

Marcin Cieslak

LDEV-5144 Make iRAT compatible with new AE tab flow

Options
    • -20
    • +10
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  2. … 5 more files in changeset.
7:23 pm

Marcin Cieslak

LDEV-5144 Extract AE tab management to TBL monitoring

Not every AE tab will be an Assessment, so we need tabs to be

independent on their content.

Options
    • -12
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  2. … 10 more files in changeset.
Tuesday 02 Feb 2021
12:00 am

Marcin Cieslak

LDEV-5162 Fix Ordering answers saving to DB

To reflect an order that a learner put his answers, a TreeSet was used.

Its comparing function uses displayOrder.

It works fine when elements are put into the set during the first save,

i.e. the first autosave or a submit before the first autosave.

But when another save occurs (another autosave or a submit after the

first autosave), the set of answers is not recreated. Only displayOrder

of answers is modified. But TreeSet is not aware of it and keeps old

ordering. The iteration that happens during the save picks up answers in

the old order.

The fix uses real displayOrder value instead of counting on correct

order in TreeSet.

Another solution would be to rebuild the set after modifying answers'

displayOrder.

Options
    • -2
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Monday 01 Feb 2021
9:11 pm

Marcin Cieslak

Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

Options
    • -0
    • +19
    ./java/org/lamsfoundation/lams/tool/assessment/dto/GradeStatsDTO.java
    • -0
    • +79
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +20
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  5. … 8 more files in changeset.
Saturday 30 Jan 2021
4:11 am

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -8
    • +18
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  3. … 20 more files in changeset.
Friday 29 Jan 2021
7:19 pm

Marcin Cieslak

LDEV-5148 Include average, median, mode into export summary sheet

Options
    • -3
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -56
    • +96
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -8
    • +3
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  7. … 1 more file in changeset.
Thursday 28 Jan 2021
2:21 pm

Marcin Cieslak

LDEV-4813 Add a missing index on Assessment Result table

It is vital for fetching VSA questions and confidence levels.

Options
    • -0
    • +16
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20210127.sql
Monday 25 Jan 2021
6:28 pm

Marcin Cieslak

LDEV-5143 Allow changing leader in Q&A, Submit Files and Vote monitoring

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -14
    • +19
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 32 more files in changeset.
Sunday 24 Jan 2021
10:59 pm

Marcin Cieslak

LDEV-5143 Improve layout of wait for leader and change leader screens.

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 15 more files in changeset.
Wednesday 20 Jan 2021
6:54 pm

Marcin Cieslak

LDEV-5147 Add median and modes to Assessment stats tab in monitoring

Rewrite DTO entities to be more universal and to accommodate manual

calculation of stats.

Options
    • -11
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -75
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +148
    ./java/org/lamsfoundation/lams/tool/assessment/dto/GradeStatsDTO.java
    • -82
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java
    • -121
    • +0
    ./java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -60
    • +22
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -15
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  9. … 2 more files in changeset.
Tuesday 19 Jan 2021
9:10 pm

Marcin Cieslak

LDEV-5146 Add activity stats on top of group stats in Assessment monitor

Options
    • -0
    • +5
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +34
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +24
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  6. … 2 more files in changeset.
1:14 am

Marcin Cieslak

LDEV-5143 Change Leader in Assessment

Options
    • -3
    • +11
    ./java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -0
    • +62
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +8
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  5. … 4 more files in changeset.
Wednesday 13 Jan 2021
2:43 pm

Marcin Cieslak

LDEV-5101 Populate question version in all cases.

Options
    • -0
    • +2
    ./java/org/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
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -425
    • +715
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +12
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +62
    ./java/org/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
    ./java/org/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
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -43
    • +42
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +14
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -3
    • +5
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -22
    • +23
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +6
    ./java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +12
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -3
    • +15
    ./java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -19
    • +21
    ./java/org/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
    ./java/org/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
    ./java/org/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
    ./java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
  3. … 2 more files in changeset.