diff --git a/application/controllers/dashboard.php b/application/controllers/dashboard.php index 3c79f08a..0d8872c7 100644 --- a/application/controllers/dashboard.php +++ b/application/controllers/dashboard.php @@ -39,6 +39,7 @@ class Dashboard extends CI_Controller { $data['total_qsl_sent'] = $this->logbook_model->total_qsl_sent(); $data['total_qsl_recv'] = $this->logbook_model->total_qsl_recv(); + $data['total_qsl_requested'] = $this->logbook_model->total_qsl_requested(); $data['total_bands'] = $this->logbook_model->total_bands(); diff --git a/application/libraries/Clublog.php b/application/libraries/Clublog.php new file mode 100644 index 00000000..7ca5ddaa --- /dev/null +++ b/application/libraries/Clublog.php @@ -0,0 +1,13 @@ +db->query('SELECT DISTINCT (COL_QSL_SENT) AS band, count(COL_QSL_SENT) AS count FROM '.$this->config->item('table_name').' WHERE COL_QSL_SENT = "R" GROUP BY band'); + + $row = $query->row(); + + if($row == null) { + return 0; + } else { + return $row->count; + } + } + function total_qsl_recv() { $query = $this->db->query('SELECT DISTINCT (COL_QSL_RCVD) AS band, count(COL_QSL_RCVD) AS count FROM '.$this->config->item('table_name').' WHERE COL_QSL_RCVD = "Y" GROUP BY band'); diff --git a/application/views/dashboard/index.php b/application/views/dashboard/index.php index b67ae98c..eb9551a6 100644 --- a/application/views/dashboard/index.php +++ b/application/views/dashboard/index.php @@ -124,15 +124,18 @@
- + + + + - + - + @@ -140,21 +143,35 @@ - + + + + + + + + - + + + + - + + + + +
Total QSOsQSOs
Total
QSOs This YearThis Year
QSOs This MonthThis Month
Countrys WorkedCountrys
Worked
Needed
QSL Cards SentQSL Cards
Sent
QSL Cards ReceivedReceived
Requested
@@ -180,7 +197,7 @@ // Display the map, with some controls var map = new GMap(document.getElementById("map")); map.addControl(new GLargeMapControl()); - map.addControl(new GMapTypeControl()); + //map.addControl(new GMapTypeControl()); map.setCenter(new GLatLng(33.137551,0.703125),2); // arrays to hold copies of the markers and html used by the side_bar diff --git a/application/views/layout/header.php b/application/views/layout/header.php index f7ba4a1d..2a0c4669 100644 --- a/application/views/layout/header.php +++ b/application/views/layout/header.php @@ -121,6 +121,7 @@ .dashboard_breakdown { float: right; width: 310px; } .dashboard_bottom .chart { float: left; } td.item { padding-bottom: 5px; } + .dashboard_breakdown .title { color: #439BF6; } /* Tabs CSS */ .ui-widget-content { border: none; } diff --git a/application/views/view_log/qso.php b/application/views/view_log/qso.php index 6a53a0b9..2e0f6a7c 100644 --- a/application/views/view_log/qso.php +++ b/application/views/view_log/qso.php @@ -3,7 +3,7 @@ View QSO Info