[QRZ Logbook] Updated the rest of the code to work with the new placement for the marking of QSOs.

application/controllers/Adif.php

@@ -121,26 +121,6 @@ class adif extends CI_Controller {
         $this->load->view('adif/mark_lotw', $data);
     }
 
-    public function mark_qrz() {
-        // Set memory limit to unlimited to allow heavy usage
-        ini_set('memory_limit', '-1');
-
-		$station_id = $this->security->xss_clean($this->input->post('station_profile'));
-
-        $this->load->model('adif_data');
-
-        $data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $station_id);
-
-        $this->load->model('logbook_model');
-
-        foreach ($data['qsos']->result() as $qso)
-        {
-            $this->logbook_model->mark_qrz_qsos_sent($qso->COL_PRIMARY_KEY);
-        }
-
-        $this->load->view('adif/mark_qrz', $data);
-    }
-
 	public function export_lotw()
 	{
 		// Set memory limit to unlimited to allow heavy usage

application/controllers/Qrz.php

@@ -108,11 +108,8 @@ class Qrz extends CI_Controller {
 
         $data['page_title'] = "QRZ Logbook";
 
+		$data['station_profiles'] = $this->stations->all();
         $data['station_profile'] = $this->stations->stations_with_qrz_api_key();
-        $active_station_id = $this->stations->find_active();
-        $station_profile = $this->stations->profile($active_station_id);
-
-        $data['active_station_info'] = $station_profile->row();
 
         $this->load->view('interface_assets/header', $data);
         $this->load->view('qrz/export');
@@ -125,6 +122,7 @@ class Qrz extends CI_Controller {
     public function upload_station() {
         $this->setOptions();
         $this->load->model('stations');
+
         $postData = $this->input->post();
 
         $this->load->model('logbook_model');
@@ -148,4 +146,26 @@ class Qrz extends CI_Controller {
             echo json_encode($data);
         }
     }
-}
+
+	public function mark_qrz() {
+		// Set memory limit to unlimited to allow heavy usage
+		ini_set('memory_limit', '-1');
+
+		$station_id = $this->security->xss_clean($this->input->post('station_profile'));
+
+		$this->load->model('adif_data');
+
+		$data['qsos'] = $this->adif_data->export_custom($this->input->post('from'), $this->input->post('to'), $station_id);
+
+		$this->load->model('logbook_model');
+
+		foreach ($data['qsos']->result() as $qso)
+		{
+			$this->logbook_model->mark_qrz_qsos_sent($qso->COL_PRIMARY_KEY);
+		}
+
+		$this->load->view('interface_assets/header', $data);
+		$this->load->view('qrz/mark_qrz', $data);
+		$this->load->view('interface_assets/footer');
+	}
+}

application/views/qrz/export.php

@@ -48,7 +48,7 @@
                     echo '<td><button id="qrzUpload" type="button" name="qrzUpload" class="btn btn-primary btn-sm ld-ext-right" onclick="ExportQrz('. $station->station_id .')"><i class="fas fa-cloud-upload-alt"></i> Upload<div class="ld ld-ring ld-spin"></div></button></td>';
                     echo '</tr>';
                 }
-                echo '</tfoot></table></div>';
+                echo '</tfoot></table>';
 
         }
         else {
@@ -60,9 +60,9 @@
 				<div class="tab-pane fade" id="mark" role="tabpanel" aria-labelledby="home-tab">
 
 				<form class="form" action="<?php echo site_url('qrz/mark_qrz'); ?>" method="post" enctype="multipart/form-data">
-					<select name="station_profile" class="custom-select mb-2 mr-sm-2" style="width: 20%;">
+					<select name="station_profile" class="custom-select mb-4 mr-sm-4" style="width: 30%;">
 						<option value="0">Select Station Profile</option>
-						<?php foreach ($station_profile->result() as $station) { ?>
+						<?php foreach ($station_profiles->result() as $station) { ?>
 							<option value="<?php echo $station->station_id; ?>">Callsign: <?php echo $station->station_callsign; ?> (<?php echo $station->station_profile_name; ?>)</option>
 						<?php } ?>
 					</select>