From 9ae11a29ec1d3a1b11bb45aa19bc8dab5bef767d Mon Sep 17 00:00:00 2001 From: int2001 Date: Mon, 14 Aug 2023 12:01:24 +0000 Subject: [PATCH] Added today-Stats to QSL-Breakdown --- application/controllers/Dashboard.php | 7 + .../language/english/general_words_lang.php | 1 + .../language/german/general_words_lang.php | 1 + application/models/Logbook_model.php | 130 +++++++++++------- application/views/dashboard/index.php | 24 +++- 5 files changed, 103 insertions(+), 60 deletions(-) diff --git a/application/controllers/Dashboard.php b/application/controllers/Dashboard.php index b7b3b969..e9686263 100644 --- a/application/controllers/Dashboard.php +++ b/application/controllers/Dashboard.php @@ -87,12 +87,19 @@ class Dashboard extends CI_Controller { $data['total_qsl_sent'] = $QSLStatsBreakdownArray['QSL_Sent']; $data['total_qsl_rcvd'] = $QSLStatsBreakdownArray['QSL_Received']; $data['total_qsl_requested'] = $QSLStatsBreakdownArray['QSL_Requested']; + $data['qsl_sent_today'] = $QSLStatsBreakdownArray['QSL_Sent_today']; + $data['qsl_rcvd_today'] = $QSLStatsBreakdownArray['QSL_Received_today']; + $data['qsl_requested_today'] = $QSLStatsBreakdownArray['QSL_Requested_today']; $data['total_eqsl_sent'] = $QSLStatsBreakdownArray['eQSL_Sent']; $data['total_eqsl_rcvd'] = $QSLStatsBreakdownArray['eQSL_Received']; + $data['eqsl_sent_today'] = $QSLStatsBreakdownArray['eQSL_Sent_today']; + $data['eqsl_rcvd_today'] = $QSLStatsBreakdownArray['eQSL_Received_today']; $data['total_lotw_sent'] = $QSLStatsBreakdownArray['LoTW_Sent']; $data['total_lotw_rcvd'] = $QSLStatsBreakdownArray['LoTW_Received']; + $data['lotw_sent_today'] = $QSLStatsBreakdownArray['LoTW_Sent_today']; + $data['lotw_rcvd_today'] = $QSLStatsBreakdownArray['LoTW_Received_today']; $data['last_five_qsos'] = $this->logbook_model->get_last_qsos('18', $logbooks_locations_array); diff --git a/application/language/english/general_words_lang.php b/application/language/english/general_words_lang.php index 2b15e688..e9cad1b1 100644 --- a/application/language/english/general_words_lang.php +++ b/application/language/english/general_words_lang.php @@ -140,3 +140,4 @@ $lang['oceania'] = 'Oceania'; $lang['southamerica'] = 'South America'; $lang['gen_band_selection'] = 'Band selection'; +$lang['general_word_today'] = 'Today'; diff --git a/application/language/german/general_words_lang.php b/application/language/german/general_words_lang.php index fb978ca6..fec927d6 100644 --- a/application/language/german/general_words_lang.php +++ b/application/language/german/general_words_lang.php @@ -142,3 +142,4 @@ $lang['oceania'] = 'Ozeanien'; $lang['southamerica'] = 'Südamerika'; $lang['gen_band_selection'] = 'Bandauswahl'; +$lang['general_word_today'] = 'Heute'; diff --git a/application/models/Logbook_model.php b/application/models/Logbook_model.php index 0b6fe46b..3d454e7d 100755 --- a/application/models/Logbook_model.php +++ b/application/models/Logbook_model.php @@ -2241,64 +2241,88 @@ class Logbook_model extends CI_Model { function get_QSLStats($StationLocationsArray = null) { - if($StationLocationsArray == null) { - $CI =& get_instance(); - $CI->load->model('logbooks_model'); - $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); - } else { - $logbooks_locations_array = $StationLocationsArray; - } + if($StationLocationsArray == null) { + $CI =& get_instance(); + $CI->load->model('logbooks_model'); + $logbooks_locations_array = $CI->logbooks_model->list_logbook_relationships($this->session->userdata('active_station_logbook')); + } else { + $logbooks_locations_array = $StationLocationsArray; + } - if(!empty($logbooks_locations_array)) { - $this->db->select(' - COUNT(IF(COL_QSL_SENT="Y",COL_QSL_SENT,null)) as QSL_Sent, - COUNT(IF(COL_QSL_RCVD="Y",COL_QSL_RCVD,null)) as QSL_Received, - COUNT(IF(COL_QSL_SENT IN("Q", "R") ,COL_QSL_SENT,null)) as QSL_Requested, - COUNT(IF(COL_EQSL_QSL_SENT="Y",COL_EQSL_QSL_SENT,null)) as eQSL_Sent, - COUNT(IF(COL_EQSL_QSL_RCVD="Y",COL_EQSL_QSL_RCVD,null)) as eQSL_Received, - COUNT(IF(COL_LOTW_QSL_SENT="Y",COL_LOTW_QSL_SENT,null)) as LoTW_Sent, - COUNT(IF(COL_LOTW_QSL_RCVD="Y",COL_LOTW_QSL_RCVD,null)) as LoTW_Received - '); - $this->db->where_in('station_id', $logbooks_locations_array); + if(!empty($logbooks_locations_array)) { + $this->db->select(' + COUNT(IF(COL_QSL_SENT="Y",COL_QSL_SENT,null)) as QSL_Sent, + COUNT(IF(COL_QSL_RCVD="Y",COL_QSL_RCVD,null)) as QSL_Received, + COUNT(IF(COL_QSL_SENT IN("Q", "R") ,COL_QSL_SENT,null)) as QSL_Requested, + COUNT(IF(COL_EQSL_QSL_SENT="Y",COL_EQSL_QSL_SENT,null)) as eQSL_Sent, + COUNT(IF(COL_EQSL_QSL_RCVD="Y",COL_EQSL_QSL_RCVD,null)) as eQSL_Received, + COUNT(IF(COL_LOTW_QSL_SENT="Y",COL_LOTW_QSL_SENT,null)) as LoTW_Sent, + COUNT(IF(COL_LOTW_QSL_RCVD="Y",COL_LOTW_QSL_RCVD,null)) as LoTW_Received, + COUNT(IF(COL_QSL_SENT="Y" and DATE(COL_QSLSDATE)=DATE(SYSDATE()),COL_QSL_SENT,null)) as QSL_Sent_today, + COUNT(IF(COL_QSL_RCVD="Y" and DATE(COL_QSLRDATE)=DATE(SYSDATE()),COL_QSL_RCVD,null)) as QSL_Received_today, + COUNT(IF(COL_QSL_SENT IN("Q", "R") and DATE(COL_QSLSDATE)=DATE(SYSDATE()) ,COL_QSL_SENT,null)) as QSL_Requested_today, + COUNT(IF(COL_EQSL_QSL_SENT="Y" and DATE(COL_EQSL_QSLSDATE)=DATE(SYSDATE()),COL_EQSL_QSL_SENT,null)) as eQSL_Sent_today, + COUNT(IF(COL_EQSL_QSL_RCVD="Y" and DATE(COL_EQSL_QSLRDATE)=DATE(SYSDATE()),COL_EQSL_QSL_RCVD,null)) as eQSL_Received_today, + COUNT(IF(COL_LOTW_QSL_SENT="Y" and DATE(COL_LOTW_QSLSDATE)=DATE(SYSDATE()),COL_LOTW_QSL_SENT,null)) as LoTW_Sent_today, + COUNT(IF(COL_LOTW_QSL_RCVD="Y" and DATE(COL_LOTW_QSLRDATE)=DATE(SYSDATE()),COL_LOTW_QSL_RCVD,null)) as LoTW_Received_today + '); + $this->db->where_in('station_id', $logbooks_locations_array); - if ($query = $this->db->get($this->config->item('table_name'))) - { - $this->db->last_query(); - foreach ($query->result() as $row) - { - $QSLBreakdown['QSL_Sent'] = $row->QSL_Sent; - $QSLBreakdown['QSL_Received'] = $row->QSL_Received; - $QSLBreakdown['QSL_Requested'] = $row->QSL_Requested; - $QSLBreakdown['eQSL_Sent'] = $row->eQSL_Sent; - $QSLBreakdown['eQSL_Received'] = $row->eQSL_Received; - $QSLBreakdown['LoTW_Sent'] = $row->LoTW_Sent; - $QSLBreakdown['LoTW_Received'] = $row->LoTW_Received; - } + if ($query = $this->db->get($this->config->item('table_name'))) { + $this->db->last_query(); + foreach ($query->result() as $row) { + $QSLBreakdown['QSL_Sent'] = $row->QSL_Sent; + $QSLBreakdown['QSL_Received'] = $row->QSL_Received; + $QSLBreakdown['QSL_Requested'] = $row->QSL_Requested; + $QSLBreakdown['eQSL_Sent'] = $row->eQSL_Sent; + $QSLBreakdown['eQSL_Received'] = $row->eQSL_Received; + $QSLBreakdown['LoTW_Sent'] = $row->LoTW_Sent; + $QSLBreakdown['LoTW_Received'] = $row->LoTW_Received; + $QSLBreakdown['QSL_Sent_today'] = $row->QSL_Sent_today; + $QSLBreakdown['QSL_Received_today'] = $row->QSL_Received_today; + $QSLBreakdown['QSL_Requested_today'] = $row->QSL_Requested_today; + $QSLBreakdown['eQSL_Sent_today'] = $row->eQSL_Sent_today; + $QSLBreakdown['eQSL_Received_today'] = $row->eQSL_Received_today; + $QSLBreakdown['LoTW_Sent_today'] = $row->LoTW_Sent_today; + $QSLBreakdown['LoTW_Received_today'] = $row->LoTW_Received_today; + } - return $QSLBreakdown; - } - else - { - $QSLBreakdown['QSL_Sent'] = 0; - $QSLBreakdown['QSL_Received'] = 0; - $QSLBreakdown['QSL_Requested'] = 0; - $QSLBreakdown['eQSL_Sent'] = 0; - $QSLBreakdown['eQSL_Received'] = 0; - $QSLBreakdown['LoTW_Sent'] = 0; - $QSLBreakdown['LoTW_Received'] = 0; + return $QSLBreakdown; + } else { + $QSLBreakdown['QSL_Sent'] = 0; + $QSLBreakdown['QSL_Received'] = 0; + $QSLBreakdown['QSL_Requested'] = 0; + $QSLBreakdown['eQSL_Sent'] = 0; + $QSLBreakdown['eQSL_Received'] = 0; + $QSLBreakdown['LoTW_Sent'] = 0; + $QSLBreakdown['LoTW_Received'] = 0; + $QSLBreakdown['QSL_Sent_today'] = 0; + $QSLBreakdown['QSL_Received_today'] = 0; + $QSLBreakdown['QSL_Requested_today'] = 0; + $QSLBreakdown['eQSL_Sent_today'] = 0; + $QSLBreakdown['eQSL_Received_today'] = 0; + $QSLBreakdown['LoTW_Sent_today'] = 0; + $QSLBreakdown['LoTW_Received_today'] = 0; - return $QSLBreakdown; - } - } else { - $QSLBreakdown['QSL_Sent'] = 0; - $QSLBreakdown['QSL_Received'] = 0; - $QSLBreakdown['QSL_Requested'] = 0; - $QSLBreakdown['eQSL_Sent'] = 0; - $QSLBreakdown['eQSL_Received'] = 0; - $QSLBreakdown['LoTW_Sent'] = 0; - $QSLBreakdown['LoTW_Received'] = 0; + return $QSLBreakdown; + } + } else { + $QSLBreakdown['QSL_Sent'] = 0; + $QSLBreakdown['QSL_Received'] = 0; + $QSLBreakdown['QSL_Requested'] = 0; + $QSLBreakdown['eQSL_Sent'] = 0; + $QSLBreakdown['eQSL_Received'] = 0; + $QSLBreakdown['LoTW_Sent'] = 0; + $QSLBreakdown['LoTW_Received'] = 0; + $QSLBreakdown['QSL_Sent_today'] = 0; + $QSLBreakdown['QSL_Received_today'] = 0; + $QSLBreakdown['QSL_Requested_today'] = 0; + $QSLBreakdown['eQSL_Sent_today'] = 0; + $QSLBreakdown['eQSL_Received_today'] = 0; + $QSLBreakdown['LoTW_Sent_today'] = 0; + $QSLBreakdown['LoTW_Received_today'] = 0; - return $QSLBreakdown; + return $QSLBreakdown; } } diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index 02f4aabe..b086b4aa 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -216,21 +216,25 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { + - + + - + + - + +
@@ -239,16 +243,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { + - + + - + +
@@ -257,16 +264,19 @@ function echoQrbCalcLink($mygrid, $grid, $vucc) { + - + + - + +