added distance as choosable column
这个提交包含在:
		
							父节点
							
								
									944ab40e5e
								
							
						
					
					
						当前提交
						dff714345c
					
				
					共有  9 个文件被更改,包括 43 次插入 和 0 次删除
				
			
		|  | @ -110,6 +110,7 @@ $lang['gen_hamradio_sota'] = 'SOTA'; | ||||||
| $lang['gen_hamradio_wwff'] = 'WWFF'; | $lang['gen_hamradio_wwff'] = 'WWFF'; | ||||||
| $lang['gen_hamradio_pota'] = 'POTA'; | $lang['gen_hamradio_pota'] = 'POTA'; | ||||||
| $lang['gen_hamradio_gridsquare'] = 'Gridsquare'; | $lang['gen_hamradio_gridsquare'] = 'Gridsquare'; | ||||||
|  | $lang['gen_hamradio_distance'] = 'Distance'; | ||||||
| $lang['gen_hamradio_operator'] = 'Operator'; | $lang['gen_hamradio_operator'] = 'Operator'; | ||||||
| 
 | 
 | ||||||
| $lang['gen_hamradio_sig'] = 'Sig'; | $lang['gen_hamradio_sig'] = 'Sig'; | ||||||
|  |  | ||||||
|  | @ -111,6 +111,7 @@ $lang['gen_hamradio_sota'] = 'SOTA'; | ||||||
| $lang['gen_hamradio_wwff'] = 'WWFF'; | $lang['gen_hamradio_wwff'] = 'WWFF'; | ||||||
| $lang['gen_hamradio_pota'] = 'POTA'; | $lang['gen_hamradio_pota'] = 'POTA'; | ||||||
| $lang['gen_hamradio_gridsquare'] = 'Planquadrat'; | $lang['gen_hamradio_gridsquare'] = 'Planquadrat'; | ||||||
|  | $lang['gen_hamradio_distance'] = 'Entfernung'; | ||||||
| $lang['gen_hamradio_operator'] = 'Operator'; | $lang['gen_hamradio_operator'] = 'Operator'; | ||||||
| 
 | 
 | ||||||
