lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 30 Dec 2021
5:09 pm

Marcin Cieslak

LDEV-5273 Do not show blank VS answers for allocation

Options
    • -2
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
11:02 am

Ernie Ghiglione

LDEV-5276 includes labels for text content templates

Options
    • -2
    • +2
    /lams_central/web/ckeditor/plugins/bootpanel/lang/en.js
    • -8
    • +9
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/en.js
    • -30
    • +31
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/es.js
    • -0
    • +1
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/gr.js
    • -0
    • +1
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/ru.js
    • -2
    • +2
    /lams_central/web/ckeditor/plugins/table/dialogs/table.js
    • -1
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
    • -0
    • +13
    /lams_www/web/public/ckeditor-templates/bootsnippets.js
    • -0
    • +1
    /lams_www/web/public/ckeditor-templates/images/labels.svg
Sunday 26 Dec 2021
1:18 am

Marcin Cieslak

LDEV-5273 Refresh leaders' page on VS answer allocation

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/VsaController.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -4
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -0
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
12:59 am

Marcin Cieslak

LDEV-5273 Add VSA allocate button to tRAT TBL monitoring

Options
    • -0
    • +8
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -8
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -2
    • +8
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
12:48 am

Marcin Cieslak

LDEV-5273 Identify correct VS attempts even if there are subsequent ones

If a student chose an unknown VS answer, it is marked as incorrect.

He/she makes more attempts. In the meantime a teacher marks that first

answer as correct. In that case the subsequent attempts are not deleted,

but are not calculated into the score for the question.

Options
    • -21
    • +28
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Saturday 25 Dec 2021
9:53 pm

Marcin Cieslak

LDEV-5273 Add VSA allocation to Scratchie

Options
    • -2
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/VsaController.java
    • -3
    • +3
    /lams_central/web/qb/vsa/vsaAllocate.jsp
    • -11
    • +19
    /lams_central/web/qb/vsa/vsaQuestionAllocate.jsp
    • -0
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/IQbDAO.java
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java
    • -6
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -36
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -10
    • +25
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
  16. … 3 more files in changeset.
Friday 24 Dec 2021
3:50 pm

Marcin Cieslak

LDEV-5273 Add central VSA UI button to iRAT TBL monitoring

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
3:36 pm

Marcin Cieslak

LDEV-5273 Remove single VSA allocation interface from Assessment

Since UI for VSA allocation moved to Central, it is more difficult to

make it embedded within a tools own monitoring interface. It is probably

not needed too - a well designed VSA allocation UI for all questions

should be sufficient.

Options
    • -6
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -18
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -15
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -7
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
3:32 pm

Marcin Cieslak

LDEV-5273 Move VSA allocation code to Central

Options
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +81
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/VsaController.java
    • -4
    • +4
    /lams_central/web/includes/javascript/vsaAllocate.js
    • -8
    • +13
    /lams_central/web/qb/vsa/vsaAllocate.jsp
    • -34
    • +40
    /lams_central/web/qb/vsa/vsaQuestionAllocate.jsp
    • -0
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java
    • -0
    • +97
    /lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonAssessmentService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -2
    • +28
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -4
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
  16. … 7 more files in changeset.
1:38 am

Marcin Cieslak

LDEV-5273 Move VSA allocation front end files to Central

Options
    • -0
    • +46
    /lams_central/web/css/vsaAllocate.css
    • -0
    • +83
    /lams_central/web/includes/javascript/vsaAllocate.js
    • -0
    • +64
    /lams_central/web/qb/vsa/vsaAllocate.jsp
    • -0
    • +142
    /lams_central/web/qb/vsa/vsaQuestionAllocate.jsp
    • -46
    • +0
    /lams_tool_assessment/web/includes/css/vsaAllocate.css
    • -83
    • +0
    /lams_tool_assessment/web/includes/javascript/vsaAllocate.js
    • -142
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/vsaQuestionAllocate.jsp
    • -64
    • +0
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
12:25 am

Marcin Cieslak

