WebSVN – Moodle – Diff – /reportbuilder/classes/local/filters/date.php

 declare(strict_types=1);
 namespace core_reportbuilder\local\filters;
 use DateTimeImmutable;
+use core\{clock, di};
-use lang_string;
+use core\lang_string;
-use MoodleQuickForm;
+use core_reportbuilder\local\helpers\database;
-use core_reportbuilder\local\helpers\database;
+use MoodleQuickForm;
     public const DATE_BEFORE = 9;
     /** @var int Date after [X relative date unit(s)] */
+    public const DATE_AFTER = 10;
+    /** @var int Relative date unit for a minute */
-    public const DATE_AFTER = 10;
+    public const DATE_UNIT_MINUTE = 5;
     /** @var int Relative date unit for an hour */
     public const DATE_UNIT_HOUR = 0;
+    }
     /**
      * Setup form
+     *
+     * Note that we cannot support float inputs in this filter currently, because decimals are not supported when calculating
+     * relative timeframes according to {@link https://www.php.net/manual/en/datetime.formats.php}
+     *
      * @param MoodleQuickForm $mform
      */
     public function setup_form(MoodleQuickForm $mform): void {
         // Operator selector.
         $mform->hideIf("{$this->name}_value", "{$this->name}_operator", 'in', array_merge($typesnounit, [self::DATE_CURRENT]));
         // Unit selector for last and next operators.
         $unitlabel = get_string('filterfieldunit', 'core_reportbuilder', $this->get_header());
+        $units = [
-        $units = [
+            self::DATE_UNIT_MINUTE => get_string('filterdateminutes', 'core_reportbuilder'),
             self::DATE_UNIT_HOUR => get_string('filterdatehours', 'core_reportbuilder'),
             self::DATE_UNIT_DAY => get_string('filterdatedays', 'core_reportbuilder'),
             self::DATE_UNIT_WEEK => get_string('filterdateweeks', 'core_reportbuilder'),
             self::DATE_UNIT_MONTH => get_string('filterdatemonths', 'core_reportbuilder'),
         // Add operator/value/unit group.
         $mform->addGroup($elements, "{$this->name}_group", $this->get_header(), '', false)
             ->setHiddenLabel(true);
         // Date selectors for range operator.
-        $mform->addElement('date_selector', "{$this->name}_from", get_string('filterdatefrom', 'core_reportbuilder'),
+        $mform->addElement('date_selector', "{$this->name}_from",
-            ['optional' => true]);
+            get_string('filterfieldfrom', 'core_reportbuilder', $this->get_header()), ['optional' => true]);
         $mform->setType("{$this->name}_from", PARAM_INT);
         $mform->setDefault("{$this->name}_from", 0);
         $mform->hideIf("{$this->name}_from", "{$this->name}_operator", 'neq', self::DATE_RANGE);
-        $mform->addElement('date_selector', "{$this->name}_to", get_string('filterdateto', 'core_reportbuilder'),
+        $mform->addElement('date_selector', "{$this->name}_to",
-            ['optional' => true]);
+            get_string('filterfieldto', 'core_reportbuilder', $this->get_header()), ['optional' => true]);
         $mform->setType("{$this->name}_to", PARAM_INT);
         $mform->setDefault("{$this->name}_to", 0);
                 break;
             case self::DATE_PAST:
                 $param = database::generate_param_name();
                 $sql = "{$fieldsql} < :{$param}";
-                $params[$param] = time();
+                $params[$param] = di::get(clock::class)->time();
                 break;
             case self::DATE_FUTURE:
                 $param = database::generate_param_name();
                 $sql = "{$fieldsql} > :{$param}";
-                $params[$param] = time();
+                $params[$param] = di::get(clock::class)->time();
                 break;
             default:
                 // Invalid or inactive filter.
                 return ['', []];
      * @param int $dateunit One of the ::DATE_UNIT_* constants
      * @return int[] Timestamps representing the start/end of timeframe
      */
     private static function get_relative_timeframe(int $operator, int $dateunitvalue, int $dateunit): array {
         // Initialise start/end time to now.
-        $datestart = $dateend = new DateTimeImmutable();
+        $datestart = $dateend = di::get(clock::class)->now();
+        switch ($dateunit) {
+            case self::DATE_UNIT_MINUTE:
+                if ($operator === self::DATE_CURRENT) {
+                    $hour = (int) $datestart->format('G');
+                    $minute = (int) $datestart->format('i');
+                    $datestart = $datestart->setTime($hour, $minute);
+                    $dateend = $dateend->setTime($hour, $minute, 59);
+                } else if ($operator === self::DATE_LAST) {
+                    $datestart = $datestart->modify("-{$dateunitvalue} minute");
+                } else if ($operator === self::DATE_NEXT) {
+                    $dateend = $dateend->modify("+{$dateunitvalue} minute");
+                }
-        switch ($dateunit) {
+                break;
             case self::DATE_UNIT_HOUR:
                 if ($operator === self::DATE_CURRENT) {
                     $hour = (int) $datestart->format('G');
                     $datestart = $datestart->setTime($hour, 0);

Proyectos de Subversion Moodle

(root)/reportbuilder/classes/local/filters/date.php – Rev 1 → 1441