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
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
    ./src/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
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +19
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/GradeStatsDTO.java
    • -0
    • +79
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    ./web/pages/learning/learning.jsp
    • -15
    • +66
    ./web/pages/monitoring/summary.jsp
  8. … 5 more files in changeset.
12:44 pm

Ernie Ghiglione

LDEV-5143 and LDEV-5140 labels updates

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 19 more files in changeset.
5:40 am

Marcin Cieslak

LDEV-5159 Refresh Assessment monitoring after leader change

Options
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -2
    • +2
    ./web/pages/monitoring/summary.jsp
  4. … 19 more files in changeset.
Friday 29 Jan 2021
7:19 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -56
    • +96
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -8
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
11:42 am

Ernie Ghiglione

LDEV-4769 Update Norwegian, Spanish, English, Greek, German, French

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +7
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 19 more files in changeset.
12:42 am

Marcin Cieslak

LDEV-5143 Allow changing leader if activity is not grouped

Options
    • -20
    • +30
    ./web/pages/monitoring/summary.jsp
  2. … 4 more files 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
    ./src/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
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -14
    • +19
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  4. … 31 more files in changeset.
1:57 pm

Marcin Cieslak

LDEV-3387 Filter textarea data before (auto)save answers

This solution is nicer and consistent with Q&A tool.

Options
    • -6
    • +4
    ./web/pages/learning/learning.jsp
12:01 am

Marcin Cieslak

LDEV-3387 Filter textarea data before (auto)save answers

Until now lams:textarea JS function was run only on textarea "change"

event. This event is run when the input looses focus. If an user keeps

writing in the same textare and autosave or time expired autosubmit

kicks in, data in the hidden input is not refreshed. Old data is sent

and stored in DB.

Now the data is refreshed before autosave and submit.

Options
    • -3
    • +13
    ./web/pages/learning/learning.jsp
    • -0
    • +1
    ./web/pages/learning/parts/markhedging.jsp
Sunday 24 Jan 2021
10:59 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -4
    • +7
    ./web/pages/learning/waitforleader.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  5. … 12 more files in changeset.
Friday 22 Jan 2021
10:37 am

Ernie Ghiglione

LDEV-5151 cosmetic changes to tables in Analytics tab

Options
    • -149
    • +194
    ./web/pages/monitoring/statisticpart.jsp
Thursday 21 Jan 2021
2:37 pm

Marcin Cieslak

LDEV-5151 Add Boostrap tooltips to Item Analysis section

Options
    • -0
    • +3
    ./web/pages/monitoring/monitoring.jsp
    • -4
    • +5
    ./web/pages/monitoring/statisticpart.jsp
9:47 am

Ernie Ghiglione

LDEV-4769 Update Norwegian

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 1 more file in changeset.
9:45 am

Ernie Ghiglione

LDEV-5151 adding and adjusting labels

Options
    • -7
    • +11
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +11
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
9:42 am

Ernie Ghiglione

LDEV-5151 Adding extra contextual info for item analytics

Options
    • -4
    • +8
    ./web/pages/monitoring/statisticpart.jsp
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
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -11
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -75
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +148
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/GradeStatsDTO.java
    • -82
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/LeaderResultsDTO.java
    • -121
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -60
    • +22
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -15
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -12
    • +54
    ./web/pages/monitoring/statisticpart.jsp
Tuesday 19 Jan 2021
9:10 pm

Marcin Cieslak

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

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +34
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -16
    • +66
    ./web/pages/monitoring/statisticpart.jsp
1:14 am

Marcin Cieslak

LDEV-5143 Change Leader in Assessment

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java
    • -0
    • +62
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    ./web/pages/learning/learning.jsp
    • -0
    • +40
    ./web/pages/monitoring/summary.jsp
  8. … 1 more file in changeset.
Thursday 14 Jan 2021
3:28 pm

Ernie Ghiglione

LDEV-4769 Updating English, Norwegian and Greek

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 7 more files in changeset.
Wednesday 13 Jan 2021
2:43 pm

Marcin Cieslak

LDEV-5101 Populate question version in all cases.

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
2:43 pm

Marcin Cieslak

LDEV-5101 Fix stats link.

Options
    • -2
    • +2
    ./web/pages/authoring/parts/questionlist.jsp
  2. … 1 more file in changeset.
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
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
  2. … 2 more files in changeset.
Tuesday 05 Jan 2021
12:34 am

Marcin Cieslak

LDEV-5009 Fix Assessment monitoring if there are no questions added

Options
    • -0
    • +3
    ./web/pages/monitoring/parts/mcqStudentChoices.jsp
    • -20
    • +25
    ./web/pages/monitoring/summary.jsp
Monday 04 Jan 2021
2:43 pm

Marcin Cieslak

LDEV-5097 Skip empty sessions for rating calculation

Options
    • -16
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +11
    ./web/pages/learning/results/essay.jsp
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
    • -5
    • +25
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./db/sql/create_lams_tool_assessment.sql
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -425
    • +715
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +62
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -40
    • +109
    ./web/pages/authoring/parts/questionlist.jsp
    • -15
    • +55
    ./web/pages/monitoring/summary.jsp
  9. … 22 more files in changeset.
Monday 28 Dec 2020
7:26 pm

Marcin Cieslak

LDEV-5097 Skip empty sessions for rating calculation

Options
    • -22
    • +35
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +2
    ./web/pages/learning/results/essay.jsp
Saturday 26 Dec 2020
7:24 pm

Marcin Cieslak

LDEV-5097 Skip empty sessions for rating calculation

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java