Merge pull request #1403 from AndreasK79/dxcc_add_text_deleted
Added text (deleted dxcc) to the dropdown so it's easier to choose correct dxcc.
这个提交包含在:
		
						当前提交
						a6faa1310b
					
				
					共有  8 个文件被更改,包括 30 次插入 和 8 次删除
				
			
		|  | @ -60,7 +60,11 @@ | ||||||
| 						<option value="All">All</option> | 						<option value="All">All</option> | ||||||
| 						<?php | 						<?php | ||||||
| 						foreach($dxcc as $d){ | 						foreach($dxcc as $d){ | ||||||
| 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>'; | 							echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); | ||||||
|  | 							if ($d->Enddate != null) { | ||||||
|  | 								echo ' (deleted dxcc)'; | ||||||
|  | 							} | ||||||
|  | 							echo '</option>'; | ||||||
| 						} | 						} | ||||||
| 						?>
 | 						?>
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -33,7 +33,11 @@ | ||||||
|                         <option value="All">All</option> |                         <option value="All">All</option> | ||||||
|                         <?php |                         <?php | ||||||
|                         foreach($dxcc as $d){ |                         foreach($dxcc as $d){ | ||||||
|                             echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>'; |                             echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); | ||||||
|  |                             if ($d->Enddate != null) { | ||||||
|  |                                 echo ' (deleted dxcc)'; | ||||||
|  |                             } | ||||||
|  |                             echo '</option>'; | ||||||
|                         } |                         } | ||||||
|                         ?>
 |                         ?>
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -14,7 +14,11 @@ | ||||||
| 
 | 
 | ||||||
| 			<?php | 			<?php | ||||||
| 			foreach($dxcc as $d){ | 			foreach($dxcc as $d){ | ||||||
| 				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>'; | 				echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); | ||||||
|  | 				if ($d->Enddate != null) { | ||||||
|  | 					echo ' (deleted dxcc)'; | ||||||
|  | 				} | ||||||
|  | 				echo '</option>'; | ||||||
| 			} | 			} | ||||||
| 			?>
 | 			?>
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -266,7 +266,11 @@ | ||||||
|                                                 if ($qso->COL_DXCC == $d->adif) { |                                                 if ($qso->COL_DXCC == $d->adif) { | ||||||
|                                                     echo " selected=\"selected\""; |                                                     echo " selected=\"selected\""; | ||||||
|                                                 } |                                                 } | ||||||
|                                                 echo '>' . $d->prefix . ' - ' . $d->name . '</option>'; |                                                 echo '>' . $d->prefix . ' - ' . ucwords(strtolower($d->name)); | ||||||
|  |                                                 if ($d->Enddate != null) { | ||||||
|  |                                                     echo ' (deleted dxcc)'; | ||||||
|  |                                                 } | ||||||
|  |                                                 echo '</option>'; | ||||||
|                                             } |                                             } | ||||||
|                                             ?>
 |                                             ?>
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -258,7 +258,11 @@ | ||||||
|                       <option value="0">None</option> |                       <option value="0">None</option> | ||||||
|                       <?php |                       <?php | ||||||
|                       foreach($dxcc as $d){ |                       foreach($dxcc as $d){ | ||||||
|                           echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))) . '</option>'; |                         echo '<option value=' . $d->adif . '>' . $d->prefix . ' - ' . ucwords(strtolower(($d->name))); | ||||||
|  |                         if ($d->Enddate != null) { | ||||||
|  |                           echo ' (deleted dxcc)'; | ||||||
|  |                         } | ||||||
|  |                         echo '</option>'; | ||||||
|                       } |                       } | ||||||
|                       ?>
 |                       ?>
 | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -46,7 +46,8 @@ | ||||||
| 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp"> | 				<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp"> | ||||||
| 				<option value="0" selected>NONE</option> | 				<option value="0" selected>NONE</option> | ||||||
| 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 | 				<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 | ||||||
| 				<option value="<?php echo $dxcc->adif; ?>"><?php echo $dxcc->name; ?></option>
 | 				<option value="<?php echo $dxcc->adif; ?>"><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
 | ||||||
|  | 				</option> | ||||||
| 				<?php } ?>
 | 				<?php } ?>
 | ||||||
| 				</select> | 				</select> | ||||||
| 				<?php } ?>
 | 				<?php } ?>
 | ||||||
|  |  | ||||||
|  | @ -57,7 +57,8 @@ | ||||||
| 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp"> | 							<select class="form-control" id="dxcc_select" name="dxcc" aria-describedby="stationCallsignInputHelp"> | ||||||
| 							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
 | 							<option value="0" <?php if($my_station_profile->station_dxcc == "0") { ?>selected<?php } ?>>NONE</option>
 | ||||||
| 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 | 							<?php foreach ($dxcc_list->result() as $dxcc) { ?>
 | ||||||
| 							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo $dxcc->name; ?></option>
 | 							<option value="<?php echo $dxcc->adif; ?>" <?php if($my_station_profile->station_dxcc == $dxcc->adif) { ?>selected<?php } ?>><?php echo ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; if ($dxcc->end != NULL) echo ' (deleted dxcc)';?>
 | ||||||
|  | 							</option> | ||||||
| 							<?php } ?>
 | 							<?php } ?>
 | ||||||
| 							</select> | 							</select> | ||||||
| 							<?php } ?>
 | 							<?php } ?>
 | ||||||
|  |  | ||||||
|  | @ -21,7 +21,7 @@ | ||||||
|                         <?php |                         <?php | ||||||
|                         if ($dxcc_list->num_rows() > 0) { |                         if ($dxcc_list->num_rows() > 0) { | ||||||
|                                 foreach ($dxcc_list->result() as $dxcc) { |                                 foreach ($dxcc_list->result() as $dxcc) { | ||||||
|                                     echo '<option value=' . $dxcc->adif . '> ' . $dxcc->name . ' - ' . $dxcc->prefix; |                                     echo '<option value=' . $dxcc->adif . '> ' . ucwords(strtolower($dxcc->name)) . ' - ' . $dxcc->prefix; | ||||||
|                                     if ($dxcc->end != null) { |                                     if ($dxcc->end != null) { | ||||||
|                                         echo ' (deleted)'; |                                         echo ' (deleted)'; | ||||||
|                                     } |                                     } | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用