Added "QSL via" also to LBA
这个提交包含在:
		
							父节点
							
								
									613d17642c
								
							
						
					
					
						当前提交
						8e6c4733d9
					
				
					共有  18 个文件被更改,包括 23 次插入 和 2 次删除
				
			
		|  | @ -332,7 +332,7 @@ class Labels extends CI_Controller { | ||||||
| 			$text = "Confirming QSO".($numofqsos>1 ? 's' : '')." with "; | 			$text = "Confirming QSO".($numofqsos>1 ? 's' : '')." with "; | ||||||
| 			$text .= $current_callsign; | 			$text .= $current_callsign; | ||||||
| 			if (($via) && ($qso['via'] ?? '' != '')) { | 			if (($via) && ($qso['via'] ?? '' != '')) { | ||||||
| 				$text.=' via '.substr($qso['via'],0,8); | 				$text.='   | send via '.substr($qso['via'],0,8); | ||||||
| 			} | 			} | ||||||
| 			$text .= "\n"; | 			$text .= "\n"; | ||||||
| 			$text .= $builder->renderTable(); | 			$text .= $builder->renderTable(); | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Erhalten (Elektronisch)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; | $lang['filter_actions_create_adif'] = 'Erstelle ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Label drucken'; | $lang['filter_actions_print_label'] = 'Label drucken'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Label Drucken'; | $lang['filter_actions_start_print_title'] = 'Label Drucken'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Mit Planquadrat?'; | $lang['filter_actions_print_include_grid'] = 'Mit Planquadrat?'; | ||||||
| $lang['filter_actions_start_print'] = 'Druck starten bei?'; | $lang['filter_actions_start_print'] = 'Druck starten bei?'; | ||||||
| $lang['filter_actions_print'] = 'Drucken'; | $lang['filter_actions_print'] = 'Drucken'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -115,6 +115,7 @@ $lang['filter_actions_recv_electronic'] = 'Received (Electronic)'; | ||||||
| $lang['filter_actions_create_adif'] = 'Create ADIF'; | $lang['filter_actions_create_adif'] = 'Create ADIF'; | ||||||
| $lang['filter_actions_print_label'] = 'Print Label'; | $lang['filter_actions_print_label'] = 'Print Label'; | ||||||
| $lang['filter_actions_start_print_title'] = 'Print Labels'; | $lang['filter_actions_start_print_title'] = 'Print Labels'; | ||||||
|  | $lang['filter_actions_print_include_via'] = "Include Via"; | ||||||
| $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | $lang['filter_actions_print_include_grid'] = 'Include Grid?'; | ||||||
| $lang['filter_actions_start_print'] = 'Start printing at?'; | $lang['filter_actions_start_print'] = 'Start printing at?'; | ||||||
| $lang['filter_actions_print'] = 'Print'; | $lang['filter_actions_print'] = 'Print'; | ||||||
|  |  | ||||||
|  | @ -5,6 +5,12 @@ | ||||||
|             <input class="form-check-input" type="checkbox" name="gridlabel" id="gridlabel"> |             <input class="form-check-input" type="checkbox" name="gridlabel" id="gridlabel"> | ||||||
|         </div> |         </div> | ||||||
|     </div> |     </div> | ||||||
|  |     <div class="form-group row"> | ||||||
|  |         <label class="my-1 mr-2 col-md-4" for="via"><?php echo lang('filter_actions_print_include_via'); ?></label>
 | ||||||
|  |         <div class="form-check-inline"> | ||||||
|  |             <input class="form-check-input" type="checkbox" name="via" id="via"> | ||||||
|  |         </div> | ||||||
|  |     </div> | ||||||
|     <div class="form-group row"> |     <div class="form-group row"> | ||||||
|         <label class="my-1 mr-2 col-md-4" for="startat"><?php echo lang('filter_actions_start_print'); ?></label>
 |         <label class="my-1 mr-2 col-md-4" for="startat"><?php echo lang('filter_actions_start_print'); ?></label>
 | ||||||
|         <div class="form-inline"> |         <div class="form-inline"> | ||||||
|  |  | ||||||
|  | @ -774,7 +774,7 @@ function printlabel() { | ||||||
| 		data: {'id': JSON.stringify(id_list, null, 2), | 		data: {'id': JSON.stringify(id_list, null, 2), | ||||||
| 				'startat': $('#startat').val(), | 				'startat': $('#startat').val(), | ||||||
| 				'grid': $('#gridlabel')[0].checked, | 				'grid': $('#gridlabel')[0].checked, | ||||||
| 
 | 				'via': $('#via')[0].checked, | ||||||
| 			}, | 			}, | ||||||
| 		xhr:function(){ | 		xhr:function(){ | ||||||
| 			var xhr = new XMLHttpRequest(); | 			var xhr = new XMLHttpRequest(); | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用