From d988f80f36e3496729232b54b283745503c7056b Mon Sep 17 00:00:00 2001
From: s <sj@1729.be>
Date: Wed, 30 Oct 2024 11:16:38 +0000
Subject: [PATCH 1/3] imp: planner period selection

---
 druplan.module | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/druplan.module b/druplan.module
index c6fc760..57be787 100644
--- a/druplan.module
+++ b/druplan.module
@@ -165,6 +165,14 @@ function _druplan_submit_ajax_callback(array &$form, FormStateInterface $form_st
  */
 function druplan_views_style_matrixtable_data_alter(&$extra_data, &$view) {
   if ($view->id() == 'druplan_planner') {
+
+      $view_args = "";
+      if (!empty($view->build_info['period-start']) && !empty($view->build_info['period-end'])) {
+          $view_args = "/{$view->build_info['period-start']}--{$view->build_info['period-end']}";
+      }
+      $extra_data['rows'] = json_decode(\Drupal::service('http_client')->get(Url::fromUserInput("/planner/rows" . $view_args, ['absolute' => TRUE])->toString())->getBody(), TRUE);
+      $extra_data['cols'] = json_decode(\Drupal::service('http_client')->get(Url::fromUserInput("/planner/cols", ['absolute' => TRUE])->toString())->getBody(), TRUE);
+
     /*
     // For the planner view add extra data (rows and cols).
 
@@ -197,7 +205,5 @@ function druplan_views_style_matrixtable_data_alter(&$extra_data, &$view) {
     $extra_data['rows'] = json_decode($responses[0]->getContent(), TRUE);
     $extra_data['cols'] = json_decode($responses[1]->getContent(), TRUE);
     */
-    $extra_data['rows'] = json_decode(\Drupal::service('http_client')->get(Url::fromUserInput('/planner/rows', ['absolute' => TRUE])->toString())->getBody(), TRUE);
-    $extra_data['cols'] = json_decode(\Drupal::service('http_client')->get(Url::fromUserInput('/planner/cols', ['absolute' => TRUE])->toString())->getBody(), TRUE);
   }
 }
-- 
GitLab


From 5233a5e8bb6464c3cb1daae25bb5e0b3254f91e3 Mon Sep 17 00:00:00 2001
From: s <sj@1729.be>
Date: Fri, 1 Nov 2024 07:53:04 +0000
Subject: [PATCH 2/3] imp: planner period selection

---
 config/install/views.view.druplan_planner.yml | 22 +++++++----
 .../views.view.druplan_planner_rows.yml       | 37 ++++++++++++++++++-
 2 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/config/install/views.view.druplan_planner.yml b/config/install/views.view.druplan_planner.yml
index 3ffffbc..c81c36b 100644
--- a/config/install/views.view.druplan_planner.yml
+++ b/config/install/views.view.druplan_planner.yml
@@ -742,23 +742,23 @@ display:
           entity_type: rp_event
           entity_field: date
           plugin_id: views_daterange_filters_daterange
-          operator: between
+          operator: overlaps
           value:
-            min: today
-            max: +31days
+            min: ''
+            max: ''
             value: ''
             type: date
           group: 1
-          exposed: false
+          exposed: true
           expose:
-            operator_id: ''
-            label: ''
+            operator_id: date__value_op
+            label: Datum
             description: ''
             use_operator: false
-            operator: ''
+            operator: date__value_op
             operator_limit_selection: false
             operator_list: {  }
-            identifier: ''
+            identifier: date__value
             required: false
             remember: false
             multiple: false
@@ -779,6 +779,10 @@ display:
             default_group: All
             default_group_multiple: {  }
             group_items: {  }
+      filter_groups:
+        operator: AND
+        groups:
+          1: AND
       style:
         type: matrix_table
         options:
@@ -927,6 +931,7 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
       tags: {  }
   page_1:
     id: page_1
@@ -952,4 +957,5 @@ display:
       contexts:
         - 'languages:language_content'
         - 'languages:language_interface'
+        - url
       tags: {  }
diff --git a/config/install/views.view.druplan_planner_rows.yml b/config/install/views.view.druplan_planner_rows.yml
index 55ad3c7..7e06a69 100644
--- a/config/install/views.view.druplan_planner_rows.yml
+++ b/config/install/views.view.druplan_planner_rows.yml
@@ -837,7 +837,40 @@ display:
             label: ''
             field_identifier: ''
           exposed: false
-      arguments: {  }
+      arguments:
+        date-range:
+          id: date-range
+          table: cte_daterange
+          field: date-range
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: daterange_date
+          plugin_id: daterange_overlaps
+          default_action: ignore
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: false
+          title: ''
+          default_argument_type: fixed
+          default_argument_options:
+            argument: ''
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
       filters:
         type:
           id: type
@@ -965,6 +998,7 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - request_format
+        - url
       tags:
         - 'config:field.storage.rp_event.field_calendar_color'
         - 'config:field.storage.rp_event.field_workflow'
@@ -991,6 +1025,7 @@ display:
         - 'languages:language_content'
         - 'languages:language_interface'
         - request_format
+        - url
       tags:
         - 'config:field.storage.rp_event.field_calendar_color'
         - 'config:field.storage.rp_event.field_workflow'
-- 
GitLab


From f379b5db2a4017ab99b2251dec7205063075ad78 Mon Sep 17 00:00:00 2001
From: s j <sj@1729.be>
Date: Fri, 1 Nov 2024 09:12:18 +0000
Subject: [PATCH 3/3] fix: default planner period

---
 config/install/views.view.druplan_planner.yml      | 8 ++++----
 config/install/views.view.druplan_planner_rows.yml | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config/install/views.view.druplan_planner.yml b/config/install/views.view.druplan_planner.yml
index c81c36b..26c129e 100644
--- a/config/install/views.view.druplan_planner.yml
+++ b/config/install/views.view.druplan_planner.yml
@@ -744,10 +744,10 @@ display:
           plugin_id: views_daterange_filters_daterange
           operator: overlaps
           value:
-            min: ''
-            max: ''
+            min: today
+            max: '+ 31 days'
             value: ''
-            type: date
+            type: offset
           group: 1
           exposed: true
           expose:
@@ -759,7 +759,7 @@ display:
             operator_limit_selection: false
             operator_list: {  }
             identifier: date__value
-            required: false
+            required: true
             remember: false
             multiple: false
             remember_roles:
diff --git a/config/install/views.view.druplan_planner_rows.yml b/config/install/views.view.druplan_planner_rows.yml
index 7e06a69..89ee5c7 100644
--- a/config/install/views.view.druplan_planner_rows.yml
+++ b/config/install/views.view.druplan_planner_rows.yml
@@ -3,13 +3,11 @@ status: true
 dependencies:
   config:
     - field.storage.rp_event.field_calendar_color
-    - field.storage.rp_event.field_workflow
     - field.storage.taxonomy_term.field_backgroundcolor
     - resource_planning.rp_calendar_type.default
   module:
     - color_field
     - datetime_range
-    - options
     - resource_planning
     - rest
     - serialization
-- 
GitLab