From 2d0dda8fb7bf8b10cff52d7d575db665670d7632 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Fri, 17 Nov 2023 17:24:24 +0100
Subject: [PATCH] datetimepicker filter lba

---
 application/models/Logbookadvanced_model.php |  6 ++----
 application/views/logbookadvanced/index.php  | 20 ++++----------------
 2 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/application/models/Logbookadvanced_model.php b/application/models/Logbookadvanced_model.php
index 321dd3d8..3f62409a 100644
--- a/application/models/Logbookadvanced_model.php
+++ b/application/models/Logbookadvanced_model.php
@@ -24,14 +24,12 @@ class Logbookadvanced_model extends CI_Model {
 		}
 
         if ($searchCriteria['dateFrom'] !== '') {
-            $from = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateFrom']);
-			$from = $from->format('Y-m-d');
+            $from = $searchCriteria['dateFrom'];
 			$conditions[] = "date(COL_TIME_ON) >= ?";
 			$binding[] = $from;
 		}
         if ($searchCriteria['dateTo'] !== '') {
-            $to = DateTime::createFromFormat('d/m/Y', $searchCriteria['dateTo']);
-			$to = $to->format('Y-m-d');
+            $to = $searchCriteria['dateTo'];
 			$conditions[] = "date(COL_TIME_ON) <= ?";
 			$binding[] = $to;
 		}
diff --git a/application/views/logbookadvanced/index.php b/application/views/logbookadvanced/index.php
index 40b70500..db009ba0 100644
--- a/application/views/logbookadvanced/index.php
+++ b/application/views/logbookadvanced/index.php
@@ -61,24 +61,12 @@ $options = json_decode($options);
             <div class="filterbody collapse">
                 <div class="row">
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="dateFrom"><?php echo lang('filter_general_from'); ?></label>
-                        <div class="input-group input-group-sm date" id="dateFrom" data-target-input="nearest">
-                            <input name="dateFrom" type="text" placeholder="<?php echo $datePlaceholder;?>"
-                                class="form-control" data-bs-target="#dateFrom" />
-                            <div class="input-group-append" data-bs-target="#dateFrom" data-bs-toggle="datetimepicker">
-                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                            </div>
-                        </div>
+                        <label for="dateFrom"><?php echo lang('filter_general_from') . ": " ?></label>
+                        <input name="dateFrom" id="dateFrom" type="date" class="form-control w-auto">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
-                        <label class="form-label" for="dateTo"><?php echo lang('filter_general_to'); ?></label>
-                        <div class="input-group input-group-sm date" id="dateTo" data-target-input="nearest">
-                            <input name="dateTo" type="text" placeholder="<?php echo $datePlaceholder;?>"
-                                class="form-control" data-bs-target="#dateTo" />
-                            <div class="input-group-append" data-bs-target="#dateTo" data-bs-toggle="datetimepicker">
-                                <div class="input-group-text"><i class="fa fa-calendar"></i></div>
-                            </div>
-                        </div>
+                        <label for="dateTo"><?php echo lang('filter_general_to') . ": " ?></label>
+                        <input name="dateTo" id="dateTo" type="date" class="form-control w-auto">
                     </div>
                     <div class="mb-3 col-lg-2 col-md-2 col-sm-3 col-xl">
                         <label class="form-label" for="de"><?php echo lang('gen_hamradio_de'); ?></label>