Remove double date format function

This commit is contained in:
phl0
2024-08-30 00:35:02 +02:00
parent 2af3ae8a92
commit 116348b2d8
3 changed files with 23 additions and 30 deletions

View File

@@ -16,13 +16,34 @@ class Distancerecords extends CI_Controller {
$this->load->model('distancerecords_model');
if($this->session->userdata('user_date_format')) {
$custom_date_format = $this->session->userdata('user_date_format');
} else {
$custom_date_format = $this->config->item('qso_date_format');
}
switch ($custom_date_format) {
case 'd/m/y': $usethisformat = 'D/MM/YY';break;
case 'd/m/Y': $usethisformat = 'D/MM/YYYY';break;
case 'm/d/y': $usethisformat = 'MM/D/YY';break;
case 'm/d/Y': $usethisformat = 'MM/D/YYYY';break;
case 'd.m.Y': $usethisformat = 'D.MM.YYYY';break;
case 'y/m/d': $usethisformat = 'YY/MM/D';break;
case 'Y-m-d': $usethisformat = 'YYYY-MM-D';break;
case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
case 'M d, y': $usethisformat = 'MMM D, YY';break;
}
// Render Page
$data['custom_date_format'] = $custom_date_format;
$data['page_title'] = __("Distance Records");
$data['distances'] = $this->distancerecords_model->get_records();
$footerData['usethisformat'] = $usethisformat;
$this->load->view('interface_assets/header', $data);
$this->load->view('distancerecords/index');
$this->load->view('interface_assets/footer');
$this->load->view('interface_assets/footer', $footerData);
}
}

View File

@@ -4,13 +4,6 @@
<p><?php echo __("This page lists distance records per satellite based on gridsquares."); ?>
<?php
if ($distances) {
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/wavelog.php
$custom_date_format = $this->config->item('qso_date_format');
}
?>
<table style="width: 100%" id="distrectable" class="distrectable table table-sm table-striped table-hover">

View File

@@ -2582,28 +2582,7 @@ function viewEqsl(picture, callsign) {
</script>
<?php } ?>
<?php if ($this->uri->segment(1) == "distancerecords") {
// Get Date format
if($this->session->userdata('user_date_format')) {
// If Logged in and session exists
$custom_date_format = $this->session->userdata('user_date_format');
} else {
// Get Default date format from /config/wavelog.php
$custom_date_format = $this->config->item('qso_date_format');
}
switch ($custom_date_format) {
case 'd/m/y': $usethisformat = 'D/MM/YY';break;
case 'd/m/Y': $usethisformat = 'D/MM/YYYY';break;
case 'm/d/y': $usethisformat = 'MM/D/YY';break;
case 'm/d/Y': $usethisformat = 'MM/D/YYYY';break;
case 'd.m.Y': $usethisformat = 'D.MM.YYYY';break;
case 'y/m/d': $usethisformat = 'YY/MM/D';break;
case 'Y-m-d': $usethisformat = 'YYYY-MM-D';break;
case 'M d, Y': $usethisformat = 'MMM D, YYYY';break;
case 'M d, y': $usethisformat = 'MMM D, YY';break;
} ?>
<?php if ($this->uri->segment(1) == "distancerecords") { ?>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/moment.min.js"></script>
<script type="text/javascript" src="<?php echo base_url(); ?>assets/js/datetime-moment.js"></script>
<script>