Merge pull request #135 from nysenate/feature/nys-16117--schoolforms

Fixed date filter on thanksiving and earth day submissions --TEMP FIX ONLY
nysenate · Feb 15, 2024 · db3e36f · db3e36f
2 parents c954fdb + c7df6c2
commit db3e36f
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/...odules/custom/nys_school_forms/src/Plugin/Block/SenatorMicrositeSchoolFormSubmissions.php b/...odules/custom/nys_school_forms/src/Plugin/Block/SenatorMicrositeSchoolFormSubmissions.php
@@ -107,16 +107,30 @@ public function build() {
       $form_type = $term->getName();
       $senator_term = ($node->hasField('field_senator_multiref') && !$node->get('field_senator_multiref')->isEmpty()) ? $node->get('field_senator_multiref')->entity : [];
 
-      $last_year_params = $params = [
-        'form_type' => $form_type,
-        'senator' => $senator_term->id(),
-        'school' => NULL,
-        'teacher_name' => NULL,
-        'from_date' => strtotime('this year January 1st'),
-        'to_date' => NULL,
-        'sort_by' => NULL,
-        'sort_order' => NULL,
-      ];
+      if ($form_type == 'Thankful') {
+        $last_year_params = $params = [
+          'form_type' => $form_type,
+          'senator' => $senator_term->id(),
+          'school' => NULL,
+          'teacher_name' => NULL,
+          'from_date' => strtotime('September 1, 2023'),
+          'to_date' => strtotime('December 31, 2023'),
+          'sort_by' => NULL,
+          'sort_order' => NULL,
+        ];
+      }
+      elseif ($form_type == 'Earth Day') {
+        $last_year_params = $params = [
+          'form_type' => $form_type,
+          'senator' => $senator_term->id(),
+          'school' => NULL,
+          'teacher_name' => NULL,
+          'from_date' => strtotime('January 1, 2023'),
+          'to_date' => strtotime('December 31, 2023'),
+          'sort_by' => NULL,
+          'sort_order' => NULL,
+        ];
+      }
 
       $last_year_params['from_date'] = NULL;
       $last_year_params['to_date'] = strtotime('last year December 31st');
@@ -154,7 +168,7 @@ public function build() {
           'panels' => [
         [
           'tab_text' => 'Current Year',
-          'title' => date('Y') . ' Poster Submissions',
+          'title' => '2023 Poster Submissions',
           'filter' => $filter,
           'years' => $this->schoolFormsService->getResults($params, FALSE),
         ],

diff --git a/web/themes/custom/nysenate_theme/src/patterns/components/nysenate-header/nysenate-header.js b/web/themes/custom/nysenate_theme/src/patterns/components/nysenate-header/nysenate-header.js
@@ -2,6 +2,11 @@
   'use strict';
   Drupal.behaviors.nysenateHeader = {
     attach: function (context) {
+      // If admin toolbar is present, abort and use static nav bar.
+      //if ($('#toolbar-administration').length > 0) {
+      //  return;
+      //}
+
       let self = this;
       let userScroll = 0;
       let currentTop = $(window).scrollTop();