Timeline fixed.
这个提交包含在:
		
							父节点
							
								
									67417b39af
								
							
						
					
					
						当前提交
						ca70049444
					
				
					共有  4 个文件被更改,包括 35 次插入 和 7 次删除
				
			
		|  | @ -37,9 +37,9 @@ class Timeline extends CI_Controller { | ||||||
|     public function details() { |     public function details() { | ||||||
|         $this->load->model('logbook_model'); |         $this->load->model('logbook_model'); | ||||||
| 
 | 
 | ||||||
|         $adif = str_replace('"', "", $this->input->get("Adif")); |         $adif = str_replace('"', "", $this->input->post("Adif")); | ||||||
|         $country = $this->logbook_model->get_entity($adif); |         $country = $this->logbook_model->get_entity($adif); | ||||||
|         $band = str_replace('"', "", $this->input->get("Band")); |         $band = str_replace('"', "", $this->input->post("Band")); | ||||||
|         $data['results'] = $this->logbook_model->timeline_qso_details($adif, $band); |         $data['results'] = $this->logbook_model->timeline_qso_details($adif, $band); | ||||||
| 
 | 
 | ||||||
|         // Render Page
 |         // Render Page
 | ||||||
|  | @ -50,9 +50,7 @@ class Timeline extends CI_Controller { | ||||||
|             $data['filter'] .= " and " . $band; |             $data['filter'] .= " and " . $band; | ||||||
|         } |         } | ||||||
| 
 | 
 | ||||||
|         $this->load->view('interface_assets/header', $data); |         $this->load->view('timeline/details', $data); | ||||||
|         $this->load->view('timeline/details'); |  | ||||||
|         $this->load->view('interface_assets/footer'); |  | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
| } | } | ||||||
|  | @ -1720,6 +1720,36 @@ $(document).ready(function(){ | ||||||
|             }); |             }); | ||||||
|         } |         } | ||||||
|         </script> |         </script> | ||||||
|  |     <?php if ($this->uri->segment(1) == "timeline") { ?>
 | ||||||
|  |         <script> | ||||||
|  |             function displayTimelineContacts(adif, band) { | ||||||
|  |                 var baseURL= "<?php echo base_url();?>"; | ||||||
|  |                 $.ajax({ | ||||||
|  |                     url: baseURL + 'index.php/timeline/details', | ||||||
|  |                     type: 'post', | ||||||
|  |                     data: {'Adif': adif, | ||||||
|  |                         'Band': band | ||||||
|  |                     }, | ||||||
|  |                     success: function(html) { | ||||||
|  |                         BootstrapDialog.show({ | ||||||
|  |                             title: 'QSO Data', | ||||||
|  |                             size: BootstrapDialog.SIZE_WIDE, | ||||||
|  |                             cssClass: 'qso-was-dialog', | ||||||
|  |                             nl2br: false, | ||||||
|  |                             message: html, | ||||||
|  |                             buttons: [{ | ||||||
|  |                                 label: 'Close', | ||||||
|  |                                 action: function (dialogItself) { | ||||||
|  |                                     dialogItself.close(); | ||||||
|  |                                 } | ||||||
|  |                             }] | ||||||
|  |                         }); | ||||||
|  |                     } | ||||||
|  |                 }); | ||||||
|  |             } | ||||||
|  |         </script> | ||||||
|  |         <?php } ?>
 | ||||||
|  | 
 | ||||||
| 
 | 
 | ||||||
|   </body> |   </body> | ||||||
| </html> | </html> | ||||||
|  |  | ||||||
|  | @ -4,4 +4,4 @@ | ||||||
| 
 | 
 | ||||||
|     <h3>Filtering on <?php echo $filter ?></h3>
 |     <h3>Filtering on <?php echo $filter ?></h3>
 | ||||||
| 
 | 
 | ||||||
|     <?php $this->load->view('view_log/partial/log') ?>
 |     <?php $this->load->view('view_log/partial/log_ajax') ?>
 | ||||||
|  |  | ||||||
|  | @ -68,7 +68,7 @@ | ||||||
|             if (!empty($line->end)) echo 'Yes'; |             if (!empty($line->end)) echo 'Yes'; | ||||||
|             echo '</td> |             echo '</td> | ||||||
|                 <td>' . $line->end . '</td> |                 <td>' . $line->end . '</td> | ||||||
|                 <td><a href=\'timeline\details?Adif="' . $line->adif . '"&Band="'. $bandselect . '"\'>Show</a></td>
 |                 <td><a href=javascript:displayTimelineContacts("' . $line->adif . '","'. $bandselect . '")>Show</a></td> | ||||||
|                </tr>'; |                </tr>'; | ||||||
|         } |         } | ||||||
|         echo '</tfoot></table></div>'; |         echo '</tfoot></table></div>'; | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用