| $lang['gen_hamradio_sig'] = 'Sig'; | $lang['gen_hamradio_sig'] = 'Sig'; | ||||||
|  |  | ||||||
|  | @ -11,6 +11,7 @@ function echo_table_header_col($ctx, $name) { | ||||||
| 		case 'POTA': echo '<th>'.$ctx->lang->line('gen_hamradio_pota').'</th>'; break; | 		case 'POTA': echo '<th>'.$ctx->lang->line('gen_hamradio_pota').'</th>'; break; | ||||||
| 		case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break; | 		case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break; | ||||||
| 		case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break; | 		case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break; | ||||||
|  | 		case 'Distance': echo '<th>'.$ctx->lang->line('gen_hamradio_distance').'</th>'; break; | ||||||
| 		case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</th>'; break; | 		case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</th>'; break; | ||||||
| 		case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break; | 		case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break; | ||||||
| 		case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break; | 		case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break; | ||||||
|  | @ -29,6 +30,7 @@ function echo_table_col($row, $name) { | ||||||
| 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break; | 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break; | ||||||
| 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break; | 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break; | ||||||
| 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break; | 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break; | ||||||
|  | 		case 'Distance':    echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . '</td>'; break; | ||||||
| 		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; | 		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; | ||||||
| 		case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break; | 		case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break; | ||||||
| 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break; | 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break; | ||||||
|  |  | ||||||
|  | @ -17,6 +17,7 @@ | ||||||
| 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 				case 'State': echo lang('gen_hamradio_state'); break; | 				case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 				case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 				case 'Band': echo lang('gen_hamradio_band'); break; | 				case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 				case 'Operator': echo lang('gen_hamradio_operator'); break; | 				case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -32,6 +33,7 @@ | ||||||
| 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 				case 'State': echo lang('gen_hamradio_state'); break; | 				case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 				case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 				case 'Band': echo lang('gen_hamradio_band'); break; | 				case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 				case 'Operator': echo lang('gen_hamradio_band'); break; | 				case 'Operator': echo lang('gen_hamradio_band'); break; | ||||||
|  | @ -47,6 +49,7 @@ | ||||||
| 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 				case 'State': echo lang('gen_hamradio_state'); break; | 				case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 				case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 				case 'Band': echo lang('gen_hamradio_band'); break; | 				case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 				case 'Operator': echo lang('gen_hamradio_operator'); break; | 				case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -62,6 +65,7 @@ | ||||||
| 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 				case 'State': echo lang('gen_hamradio_state'); break; | 				case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 				case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 				case 'Band': echo lang('gen_hamradio_band'); break; | 				case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 				case 'Operator': echo lang('gen_hamradio_operator'); break; | 				case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -77,6 +81,7 @@ | ||||||
| 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 				case 'State': echo lang('gen_hamradio_state'); break; | 				case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 				case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 				case 'Band': echo lang('gen_hamradio_band'); break; | 				case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 				case 'Operator': echo lang('gen_hamradio_operator'); break; | 				case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -114,6 +119,7 @@ | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -129,6 +135,7 @@ | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -145,6 +152,7 @@ | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -160,6 +168,7 @@ | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -175,6 +184,7 @@ | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  |  | ||||||
|  | @ -19,6 +19,7 @@ $ci =& get_instance(); | ||||||
| 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 					case 'State': echo lang('gen_hamradio_state'); break; | 					case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 					case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 					case 'Band': echo lang('gen_hamradio_band'); break; | 					case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 					case 'Operator': echo lang('gen_hamradio_operator'); break; | 					case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -34,6 +35,7 @@ $ci =& get_instance(); | ||||||
| 					case 'State': echo lang('gen_hamradio_state'); break; | 					case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 					case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 					case 'Band': echo lang('gen_hamradio_band'); break; | 					case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 					case 'Operator': echo lang('gen_hamradio_operator'); break; | 					case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -49,6 +51,7 @@ $ci =& get_instance(); | ||||||
| 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 					case 'State': echo lang('gen_hamradio_state'); break; | 					case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 					case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 					case 'Band': echo lang('gen_hamradio_band'); break; | 					case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 					case 'Operator': echo lang('gen_hamradio_operator'); break; | 					case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -64,6 +67,7 @@ $ci =& get_instance(); | ||||||
| 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | 					case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 					case 'State': echo lang('gen_hamradio_state'); break; | 					case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 					case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 					case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 					case 'Band': echo lang('gen_hamradio_band'); break; | 					case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 					case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 					case 'Operator': echo lang('gen_hamradio_operator'); break; | 					case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -79,6 +83,7 @@ $ci =& get_instance(); | ||||||
| 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | 				case 'SOTA': echo lang('gen_hamradio_sota'); break; | ||||||
| 				case 'State': echo lang('gen_hamradio_state'); break; | 				case 'State': echo lang('gen_hamradio_state'); break; | ||||||
| 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | 				case 'Grid': echo lang('gen_hamradio_gridsquare'); break; | ||||||
|  | 				case 'Distance': echo lang('gen_hamradio_distance'); break; | ||||||
| 				case 'Band': echo lang('gen_hamradio_band'); break; | 				case 'Band': echo lang('gen_hamradio_band'); break; | ||||||
| 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | 				case 'Frequency': echo lang('gen_hamradio_frequency'); break; | ||||||
| 				case 'Operator': echo lang('gen_hamradio_operator'); break; | 				case 'Operator': echo lang('gen_hamradio_operator'); break; | ||||||
|  | @ -133,6 +138,7 @@ $ci =& get_instance(); | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -149,6 +155,7 @@ $ci =& get_instance(); | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -166,6 +173,7 @@ $ci =& get_instance(); | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -182,6 +190,7 @@ $ci =& get_instance(); | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  | @ -198,6 +207,7 @@ $ci =& get_instance(); | ||||||
| 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | 				case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF); break; | ||||||
| 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | 				case 'POTA':    echo '<td>' . ($row->COL_POTA_REF); break; | ||||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; break; | ||||||
|  | 				case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : ''); break; | ||||||
| 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | 				case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo $row->COL_SAT_NAME; } else { echo strtolower($row->COL_BAND); }; break; | ||||||
| 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | 				case 'State':   echo '<td>' . ($row->COL_STATE); break; | ||||||
| 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | 				case 'Operator':   echo '<td>' . ($row->COL_OPERATOR); break; | ||||||
|  |  | ||||||
|  | @ -313,6 +313,8 @@ | ||||||
|                                         </option> |                                         </option> | ||||||
|                                         <option value="Grid"> |                                         <option value="Grid"> | ||||||
|                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 |                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  |                                         <option value="Distance"> | ||||||
|  |                                             <?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
|                                         <option value="Operator"> |                                         <option value="Operator"> | ||||||
|                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 |                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
|                                     </select> |                                     </select> | ||||||
|  | @ -342,6 +344,8 @@ | ||||||
|                                         </option> |                                         </option> | ||||||
|                                         <option value="Grid"> |                                         <option value="Grid"> | ||||||
|                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 |                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  |                                         <option value="Distance"> | ||||||
|  |                                             <?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
|                                         <option value="Operator"> |                                         <option value="Operator"> | ||||||
|                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 |                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
|                                     </select> |                                     </select> | ||||||
|  | @ -371,6 +375,8 @@ | ||||||
|                                         </option> |                                         </option> | ||||||
|                                         <option value="Grid"> |                                         <option value="Grid"> | ||||||
|                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 |                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  |                                         <option value="Distance"> | ||||||
|  |                                             <?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
|                                         <option value="Operator"> |                                         <option value="Operator"> | ||||||
|                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 |                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
|                                     </select> |                                     </select> | ||||||
|  | @ -400,6 +406,8 @@ | ||||||
|                                         </option> |                                         </option> | ||||||
|                                         <option value="Grid"> |                                         <option value="Grid"> | ||||||
|                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 |                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  |                                         <option value="Distance"> | ||||||
|  |                                             <?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
|                                         <option value="Operator"> |                                         <option value="Operator"> | ||||||
|                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 |                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
|                                     </select> |                                     </select> | ||||||
|  | @ -430,6 +438,8 @@ | ||||||
|                                         </option> |                                         </option> | ||||||
|                                         <option value="Grid"> |                                         <option value="Grid"> | ||||||
|                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 |                                             <?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  |                                         <option value="Distance"> | ||||||
|  |                                             <?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
|                                         <option value="Operator"> |                                         <option value="Operator"> | ||||||
|                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 |                                             <?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
|                                         <option value="Location"> |                                         <option value="Location"> | ||||||
|  |  | ||||||
|  | @ -360,6 +360,7 @@ | ||||||
| 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | ||||||
| 								<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | 								<option value="State" <?php if ($user_column1 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | ||||||
| 								<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | 								<option value="Grid" <?php if ($user_column1 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  | 								<option value="Distance" <?php if ($user_column1 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
| 								<option value="Operator" <?php if ($user_column1 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | 								<option value="Operator" <?php if ($user_column1 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
| 							</select> | 							</select> | ||||||
| 						</div> | 						</div> | ||||||
|  | @ -379,6 +380,7 @@ | ||||||
| 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | ||||||
| 								<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | 								<option value="State" <?php if ($user_column2 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | ||||||
| 								<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | 								<option value="Grid" <?php if ($user_column2 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  | 								<option value="Distance" <?php if ($user_column2 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
| 								<option value="Operator" <?php if ($user_column2 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | 								<option value="Operator" <?php if ($user_column2 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
| 							</select> | 							</select> | ||||||
| 							</div> | 							</div> | ||||||
|  | @ -398,6 +400,7 @@ | ||||||
| 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | ||||||
| 								<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | 								<option value="State" <?php if ($user_column3 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | ||||||
| 								<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | 								<option value="Grid" <?php if ($user_column3 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  | 								<option value="Distance" <?php if ($user_column3 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
| 								<option value="Operator" <?php if ($user_column3 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | 								<option value="Operator" <?php if ($user_column3 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
| 							</select> | 							</select> | ||||||
| 							</div> | 							</div> | ||||||
|  | @ -417,6 +420,7 @@ | ||||||
| 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | 								<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | ||||||
| 								<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | 								<option value="State" <?php if ($user_column4 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | ||||||
| 								<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | 								<option value="Grid" <?php if ($user_column4 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  | 								<option value="Distance" <?php if ($user_column4 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
| 								<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | 								<option value="Operator" <?php if ($user_column4 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
| 							</select> | 							</select> | ||||||
| 						</div> | 						</div> | ||||||
|  | @ -436,6 +440,7 @@ | ||||||
| 									<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | 									<option value="POTA" <?php if ($user_column1 == "POTA") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_pota'); ?></option>
 | ||||||
| 									<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | 									<option value="State" <?php if ($user_column5 == "State") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_state'); ?></option>
 | ||||||
| 									<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | 									<option value="Grid" <?php if ($user_column5 == "Grid") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_gridsquare'); ?></option>
 | ||||||
|  | 									<option value="Distance" <?php if ($user_column5 == "Distance") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_distance'); ?></option>
 | ||||||
| 									<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | 									<option value="Operator" <?php if ($user_column5 == "Operator") { echo " selected =\"selected\""; } ?>><?php echo lang('gen_hamradio_operator'); ?></option>
 | ||||||
| 									<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo lang('cloudlog_station_profile'); ?></option>
 | 									<option value="Location" <?php if ($user_column5 == "Location") { echo " selected =\"selected\""; } ?>><?php echo lang('cloudlog_station_profile'); ?></option>
 | ||||||
| 								</select> | 								</select> | ||||||
|  |  | ||||||
|  | @ -11,6 +11,7 @@ function echo_table_header_col($ctx, $name) { | ||||||
| 		case 'POTA': echo '<th>'.$ctx->lang->line('gen_hamradio_pota').'</th>'; break; | 		case 'POTA': echo '<th>'.$ctx->lang->line('gen_hamradio_pota').'</th>'; break; | ||||||
| 		case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break; | 		case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break; | ||||||
| 		case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break; | 		case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break; | ||||||
|  | 		case 'Distance': echo '<th>'.$ctx->lang->line('gen_hamradio_distance').'</th>'; break; | ||||||
| 		case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break; | 		case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</td>'; break; | ||||||
| 		case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break; | 		case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break; | ||||||
| 		case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break; | 		case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break; | ||||||
|  | @ -30,6 +31,7 @@ function echo_table_col($row, $name) { | ||||||
| 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break; | 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break; | ||||||
| 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break; | 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break; | ||||||
| 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break; | 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break; | ||||||
|  | 		case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . '</td>'; break; | ||||||
| 		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank"><span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$row->COL_SAT_NAME.'</span></a></td>'; } else { if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'. strtolower($row->COL_BAND).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break; | 		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank"><span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$row->COL_SAT_NAME.'</span></a></td>'; } else { if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'. strtolower($row->COL_BAND).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break; | ||||||
| 		case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break; | 		case 'Frequency':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'; if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'">'.$row->COL_SAT_NAME.'</span>'; } else { echo $row->COL_SAT_NAME; } echo '</a></td>'; } else { if ($row->COL_FREQ != null) { echo '<span data-toggle="tooltip" data-original-title="'.$row->COL_BAND.'">'.$ci->frequency->hz_to_mhz($row->COL_FREQ).'</span>'; } else { echo strtolower($row->COL_BAND); } } echo '</td>'; break; | ||||||
| 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break; | 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break; | ||||||
|  |  | ||||||
|  | @ -9,6 +9,7 @@ function echo_table_header_col($ctx, $name) { | ||||||
| 		case 'SOTA': echo '<th>'.$ctx->lang->line('gen_hamradio_sota').'</th>'; break; | 		case 'SOTA': echo '<th>'.$ctx->lang->line('gen_hamradio_sota').'</th>'; break; | ||||||
| 		case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break; | 		case 'State': echo '<th>'.$ctx->lang->line('gen_hamradio_state').'</th>'; break; | ||||||
| 		case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break; | 		case 'Grid': echo '<th>'.$ctx->lang->line('gen_hamradio_gridsquare').'</th>'; break; | ||||||
|  | 		case 'Distance': echo '<th>'.$ctx->lang->line('gen_hamradio_distance').'</th>'; break; | ||||||
| 		case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</th>'; break; | 		case 'Band': echo '<th>'.$ctx->lang->line('gen_hamradio_band').'</th>'; break; | ||||||
| 		case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break; | 		case 'Frequency': echo '<th>'.$ctx->lang->line('gen_hamradio_frequency').'</th>'; break; | ||||||
| 		case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break; | 		case 'Operator': echo '<th>'.$ctx->lang->line('gen_hamradio_operator').'</th>'; break; | ||||||
|  | @ -27,6 +28,7 @@ function echo_table_col($row, $name) { | ||||||
| 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break; | 		case 'WWFF':    echo '<td>' . ($row->COL_WWFF_REF) . '</td>'; break; | ||||||
| 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break; | 		case 'POTA':    echo '<td>' . ($row->COL_POTA_REF) . '</td>'; break; | ||||||
| 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break; | 		case 'Grid':    echo '<td>'; echoQrbCalcLink($row->station_gridsquare, $row->COL_VUCC_GRIDS, $row->COL_GRIDSQUARE); echo '</td>'; break; | ||||||
|  | 		case 'Distance':echo '<td>' . ($row->COL_DISTANCE ? $row->COL_DISTANCE . ' km' : '') . '</td>'; break; | ||||||
| 		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; | 		case 'Band':    echo '<td>'; if($row->COL_SAT_NAME != null) { echo '<a href="https://db.satnogs.org/search/?q='.$row->COL_SAT_NAME.'" target="_blank">'.$row->COL_SAT_NAME.'</a></td>'; } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; | ||||||
| 		case 'Frequency':    echo '<td>'; if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; | 		case 'Frequency':    echo '<td>'; if($row->COL_FREQ != null) { echo $ci->frequency->hz_to_mhz($row->COL_FREQ); } else { echo strtolower($row->COL_BAND); } echo '</td>'; break; | ||||||
| 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break; | 		case 'State':   echo '<td>' . ($row->COL_STATE) . '</td>'; break; | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用