Clublog will upload to logbook based on the station callsign of the station profile

application/controllers/Clublog.php

@@ -23,6 +23,8 @@ class Clublog extends CI_Controller {
 
 		$this->load->model('logbook_model');
 
+		$this->load->model('stations');
+
 		$this->load->model('clublog_model');
 
 		$clublog_info = $this->clublog_model->get_clublog_auth_info($username);
@@ -32,13 +34,19 @@ class Clublog extends CI_Controller {
 			exit;
 		}
 
-		$data['qsos'] = $this->logbook_model->get_clublog_qsos();
 
-		if($data['qsos']->num_rows()){
+		$station_profiles = $this->stations->all_with_count();
-			// Create ADIF File of contacts not uploaded to Clublog
+
+		if($station_profiles->num_rows()){
+			foreach ($station_profiles->result() as $station_row)
+			{
+				if($station_row->qso_total > 0) {
+					$data['qsos'] = $this->logbook_model->get_clublog_qsos($station_row->station_id);
+
 					$string = $this->load->view('adif/data/clublog', $data, TRUE);
 
 					$ranid = uniqid();
+
 					if ( ! write_file('uploads/clublog'.$ranid.'.adi', $string)) {
 					     echo 'Unable to write the file - Make the folder Upload folder has write permissions.';
 					}
@@ -69,7 +77,7 @@ class Clublog extends CI_Controller {
 						    array(
 						      'email' => $clublog_info['user_clublog_name'],
 						      'password' => $clublog_info['user_clublog_password'],
-				      'callsign' => $clublog_info['user_clublog_callsign'],
+						      'callsign' => $station_row->station_callsign,
 						      'api' => "a11c3235cd74b88212ce726857056939d52372bd",
 						      'file' => $cFile
 						    ));
@@ -90,26 +98,27 @@ class Clublog extends CI_Controller {
 							echo "QSOs uploaded and Logbook QSOs marked as sent to Clublog";
 
 							$this->load->model('clublog_model');
-					$this->clublog_model->mark_qsos_sent();
+							$this->clublog_model->mark_qsos_sent($station_row->station_id);
 						} else {
 							echo "Error ".$response;
 						}
 
 					}
+				}
 			} else {
 				echo "Nothing awaiting upload to clublog";
 			}
-
+		}
 	}
 
-	function markqso() {
+	function markqso($station_id) {
 		$this->load->model('clublog_model');
-		$this->clublog_model->mark_qsos_sent();
+		$this->clublog_model->mark_qsos_sent($station_id);
 	}
 
 	function markallnotsent() {
 		$this->load->model('clublog_model');
-		$this->clublog_model->mark_all_qsos_notsent();
+		$this->clublog_model->mark_all_qsos_notsent($station_id);
 	}
 
 	// Find DXCC

application/models/Clublog_model.php

@@ -14,24 +14,26 @@ class Clublog_model extends CI_Model {
 		return $row = $query->row_array();
 	}
 
-	function mark_qsos_sent() {
+	function mark_qsos_sent($station_id) {
 		$data = array(
 	        'COL_CLUBLOG_QSO_UPLOAD_DATE' => date('Y-m-d'),
 	        'COL_CLUBLOG_QSO_UPLOAD_STATUS' => "Y",
 		);
 
+		$this->db->where("station_id", $station_id);
 		$this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null);
 		$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "");
     	$this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N");
 		$this->db->update($this->config->item('table_name'), $data);
 	}
 
-	function mark_all_qsos_notsent() {
+	function mark_all_qsos_notsent($station_id) {
 		$data = array(
 	        'COL_CLUBLOG_QSO_UPLOAD_DATE' => null,
 	        'COL_CLUBLOG_QSO_UPLOAD_STATUS' => "N",
 		);
 
+		$this->db->where("station_id", $station_id);
 		$this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "Y");
 		$this->db->update($this->config->item('table_name'), $data);
 	}

application/models/Logbook_model.php

@@ -444,7 +444,8 @@ class Logbook_model extends CI_Model {
     return $this->db->get();
   }
 
-  function get_clublog_qsos(){
+  function get_clublog_qsos($station_id){
+    $this->db->where('station_id', $station_id);
     $this->db->where("COL_CLUBLOG_QSO_UPLOAD_STATUS", null);
     $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "");
     $this->db->or_where("COL_CLUBLOG_QSO_UPLOAD_STATUS", "N");