Merge pull request #4 from magicbug/master

Merge with master
magicbug · Jun 16, 2019 · f400830 · f400830
2 parents cd4c752 + 53728a8
commit f400830
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 8 deletions.
diff --git a/application/controllers/Logbook.php b/application/controllers/Logbook.php
@@ -58,6 +58,11 @@ function json($callsign)
 		$this->load->model('user_model');
 		if(!$this->user_model->authorize($this->config->item('auth_mode'))) { return; }
 
+		$this->load->model('lotw_user');
+
+		$lotw_member = $this->lotw_user->check($callsign);
+
+
 		$this->load->model('logbook_model');
 
 		$return = [
@@ -67,7 +72,8 @@ function json($callsign)
 			"callsign_qth"  => "",
 			"callsign_iota" => "",
 			"bearing" 		=> "",
-			"workedBefore" => false
+			"workedBefore" => false,
+			"lotw_member" => $lotw_member,
 		];
 
 		$return['dxcc'] = $this->dxcheck($callsign);
@@ -91,6 +97,7 @@ function json($callsign)
 		return;
 	}
 
+
 	if ($this->config->item('callbook') == "qrz" && $this->config->item('qrz_username') != null && $this->config->item('qrz_password') != null)
 	{
 		// Lookup using QRZ
@@ -119,10 +126,12 @@ function json($callsign)
 
 	if (isset($callbook))
 	{
+
 		$return['callsign_name'] = $callbook['name'];
 		$return['callsign_qra'] = $callbook['gridsquare'];
 		$return['callsign_qth'] = $callbook['city'];
 		$return['callsign_iota'] = $callbook['iota'];
+		$return['qsl_manager'] = $callbook['qslmgr'];
 		if ($return['callsign_qra'] != "") {
 			$return['latlng'] = $this->qralatlng($return['callsign_qra']);
 		}
@@ -131,6 +140,7 @@ function json($callsign)
 	$return['bearing'] = $this->bearing($return['callsign_qra']);
 
 	echo json_encode($return, JSON_PRETTY_PRINT);
+
 	return;
 	}
 

diff --git a/application/controllers/Lotw.php b/application/controllers/Lotw.php
@@ -301,6 +301,8 @@ function load_users() {
 		set_time_limit(0);
 		$this->load->model('lotw_user');
 
+		$this->lotw_user->empty_table();
+
 		$row = 1;
 		if (($handle = fopen("https://lotw.arrl.org/lotw-user-activity.csv", "r")) !== FALSE) {
 		    while (($data = fgetcsv($handle, 1000, ",")) !== FALSE) {
@@ -324,6 +326,9 @@ function load_users() {
 	*/
 	function lotw_usercheck($callsign) {
 		$this->load->model('lotw_user');
+
+
+		$lotw_user_result = $this->lotw_user->check($callsign);
 
 
 	}

diff --git a/application/libraries/Qrz.php b/application/libraries/Qrz.php
@@ -79,6 +79,7 @@ public function search($callsign, $key)
 		$data['lat'] = (string) $xml->Callsign->lat;
 		$data['long'] = (string) $xml->Callsign->lon;
 		$data['iota'] = (string) $xml->Callsign->iota;
+		$data['qslmgr'] = (string) $xml->Callsign->qslmgr;
 
 		return $data;
 	}

diff --git a/application/models/Lotw_user.php b/application/models/Lotw_user.php
@@ -9,8 +9,8 @@ function __construct()
 	}
 
 
-	function empty_table($table) {
-		$this->db->empty_table($table); 
+	function empty_table() {
+		$this->db->empty_table('lotw_userlist'); 
 	}
 
 	function add_lotwuser($callsign, $date) {
@@ -20,9 +20,18 @@ function add_lotwuser($callsign, $date) {
 		        'upload_date' => $date
 		);
 
+		$this->db->insert('lotw_userlist', $data);
+	}
 
+	function check($callsign) {
+		$this->db->where('callsign', $callsign);
+		$query = $this->db->get('lotw_userlist');
 
-		$this->db->insert('lotw_userlist', $data);
+		if ($query->num_rows() > 0) {
+			return "active";
+		} else {
+			return "not found";
+		}
 	}
 }
 ?>
diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php
@@ -203,6 +203,7 @@
       $('#callsign_info').text("");
       $('#locator_info').text("");
       $('#country').val("");
+      $('#lotw_info').text("");
       $('#dxcc_id').val("");
       $('#cqz').val("");
       $('#name').val("");
@@ -223,9 +224,13 @@
             /* Find and populate DXCC */
             $.getJSON('logbook/json/' + $(this).val(), function(result)
             {
-              //$('#country').val(result);
+              //$('#country').val(result); lotw_info
               $('#country').val(convert_case(result.dxcc.entity));
               $('#callsign_info').text(convert_case(result.dxcc.entity));
+
+              if(result.lotw_member == "active") {
+                $('#lotw_info').text("LoTW");
+              }
               $('#dxcc_id').val(result.dxcc.adif);
               $('#cqz').val(result.dxcc.cqz);
 
@@ -243,6 +248,7 @@
               }
 
               markers.addLayer(marker).addTo(mymap);
+
 
             /* Find Locator if the field is empty */
             if($('#locator').val() == "") {
@@ -272,6 +278,11 @@
             }
 
             /* Find Operators Name */
+            if($('#qsl_via').val() == "") {
+                $('#qsl_via').val(result.qsl_manager);
+            }
+
+                        /* Find Operators Name */
             if($('#name').val() == "") {
                 $('#name').val(result.callsign_name);
             }

diff --git a/application/views/qso/index.php b/application/views/qso/index.php
@@ -60,7 +60,7 @@
               <div class="form-group">
                 <label for="callsign">Callsign</label>
                 <input type="text" class="form-control" id="callsign" name="callsign" required>
-                <small id="callsign_info" class="badge badge-primary"></small>
+                <small id="callsign_info" class="badge badge-secondary"></small> <small id="lotw_info" class="badge badge-light"></small>
               </div>
 
 
@@ -255,9 +255,9 @@
             </div>
 
             <div class="form-group row">
-              <label for="qsl-via" class="col-sm-2 col-form-label">Via</label>
+              <label for="qsl_via" class="col-sm-2 col-form-label">Via</label>
               <div class="col-sm-10">
-                <input type="text" id="qsl-via" class="form-control" name="qsl_via" value="" />
+                <input type="text" id="qsl_via" class="form-control" name="qsl_via" value="" />
               </div>
             </div>