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
Sunday 02 Jan 2022
8:25 pm

Marcin Cieslak

LDEV-5242 Merge changes from 4.5

Options
    • -0
    • +4
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
    • -59
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -137
    • +0
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
7:26 pm

Marcin Cieslak

Merge branch 'LDEV-5273' into v4.5

Options
7:20 pm

Marcin Cieslak

Merge branch 'LDEV-5242' into v4.6

Options
7:09 pm

Marcin Cieslak

LDEV-5242 Fix Assessment question summary page

Options
    • -2
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp
    • -7
    • +9
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
6:18 pm

Marcin Cieslak

LDEV-5242 Display question list even if no learner reached activity yet

Hide action buttons like disclose answers, though.

Options
    • -3
    • +4
    /lams_tool_assessment/web/pages/learning/results/allquestions.jsp
    • -27
    • +28
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -3
    • +3
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
5:59 pm

Marcin Cieslak

LDEV-5242 Add a header for question list in Assessment monitoring

Options
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
2:14 am

Marcin Cieslak

LDEV-5242 Make regular monitor Assessment view consistent with TBL AE

Options
    • -1
    • +1
    /lams_monitoring/web/tblmonitor/aes.jsp
    • -9
    • +21
    /lams_tool_assessment/web/pages/learning/results/allquestions.jsp
    • -0
    • +121
    /lams_tool_assessment/web/pages/monitoring/parts/discloseAnswers.jsp
    • -221
    • +33
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -117
    • +6
    /lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp
Friday 31 Dec 2021
9:07 pm

Marcin Cieslak

Merge branch 'LDEV-5275' into v4.6

Options
9:07 pm

Marcin Cieslak

LDEV-5275 Rewrite queries to get questions from QB faster

Options
    • -73
    • +77
    /lams_common/src/java/org/lamsfoundation/lams/qb/dao/hibernate/QbDAO.java
Thursday 30 Dec 2021
6:52 pm

Marcin Cieslak

LDEV-5273 Add missing learner answer normalisation

Options
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/qb/QbUtils.java
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
6:07 pm

Marcin Cieslak

LDEV-5273 Add question numbering to VSA allocate page

Options
    • -1
    • +1
    /lams_central/web/qb/vsa/vsaAllocate.jsp
    • -1
    • +1
    /lams_central/web/qb/vsa/vsaQuestionAllocate.jsp
6:04 pm

Marcin Cieslak

LDEV-5273 Make Refresh button use position fixed to the page

Options
    • -3
    • +10
    /lams_central/web/qb/vsa/vsaAllocate.jsp
5:59 pm

Marcin Cieslak

LDEV-5273 Adjust layout of VSA allocation page

Options
    • -10
    • +21
    /lams_central/web/qb/vsa/vsaAllocate.jsp
5:57 pm

Marcin Cieslak

LDEV-5273 Remove Close button

It is not common to have a button which closes a tab

Options
    • -8
    • +0
    /lams_central/web/qb/vsa/vsaAllocate.jsp
5:47 pm

Marcin Cieslak

LDEV-5273 Open VSA allocation page in tab from Assessment monitoring

It was open in thickbox before.

Options
    • -2
    • +2
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
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