Merge pull request #1 from magicbug/master

Merging from the original repo

application/controllers/Dashboard.php

@@ -47,6 +47,9 @@ class Dashboard extends CI_Controller {
 		$data['total_digi'] = $this->logbook_model->total_digi();
 		
 		$data['total_countrys'] = $this->logbook_model->total_countrys();
+		$data['total_countrys_confirmed_paper'] = $this->logbook_model->total_countrys_confirmed_paper();
+		$data['total_countrys_confirmed_eqsl'] = $this->logbook_model->total_countrys_confirmed_eqsl();
+		$data['total_countrys_confirmed_lotw'] = $this->logbook_model->total_countrys_confirmed_lotw();
 		
 		$data['total_qsl_sent'] = $this->logbook_model->total_qsl_sent();
 		$data['total_qsl_recv'] = $this->logbook_model->total_qsl_recv();

application/controllers/Eqsl.php

@@ -368,14 +368,6 @@ class eqsl extends CI_Controller {
 				
 				# End all the required fields
 				
-                // adding comment as QSLMSG
-				$adif .= "%3C";
-				$adif .= "QSLMSG";
-				$adif .= "%3A";
-				$adif .= strlen($qsl['COL_COMMENT']);
-				$adif .= "%3E";
-				$adif .= $qsl['COL_COMMENT'];
-				$adif .= "%20";
 
 				// adding RST_Sent
 				$adif .= "%3C";

application/models/Logbook_model.php

@@ -816,6 +816,39 @@ class Logbook_model extends CI_Model {
         return $query->num_rows();
     }
 
+    /* Return total number of countrys confirmed with paper QSL */
+    function total_countrys_confirmed_paper() {
+      $CI =& get_instance();
+      $CI->load->model('Stations');
+      $station_id = $CI->Stations->find_active();
+
+        $query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE station_id = '.$station_id.' AND COL_QSL_RCVD =\'Y\'');
+
+        return $query->num_rows();
+    }
+
+    /* Return total number of countrys confirmed with eQSL */
+    function total_countrys_confirmed_eqsl() {
+      $CI =& get_instance();
+      $CI->load->model('Stations');
+      $station_id = $CI->Stations->find_active();
+
+        $query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE station_id = '.$station_id.' AND COL_EQSL_QSL_RCVD =\'Y\'');
+
+        return $query->num_rows();
+    }
+
+    /* Return total number of countrys confirmed with LoTW */
+    function total_countrys_confirmed_lotw() {
+      $CI =& get_instance();
+      $CI->load->model('Stations');
+      $station_id = $CI->Stations->find_active();
+
+        $query = $this->db->query('SELECT DISTINCT (COL_COUNTRY) FROM '.$this->config->item('table_name').' WHERE station_id = '.$station_id.' AND COL_LOTW_QSL_RCVD =\'Y\'');
+
+        return $query->num_rows();
+    }
+
   function api_search_query($query) {
     $time_start = microtime(true);
     $results = $this->db->query($query);

application/views/dashboard/index.php

@@ -105,6 +105,13 @@
 				<td>Worked</td>
 				<td><?php echo $total_countrys; ?></td>
 			</tr>
+			<tr>
+				<td>Confirmed (paper/eQSL/LoTW)</td>
+				<td><?php 
+echo $total_countrys_confirmed_paper; ?>/<?php
+echo $total_countrys_confirmed_eqsl; ?>/<?php
+echo $total_countrys_confirmed_lotw; ?></td>
+			</tr>
 			
 			<tr>
 				<td>Needed</td>