From a7c6686c7293d1235f8983c1fe9cc0d1f16eb9fe Mon Sep 17 00:00:00 2001
From: John Tranier <john.tranier@isae-supaero.fr>
Date: Mon, 4 Mar 2024 12:00:25 +0100
Subject: [PATCH 1/3] Restore <?php tags
---
hybridmeter/classes/cache_manager.php | 1 +
hybridmeter/classes/configurator.php | 1 +
hybridmeter/classes/data/general_data.php | 1 +
hybridmeter/classes/data_provider.php | 1 +
hybridmeter/classes/exporter.php | 1 +
hybridmeter/classes/formatter.php | 1 +
hybridmeter/classes/logger.php | 1 +
hybridmeter/classes/processing.php | 1 +
hybridmeter/classes/task/cron_processing.php | 1 +
hybridmeter/classes/task/cron_scheduler.php | 1 +
hybridmeter/classes/task/processing.php | 1 +
hybridmeter/classes/test_context.php | 1 +
hybridmeter/classes/test_scenario.php | 1 +
hybridmeter/classes/test_scenario_course.php | 1 +
hybridmeter/classes/tests/ND/inconsistent_nd.php | 1 +
hybridmeter/classes/tests/NU/inconsistent_nu.php | 1 +
hybridmeter/classes/tests/blacklist_scenario.php | 1 +
.../classes/tests/course_count/inconsistent_active_students.php | 1 +
.../course_count/inconsistent_registered_active_students.php | 1 +
.../tests/course_count/inconsistent_registered_students.php | 1 +
hybridmeter/classes/tests/course_count_abstract.php | 1 +
hybridmeter/classes/tests/indicator_abstract.php | 1 +
hybridmeter/classes/utils.php | 1 +
hybridmeter/constants.php | 1 +
hybridmeter/db/access.php | 1 +
hybridmeter/db/install.php | 1 +
hybridmeter/db/tasks.php | 1 +
hybridmeter/db/uninstall.php | 1 +
hybridmeter/db/upgrade.php | 1 +
hybridmeter/indicators.php | 1 +
hybridmeter/output/index_page.php | 1 +
hybridmeter/output/renderer.php | 1 +
hybridmeter/version.php | 1 +
33 files changed, 33 insertions(+)
diff --git a/hybridmeter/classes/cache_manager.php b/hybridmeter/classes/cache_manager.php
index 2eba14f..f219d91 100644
--- a/hybridmeter/classes/cache_manager.php
+++ b/hybridmeter/classes/cache_manager.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/configurator.php b/hybridmeter/classes/configurator.php
index ede91cc..9f5d68b 100644
--- a/hybridmeter/classes/configurator.php
+++ b/hybridmeter/classes/configurator.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/data/general_data.php b/hybridmeter/classes/data/general_data.php
index 3cc94f9..39116fb 100644
--- a/hybridmeter/classes/data/general_data.php
+++ b/hybridmeter/classes/data/general_data.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/data_provider.php b/hybridmeter/classes/data_provider.php
index 5ee81eb..5703283 100644
--- a/hybridmeter/classes/data_provider.php
+++ b/hybridmeter/classes/data_provider.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/exporter.php b/hybridmeter/classes/exporter.php
index 20a6b1e..30eb300 100644
--- a/hybridmeter/classes/exporter.php
+++ b/hybridmeter/classes/exporter.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/formatter.php b/hybridmeter/classes/formatter.php
index 7f03465..9745382 100644
--- a/hybridmeter/classes/formatter.php
+++ b/hybridmeter/classes/formatter.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/logger.php b/hybridmeter/classes/logger.php
index 971a8c9..eaebabe 100644
--- a/hybridmeter/classes/logger.php
+++ b/hybridmeter/classes/logger.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/processing.php b/hybridmeter/classes/processing.php
index d2766eb..fde28eb 100644
--- a/hybridmeter/classes/processing.php
+++ b/hybridmeter/classes/processing.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/task/cron_processing.php b/hybridmeter/classes/task/cron_processing.php
index e114dc6..1f06bdb 100644
--- a/hybridmeter/classes/task/cron_processing.php
+++ b/hybridmeter/classes/task/cron_processing.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/task/cron_scheduler.php b/hybridmeter/classes/task/cron_scheduler.php
index eec946f..453efa5 100644
--- a/hybridmeter/classes/task/cron_scheduler.php
+++ b/hybridmeter/classes/task/cron_scheduler.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/task/processing.php b/hybridmeter/classes/task/processing.php
index 54a6f5f..83d53a1 100644
--- a/hybridmeter/classes/task/processing.php
+++ b/hybridmeter/classes/task/processing.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/test_context.php b/hybridmeter/classes/test_context.php
index 8e8e214..3fb72d6 100644
--- a/hybridmeter/classes/test_context.php
+++ b/hybridmeter/classes/test_context.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/test_scenario.php b/hybridmeter/classes/test_scenario.php
index 7c9fb63..089b032 100644
--- a/hybridmeter/classes/test_scenario.php
+++ b/hybridmeter/classes/test_scenario.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/test_scenario_course.php b/hybridmeter/classes/test_scenario_course.php
index f254f2b..a7e675f 100644
--- a/hybridmeter/classes/test_scenario_course.php
+++ b/hybridmeter/classes/test_scenario_course.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/ND/inconsistent_nd.php b/hybridmeter/classes/tests/ND/inconsistent_nd.php
index 8207342..160aa4a 100644
--- a/hybridmeter/classes/tests/ND/inconsistent_nd.php
+++ b/hybridmeter/classes/tests/ND/inconsistent_nd.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/NU/inconsistent_nu.php b/hybridmeter/classes/tests/NU/inconsistent_nu.php
index 90da4d8..449b885 100644
--- a/hybridmeter/classes/tests/NU/inconsistent_nu.php
+++ b/hybridmeter/classes/tests/NU/inconsistent_nu.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/blacklist_scenario.php b/hybridmeter/classes/tests/blacklist_scenario.php
index 42580ff..14c8532 100644
--- a/hybridmeter/classes/tests/blacklist_scenario.php
+++ b/hybridmeter/classes/tests/blacklist_scenario.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/course_count/inconsistent_active_students.php b/hybridmeter/classes/tests/course_count/inconsistent_active_students.php
index 5485950..f0c39e6 100644
--- a/hybridmeter/classes/tests/course_count/inconsistent_active_students.php
+++ b/hybridmeter/classes/tests/course_count/inconsistent_active_students.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/course_count/inconsistent_registered_active_students.php b/hybridmeter/classes/tests/course_count/inconsistent_registered_active_students.php
index 4ee09f3..90372a2 100644
--- a/hybridmeter/classes/tests/course_count/inconsistent_registered_active_students.php
+++ b/hybridmeter/classes/tests/course_count/inconsistent_registered_active_students.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/course_count/inconsistent_registered_students.php b/hybridmeter/classes/tests/course_count/inconsistent_registered_students.php
index 6802619..a067e75 100644
--- a/hybridmeter/classes/tests/course_count/inconsistent_registered_students.php
+++ b/hybridmeter/classes/tests/course_count/inconsistent_registered_students.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/course_count_abstract.php b/hybridmeter/classes/tests/course_count_abstract.php
index 4f3711e..da647a9 100644
--- a/hybridmeter/classes/tests/course_count_abstract.php
+++ b/hybridmeter/classes/tests/course_count_abstract.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/tests/indicator_abstract.php b/hybridmeter/classes/tests/indicator_abstract.php
index bfc3a72..2ddcea5 100644
--- a/hybridmeter/classes/tests/indicator_abstract.php
+++ b/hybridmeter/classes/tests/indicator_abstract.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/classes/utils.php b/hybridmeter/classes/utils.php
index c0c7571..2de932b 100644
--- a/hybridmeter/classes/utils.php
+++ b/hybridmeter/classes/utils.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/constants.php b/hybridmeter/constants.php
index b0c61fb..dd399b5 100644
--- a/hybridmeter/constants.php
+++ b/hybridmeter/constants.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/db/access.php b/hybridmeter/db/access.php
index c291e50..f726acb 100644
--- a/hybridmeter/db/access.php
+++ b/hybridmeter/db/access.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/db/install.php b/hybridmeter/db/install.php
index 63b97fa..425a6f4 100644
--- a/hybridmeter/db/install.php
+++ b/hybridmeter/db/install.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/db/tasks.php b/hybridmeter/db/tasks.php
index 4bf4d06..dcd0cc2 100644
--- a/hybridmeter/db/tasks.php
+++ b/hybridmeter/db/tasks.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/db/uninstall.php b/hybridmeter/db/uninstall.php
index 5373496..6c15008 100644
--- a/hybridmeter/db/uninstall.php
+++ b/hybridmeter/db/uninstall.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/db/upgrade.php b/hybridmeter/db/upgrade.php
index 11829b7..d8c0cf5 100644
--- a/hybridmeter/db/upgrade.php
+++ b/hybridmeter/db/upgrade.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/indicators.php b/hybridmeter/indicators.php
index b5b223f..c9773cc 100644
--- a/hybridmeter/indicators.php
+++ b/hybridmeter/indicators.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/output/index_page.php b/hybridmeter/output/index_page.php
index d711d76..9a7f031 100644
--- a/hybridmeter/output/index_page.php
+++ b/hybridmeter/output/index_page.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/output/renderer.php b/hybridmeter/output/renderer.php
index a216095..f8a6fbf 100644
--- a/hybridmeter/output/renderer.php
+++ b/hybridmeter/output/renderer.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
diff --git a/hybridmeter/version.php b/hybridmeter/version.php
index d190d29..c2c081b 100644
--- a/hybridmeter/version.php
+++ b/hybridmeter/version.php
@@ -1,3 +1,4 @@
+<?php
// This file is part of Moodle - http://moodle.org
//
// Moodle is free software: you can redistribute it and/or modify
--
GitLab
From 1f41a7c8b192b5ec20be48af20b52c153b53fe5f Mon Sep 17 00:00:00 2001
From: John Tranier <john.tranier@isae-supaero.fr>
Date: Mon, 4 Mar 2024 13:21:01 +0100
Subject: [PATCH 2/3] PHPCS : Restore class fields
---
hybridmeter/classes/configurator.php | 4 ++--
hybridmeter/classes/data/general_data.php | 16 ++++++++--------
hybridmeter/classes/exporter.php | 2 +-
hybridmeter/classes/processing.php | 4 ++--
hybridmeter/styles.css | 18 ------------------
5 files changed, 13 insertions(+), 31 deletions(-)
diff --git a/hybridmeter/classes/configurator.php b/hybridmeter/classes/configurator.php
index 9f5d68b..7f1deae 100644
--- a/hybridmeter/classes/configurator.php
+++ b/hybridmeter/classes/configurator.php
@@ -39,9 +39,9 @@ class configurator {
protected $data;
- protected $begindate;
+ protected $begin_date;
- protected $enddate;
+ protected $end_date;
protected static $instance = null;
diff --git a/hybridmeter/classes/data/general_data.php b/hybridmeter/classes/data/general_data.php
index 39116fb..60753bb 100644
--- a/hybridmeter/classes/data/general_data.php
+++ b/hybridmeter/classes/data/general_data.php
@@ -27,18 +27,18 @@ use report_hybridmeter\classes\data_provider as data_provider;
class general_data {
- protected $begintimestamp;
- protected $endtimestamp;
+ protected $begin_timestamp;
+ protected $end_timestamp;
protected $courses;
- protected $usedcourses;
- protected $digitalisedcourses;
+ protected $used_courses;
+ protected $digitalised_courses;
- protected $nbstudentsconcerneddigitalised;
- protected $nbstudentsconcernedused;
+ protected $nb_students_concerned_digitalised;
+ protected $nb_students_concerned_used;
- protected $nbstudentsconcerneddigitalisedactive;
- protected $nbstudentsconcernedusedactive;
+ protected $nb_students_concerned_digitalised_active;
+ protected $nb_students_concerned_used_active;
public function __construct($courses, $configurator) {
$dataprovider = data_provider::get_instance();
diff --git a/hybridmeter/classes/exporter.php b/hybridmeter/classes/exporter.php
index 30eb300..fb12ef1 100644
--- a/hybridmeter/classes/exporter.php
+++ b/hybridmeter/classes/exporter.php
@@ -57,7 +57,7 @@ class exporter {
* to deal with double variable processed as integer.
*
*/
- protected $fieldstype;
+ protected $fields_type;
/* Human-readable strings associated with fields (and displayed in CSV)
* If an alias exists then the alias is displayed, otherwise this is the raw field name
diff --git a/hybridmeter/classes/processing.php b/hybridmeter/classes/processing.php
index fde28eb..10adbe1 100644
--- a/hybridmeter/classes/processing.php
+++ b/hybridmeter/classes/processing.php
@@ -46,8 +46,8 @@ class processing {
protected $formatter;
protected $exporter;
- protected $begindate;
- protected $enddate;
+ protected $begin_date;
+ protected $end_date;
function __construct() {
logger::log("# Processing: initializing");
diff --git a/hybridmeter/styles.css b/hybridmeter/styles.css
index d68686e..7261360 100644
--- a/hybridmeter/styles.css
+++ b/hybridmeter/styles.css
@@ -1,26 +1,8 @@
-/*
- * This file is part of Moodle - http://moodle.org/
- *
- * Moodle is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Moodle is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Moodle. If not, see <http://www.gnu.org/licenses/>.
- */
-
/**
* @author Nassim Bennouar
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
* @copyright (C) 2020 ISAE-SUPAERO (https://www.isae-supaero.fr/)
*/
-
#hybridmeter-app > h3 {
margin-bottom: 20px;
margin-left: 2px;
--
GitLab
From 2385818e118d1a784045f09ec5edef853326c78b Mon Sep 17 00:00:00 2001
From: John Tranier <john.tranier@isae-supaero.fr>
Date: Mon, 4 Mar 2024 13:26:40 +0100
Subject: [PATCH 3/3] Release 1.1.9
---
CHANGES.md | 5 +++++
hybridmeter/version.php | 4 ++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/CHANGES.md b/CHANGES.md
index 4017cdf..e297aa5 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -6,6 +6,11 @@ _Ce document décrit les modifications du plugin HybridMeter pour chaque version
[Site HybridMeter](https://online.isae-supaero.fr/hybridmeter)
+## Hybridmeter version 1.1.9 (2024-03-04)
+### Chore
+- Fix regressions introduced by code cleaning
+
+
## Hybridmeter version 1.1.8 (2024-03-04)
### Chore
- Fix errors raised by PHPCS
diff --git a/hybridmeter/version.php b/hybridmeter/version.php
index c2c081b..4ba4587 100644
--- a/hybridmeter/version.php
+++ b/hybridmeter/version.php
@@ -21,7 +21,7 @@
* @package
*/
$plugin->component = "report_hybridmeter";
-$plugin->version = 2024030400;
+$plugin->version = 2024030401;
$plugin->requires = 2018051700; // Moodle 3.5.7 minimum
-$plugin->release = "1.1.8";
+$plugin->release = "1.1.9";
$plugin->maturity = MATURITY_RC;
--
GitLab