LDEV-5272 Add confirmation on removing VS answer from correct option

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    /lams_tool_assessment/web/includes/javascript/vsaAllocate.js
    • -1
    • +2
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -3
    • +6
    /lams_tool_assessment/web/pages/monitoring/parts/vsaQuestionAllocate.jsp
    • -1
    • +2
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
Thursday 23 Dec 2021
6:33 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.5' into v4.6

Options
Tuesday 21 Dec 2021
9:42 pm

Marcin Cieslak

LDEV-5272 Apply VSA UI improvements to single question summary page

Options
    • -1
    • +1
    /lams_tool_assessment/.gitignore
    • -3
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -39
    • +0
    /lams_tool_assessment/web/includes/css/addQuestion.css
    • -0
    • +46
    /lams_tool_assessment/web/includes/css/vsaAllocate.css
    • -0
    • +78
    /lams_tool_assessment/web/includes/javascript/vsaAllocate.js
    • -0
    • +2
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -132
    • +9
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -0
    • +139
    /lams_tool_assessment/web/pages/monitoring/parts/vsaQuestionAllocate.jsp
    • -276
    • +16
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
9:09 pm

Marcin Cieslak

LDEV-5272 Improve non-TBL VS answer allocation

Options
    • -12
    • +18
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
8:48 pm

Marcin Cieslak

LDEV-5272 Allow deallocating answers from VSA options

Also fix a bug: when a teacher allocates an answer, the learner's

question result UID was used. If the learner changed his/her answer

before teacher allocated it or refreshed the page, the new answer got

allocated while the teacher thought the old one was getting allocated.

Now all allocation happens based on real answer value.

Also recalculate scores on allocation even if a learner has not finished

the activity yet.

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -11
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -5
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -22
    • +90
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
6:30 pm

Marcin Cieslak

LDEV-5272 Add answer queue size next to its title

Options
    • -8
    • +15
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
6:04 pm

Marcin Cieslak

LDEV-5272 Limit height of VSA lists. Improve colouring.

Options
    • -3
    • +30
    /lams_tool_assessment/web/pages/monitoring/vsaAllocate.jsp
Monday 20 Dec 2021
9:28 am

Ernie Ghiglione

LDEV-5269 improve formating jlatexmath

Options
    • -3
    • +5
    /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
Sunday 19 Dec 2021
7:02 pm

Ernie Ghiglione

LDEV-5269 adding missing css to latex editor

Options
    • -1
    • +169
    /lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js
Saturday 18 Dec 2021
10:03 pm

Marcin Cieslak

Merge branch 'LDEV-5271' into v4.5

Options
10:02 pm

Marcin Cieslak

LDEV-5271 Check if VS answer is not already allocated to target option

Options
    • -19
    • +27
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
9:31 pm

Marcin Cieslak

LDEV-5271 Add extra logs for VS answer allocation

Options
    • -2
    • +7
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
9:30 pm

Marcin Cieslak

LDEV-5271 Add flushing to allocating VS answers

Updated options will be available quicker this way

Options
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
9:28 pm

Marcin Cieslak

LDEV-5271 Refactor code for VS answer allocation

Options
    • -38
    • +38
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
9:12 pm

Marcin Cieslak

LDEV-5271 Refactor code for checking if VS answer was allocated

Options
    • -25
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -4
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
8:52 pm

Marcin Cieslak

LDEV-5271 Correctly remove answer from previously allocated option

Options
    • -47
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
8:37 pm

Marcin Cieslak

LDEV-5271 Do not normalise VSA answer twice

Options
    • -14
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
6:36 pm

Marcin Cieslak

Merge branch 'LDEV-5269' into v4.6

Options
6:35 pm

Marcin Cieslak

LDEV-5269 Remove Image and iFrame CKEditor buttons

Introduce boostrap snippets buttons instead.

Clean up CKEditor configuration.

Options
    • -16
    • +16
    /lams_central/web/includes/javascript/ckconfig_custom.js
12:40 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.5' into v4.6

Options