From 8d1457115a960bec9ab3b787a39f77e4eb712df9 Mon Sep 17 00:00:00 2001
From: HB9HIL <fabian.berg@hb9hil.org>
Date: Fri, 17 Nov 2023 15:27:44 +0100
Subject: [PATCH] datetimpicker dxatlas export (+bugfix)

---
 application/models/Dxatlas_model.php |  8 ++------
 application/views/dxatlas/index.php  | 28 +++++++++-------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/application/models/Dxatlas_model.php b/application/models/Dxatlas_model.php
index 8e212c5c..c3fabbf8 100644
--- a/application/models/Dxatlas_model.php
+++ b/application/models/Dxatlas_model.php
@@ -150,14 +150,10 @@ class Dxatlas_model extends CI_Model
 
 		// If date is set, we format the date and add it to the where-statement
 		if ($fromdate != "") {
-			$from = DateTime::createFromFormat('d/m/Y', $fromdate);
-			$from = $from->format('Y-m-d');
-			$sql .= " and date(COL_TIME_ON) >='" . $from . "'";
+			$sql .= " and date(COL_TIME_ON) >='" . $fromdate . "'";
 		}
 		if ($todate != "") {
-			$to = DateTime::createFromFormat('d/m/Y', $todate);
-			$to = $to->format('Y-m-d');
-			$sql .= " and date(COL_TIME_ON) <='" . $to . "'";
+			$sql .= " and date(COL_TIME_ON) <='" . $todate . "'";
 		}
 
 		$sql .= ' and station_profile.user_id = ' . $this->session->userdata('user_id');
diff --git a/application/views/dxatlas/index.php b/application/views/dxatlas/index.php
index 408a87d5..69847e5a 100644
--- a/application/views/dxatlas/index.php
+++ b/application/views/dxatlas/index.php
@@ -114,26 +114,16 @@
 				</div>
 				</div>
 				<div class="row">
-					<div class="mb-3 col-md-3">
-						<label for="datetimepicker1"><?php echo lang('gen_from_date') . ':'; ?></label>
-						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker1" data-target-input="nearest">
-							<input name="fromdate" type="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker1"/>
-							<div class="input-group-append"  data-bs-target="#datetimepicker1" data-bs-toggle="datetimepicker">
-								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
-							</div>
-						</div>
-					</div>
+                    <div class="mb-3 col-md-3">
+                        <label for="fromdate"><?php echo lang('gen_from_date') . ": " ?></label>
+                        <input name="fromdate" id="fromdate" type="date" class="form-control w-auto">
+                    </div>
 
-					<div class="mb-3 col-md-3">
-						<label for="datetimepicker2"><?php echo lang('gen_to_date') . ':'; ?></label>
-						<div class="exportdatepicker input-group date col-md-12" id="datetimepicker2" data-target-input="nearest">
-							<input name="todate" totype="text" placeholder="DD/MM/YYYY" class="form-control datetimepicker-input" data-bs-target="#datetimepicker2"/>
-							<div class="input-group-append" data-bs-target="#datetimepicker2" data-bs-toggle="datetimepicker">
-								<div class="input-group-text"><i class="fa fa-calendar"></i></div>
-							</div>
-						</div>
-					</div>
-				</div>
+                    <div class="mb-3 col-md-3">
+                        <label for="todate"><?php echo lang('gen_to_date') . ": " ?></label>
+                        <input name="todate" id="todate" type="date" class="form-control w-auto">
+                    </div>
+                </div>
 				<br>
 				<button type="submit" class="btn btn-primary mb-2" value="Export"><?php echo lang('general_word_export'); ?></button>
 			</form>