Merge pull request #2179 from phl0/pullZonesFromLoTW
Pull CQ and ITU zone data from LoTW confirmation
这个提交包含在:
		
						当前提交
						94844197da
					
				
					共有  2 个文件被更改,包括 22 次插入 和 2 次删除
				
			
		|  | @ -538,7 +538,19 @@ class Lotw extends CI_Controller { | |||
| 						$cnty = ""; | ||||
| 					} | ||||
| 
 | ||||
| 					$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $iota, $cnty); | ||||
| 					if (isset($record['cqz'])) { | ||||
| 						$cqz = $record['cqz']; | ||||
| 					} else { | ||||
| 						$cqz = ""; | ||||
| 					} | ||||
| 
 | ||||
| 					if (isset($record['ituz'])) { | ||||
| 						$ituz = $record['ituz']; | ||||
| 					} else { | ||||
| 						$ituz = ""; | ||||
| 					} | ||||
| 
 | ||||
| 					$lotw_status = $this->logbook_model->lotw_update($time_on, $record['call'], $record['band'], $qsl_date, $record['qsl_rcvd'], $state, $qsl_gridsquare, $iota, $cnty, $cqz, $ituz); | ||||
| 				} | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -2484,7 +2484,7 @@ class Logbook_model extends CI_Model { | |||
|     } | ||||
|   } | ||||
| 
 | ||||
|   function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $iota, $cnty) { | ||||
|   function lotw_update($datetime, $callsign, $band, $qsl_date, $qsl_status, $state, $qsl_gridsquare, $iota, $cnty, $cqz, $ituz) { | ||||
| 
 | ||||
| 	$data = array( | ||||
|       'COL_LOTW_QSLRDATE' => $qsl_date, | ||||
|  | @ -2502,6 +2502,14 @@ class Logbook_model extends CI_Model { | |||
|       $data['COL_CNTY'] = $cnty; | ||||
| 	} | ||||
| 
 | ||||
| 	if($cqz != "") { | ||||
|       $data['COL_CQZ'] = $cqz; | ||||
| 	} | ||||
| 
 | ||||
| 	if($ituz != "") { | ||||
|       $data['COL_ITUZ'] = $ituz; | ||||
| 	} | ||||
| 
 | ||||
|     $this->db->where('date_format(COL_TIME_ON, \'%Y-%m-%d %H:%i\') = "'.$datetime.'"'); | ||||
|     $this->db->where('COL_CALL', $callsign); | ||||
|     $this->db->where('COL_BAND', $band); | ||||
|  |  | |||
		正在加载…
	
		在新工单中引用