lams-github / lams_monitoring

src

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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 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
    • -19
    • +27
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 29 more files in changeset.
Tuesday 15 Dec 2020
6:15 pm

Marcin Cieslak

LDEV-5134 Add "Move all" button to force complete learners in monitoring

Options
    • -18
    • +26
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 3 more files in changeset.
Wednesday 11 Nov 2020
5:50 pm

Marcin Cieslak

LDEV-3021 Fix a bug if wrong Learner Progress page was provided

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
Thursday 22 Oct 2020
1:38 pm

Marcin Cieslak

LDEV-5096 Move "Close" button to gate status page instead of monitoring

Allow closing all types of gates.

If a schedule gate gets opened, we do not clear its schedule anymore.

The user may have made a mistake when opening the gate and will

immediately close it again. We want the old schedule to remain.

When scheduled open gate job fires, it now checks if the gate is

actually closed. If it is already open, it does nothing.

Options
    • -13
    • +11
    ./java/org/lamsfoundation/lams/monitoring/quartz/job/OpenScheduleGateJob.java
    • -14
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -6
    • +3
    ./java/org/lamsfoundation/lams/monitoring/web/GateController.java
  4. … 5 more files in changeset.
Tuesday 20 Oct 2020
9:38 pm

Marcin Cieslak

LDEV-5096 Add "Close" button to an opened permission gate.

Options
    • -14
    • +13
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +11
    ./java/org/lamsfoundation/lams/monitoring/web/GateController.java
  3. … 4 more files in changeset.
Sunday 04 Oct 2020
2:09 pm

Marcin Cieslak

LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 17 more files in changeset.
2:09 pm

Marcin Cieslak

LDEV-5083 Initial refactoring of redesigned monitoring into LAMS 5 JSP

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 17 more files in changeset.
Thursday 20 Aug 2020
2:46 pm

Marcin Cieslak

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

Conflicts:

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/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -16
    • +14
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 25 more files in changeset.
Tuesday 28 Jul 2020
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
  2. … 33 more files in changeset.
Friday 12 Jun 2020
10:23 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
10:18 pm

Marcin Cieslak

LDEV-5038 Add group to user name in lesson monitor sequence tab

Options
    • -12
    • +9
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
Tuesday 12 May 2020
9:51 pm

Marcin Cieslak

LDEV-5023 Allow single click gate open in monitoring

Options
    • -14
    • +12
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 4 more files in changeset.
Saturday 25 Apr 2020
5:02 am

Andrey Balan

LDEV-4995 fix exception thrown on trying to get activity's Id

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Saturday 04 Apr 2020
9:13 am

Andrey Balan

LDEV-4995 Revert accidentally committed code

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
Friday 03 Apr 2020
9:42 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -1
    • +9
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -24
    • +56
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -46
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  7. … 14 more files in changeset.
Saturday 21 Mar 2020
9:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -0
    • +25
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 198 more files in changeset.
Monday 16 Mar 2020
10:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
    • -4
    • +5
    ./java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -13
    • +20
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -1
    • +14
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +21
    ./java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -0
    • +9
    ./java/org/lamsfoundation/lams/monitoring/web/form/GateForm.java
  7. … 31 more files in changeset.
Tuesday 18 Feb 2020
10:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -9
    • +7
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -16
    • +8
    ./java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
  3. … 191 more files in changeset.
Wednesday 08 Jan 2020
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -68
    • +0
    ./java/org/lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -22
    • +9
    ./java/org/lamsfoundation/lams/monitoring/web/GateController.java
    • -130
    • +0
    ./java/org/lamsfoundation/lams/monitoring/web/GateForm.java
    • -20
    • +18
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java
    • -0
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
    • -17
    • +6
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
    • -4
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/SequenceController.java
    • -14
    • +6
    ./java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java
    • -0
    • +68
    ./java/org/lamsfoundation/lams/monitoring/web/form/FileUploadForm.java
    • -0
    • +130
    ./java/org/lamsfoundation/lams/monitoring/web/form/GateForm.java
  11. … 41 more files in changeset.
Monday 06 Jan 2020
11:09 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to add lesson

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 2 more files in changeset.
Thursday 02 Jan 2020
8:49 am

Ernie Ghiglione

LDEV-4932 Adding CSRF to central and monitoring

Adding CSRF to:

- Grades on completion

- Enable/disable presence and IM

- Send emails

- Update users into lessons

- Send email notifications

- Delete email notifications

Options
    • -2
    • +3
    ./java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/monitoring/web/EmailProgressController.java
    • -5
    • +5
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  4. … 8 more files in changeset.
Wednesday 01 Jan 2020
2:35 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

* Add CSRF protection to:

- Change lesson status (incl. remove)

- Remove lesson using main.jsp button

- Rename lesson

* Start using /common/taglibs.jsp in lams_central

Options
    • -34
    • +9
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 23 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -12
    • +14
    ./java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
  2. … 42 more files in changeset.
Saturday 07 Dec 2019
3:39 am

Andrey Balan

LDEV-4897 Update Peerreview, Grouping servlet, Outcome controller to use new Excel exporting methods

* Improve code generating excel files. Add bold attribute to Excel rows

Options
    • -33
    • +27
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  2. … 10 more files in changeset.
Wednesday 13 Nov 2019
4:00 am

Marcin Cieslak

LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

Options
    • -12
    • +6
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 3 more files in changeset.
Tuesday 12 Nov 2019
12:06 am

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -5
    • +29
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  2. … 5 more files in changeset.
Saturday 02 Nov 2019
1:41 am

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -31
    • +23
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +3
    ./java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
  4. … 8 more files in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -5
    • +6
    ./java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
  2. … 15 more files in changeset.
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsController.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java
  5. … 29 more files in changeset.
Friday 25 Oct 2019
8:50 pm

Andrey Balan

LDEV-4879 Create lesson in subgroups at one go

Options
    • -84
    • +88
    ./java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
  2. … 4 more files in changeset.