[User selectable columns] Gridsquare fix. Now shows COL_VUCC_GRIDS if COL_GRIDSQUARE is empty/null
这个提交包含在:
		
							父节点
							
								
									de5c65c121
								
							
						
					
					
						当前提交
						f0ec15b1ee
					
				
					共有  2 个文件被更改,包括 8 次插入 和 8 次删除
				
			
		|  | @ -126,7 +126,7 @@ | |||
| 						case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 						case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 						case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 						case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 						case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 					} | ||||
|  | @ -138,7 +138,7 @@ | |||
| 						case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 						case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 						case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 						case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 						case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 					} | ||||
|  | @ -150,7 +150,7 @@ | |||
| 						case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 						case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 						case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 						case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 						case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 					} | ||||
|  | @ -162,7 +162,7 @@ | |||
| 						case 'RSTR':    echo '<td class="d-none d-sm-table-cell">' . $row->COL_RST_RCVD; if ($row->COL_SRX_STRING) { echo '<span class="label">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 						case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 						case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 						case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 						case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 					} | ||||
|  |  | |||
|  | @ -110,7 +110,7 @@ | |||
| 				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 				case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 			} | ||||
|  | @ -121,7 +121,7 @@ | |||
| 				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 				case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 			} | ||||
|  | @ -133,7 +133,7 @@ | |||
| 				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 				case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 			} | ||||
|  | @ -144,7 +144,7 @@ | |||
| 				case 'RSTR':    echo '<td>' . $row->COL_RST_RCVD; if ($row->COL_SRX) { echo '<span class="badge badge-light">' . $row->COL_SRX . '</span>';}if ($row->COL_SRX_STRING) { echo '<span class="badge badge-light">' . $row->COL_SRX_STRING . '</span>';}; break; | ||||
| 				case 'Country': echo '<td>' . ucwords(strtolower(($row->COL_COUNTRY)));; break; | ||||
| 				case 'IOTA':    echo '<td>' . ($row->COL_IOTA); break; | ||||
| 				case 'Grid':    echo '<td>' . ($row->COL_GRIDSQUARE); break; | ||||
| 				case 'Grid':    echo '<td>'; echo strlen($row->COL_GRIDSQUARE)==0?$row->COL_VUCC_GRIDS:$row->COL_GRIDSQUARE; 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; | ||||
| 			} | ||||
|  |  | |||
		正在加载…
	
		在新工单中引用