[Date format] Fixed displaying of correct date format in qso widgets and in the previous contacts table in live/post qso.
这个提交包含在:
		
							父节点
							
								
									19c750a40c
								
							
						
					
					
						当前提交
						2d86c70e53
					
				
					共有  3 个文件被更改,包括 62 次插入 和 22 次删除
				
			
		|  | @ -471,10 +471,23 @@ class Logbook extends CI_Controller { | ||||||
| 					$html .= "<td>QSL</td>"; | 					$html .= "<td>QSL</td>"; | ||||||
| 					$html .= "<td></td>"; | 					$html .= "<td></td>"; | ||||||
| 				$html .= "</tr>"; | 				$html .= "</tr>"; | ||||||
|  | 
 | ||||||
|  | 			// Get Date format
 | ||||||
|  | 			if($this->session->userdata('user_date_format')) { | ||||||
|  | 				// If Logged in and session exists
 | ||||||
|  | 				$custom_date_format = $this->session->userdata('user_date_format'); | ||||||
|  | 			} else { | ||||||
|  | 				// Get Default date format from /config/cloudlog.php
 | ||||||
|  | 				$custom_date_format = $this->config->item('qso_date_format'); | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
| 			foreach ($query->result() as $row) | 			foreach ($query->result() as $row) | ||||||
| 			{ | 			{ | ||||||
|  | 
 | ||||||
|  | 				$timestamp = strtotime($row->COL_TIME_ON); | ||||||
|  | 
 | ||||||
| 				$html .= "<tr>"; | 				$html .= "<tr>"; | ||||||
| 					$html .= "<td>".date($this->config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON))."</td>"; | 					$html .= "<td>".date($custom_date_format, $timestamp). date(' H:i',strtotime($row->COL_TIME_ON)) . "</td>"; | ||||||
| 					$html .= "<td>".str_replace("0","Ø",strtoupper($row->COL_CALL))."</td>"; | 					$html .= "<td>".str_replace("0","Ø",strtoupper($row->COL_CALL))."</td>"; | ||||||
| 					$html .= "<td>".$row->COL_RST_SENT."</td>"; | 					$html .= "<td>".$row->COL_RST_SENT."</td>"; | ||||||
| 					$html .= "<td>".$row->COL_RST_RCVD."</td>"; | 					$html .= "<td>".$row->COL_RST_RCVD."</td>"; | ||||||
|  |  | ||||||
|  | @ -513,10 +513,26 @@ | ||||||
|                 <td><?php echo $this->lang->line('gen_hamradio_band'); ?></td>
 |                 <td><?php echo $this->lang->line('gen_hamradio_band'); ?></td>
 | ||||||
|               </tr> |               </tr> | ||||||
| 
 | 
 | ||||||
|               <?php $i = 0;  |               <?php | ||||||
|               foreach ($query->result() as $row) { ?>
 | 
 | ||||||
|                     <?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 | 			  // Get Date format
 | ||||||
|                     <td><?php echo date($this->config->item('qso_date_format').' H:i',strtotime($row->COL_TIME_ON)); ?></td>
 | 			  if($this->session->userdata('user_date_format')) { | ||||||
|  | 				  // If Logged in and session exists
 | ||||||
|  | 				  $custom_date_format = $this->session->userdata('user_date_format'); | ||||||
|  | 			  } else { | ||||||
|  | 				  // Get Default date format from /config/cloudlog.php
 | ||||||
|  | 				  $custom_date_format = $this->config->item('qso_date_format'); | ||||||
|  | 			  } | ||||||
|  | 
 | ||||||
|  | 			  $i = 0; | ||||||
|  |               foreach ($query->result() as $row) { | ||||||
|  |               	echo '<tr class="tr'.($i & 1).'">'; | ||||||
|  |                     echo '<td>'; | ||||||
|  | 						$timestamp = strtotime($row->COL_TIME_ON); | ||||||
|  | 						echo date($custom_date_format, $timestamp); | ||||||
|  | 						echo date(' H:i',strtotime($row->COL_TIME_ON)); | ||||||
|  | 					?>
 | ||||||
|  | 				  </td> | ||||||
|                   <td> |                   <td> | ||||||
|                       <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","Ø",strtoupper($row->COL_CALL)); ?></a>
 |                       <a id="edit_qso" href="javascript:displayQso(<?php echo $row->COL_PRIMARY_KEY; ?>)"><?php echo str_replace("0","Ø",strtoupper($row->COL_CALL)); ?></a>
 | ||||||
|                   </td> |                   </td> | ||||||
|  |  | ||||||
|  | @ -23,10 +23,21 @@ | ||||||
| 				<td>Band</td> | 				<td>Band</td> | ||||||
| 			</tr> | 			</tr> | ||||||
| 
 | 
 | ||||||
| 			<?php $i = 0;  | 			<?php | ||||||
|  | 
 | ||||||
|  | 			// Get Date format
 | ||||||
|  | 			if($this->session->userdata('user_date_format')) { | ||||||
|  | 				// If Logged in and session exists
 | ||||||
|  | 				$custom_date_format = $this->session->userdata('user_date_format'); | ||||||
|  | 			} else { | ||||||
|  | 				// Get Default date format from /config/cloudlog.php
 | ||||||
|  | 				$custom_date_format = $this->config->item('qso_date_format'); | ||||||
|  | 			} | ||||||
|  | 
 | ||||||
|  | 			$i = 0; | ||||||
| 			foreach ($last_five_qsos->result() as $row) { ?>
 | 			foreach ($last_five_qsos->result() as $row) { ?>
 | ||||||
| 				<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 | 				<?php  echo '<tr class="tr'.($i & 1).'">'; ?>
 | ||||||
| 					<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('d/m/y', $timestamp); ?></td>
 | 					<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date($custom_date_format, $timestamp); ?></td>
 | ||||||
| 					<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
 | 					<td><?php $timestamp = strtotime($row->COL_TIME_ON); echo date('H:i', $timestamp); ?></td>
 | ||||||
| 					<td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo str_replace("0","Ø",strtoupper($row->COL_CALL)); ?></a></td>
 | 					<td><a class="qsobox" href="<?php echo site_url('logbook/view')."/".$row->COL_PRIMARY_KEY; ?>"><?php echo str_replace("0","Ø",strtoupper($row->COL_CALL)); ?></a></td>
 | ||||||
| 					<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
 | 					<td><?php echo $row->COL_SUBMODE==null?$row->COL_MODE:$row->COL_SUBMODE; ?></td>
 | ||||||
|  |  | ||||||
		正在加载…
	
		在新工单中引用