diff --git a/application/views/satellite/skedtable.php b/application/views/satellite/skedtable.php index 37a80e9bf..4490a5808 100644 --- a/application/views/satellite/skedtable.php +++ b/application/views/satellite/skedtable.php @@ -1,5 +1,33 @@ '; + echo ' + + ' . __("Satellite") . ' + ' . __("Date") . ' + ' . __("Sked AOS Time") . ' + ' . __("Sked LOS Time") . ' + ' . __("Duration") . ' + + + '; + + foreach ($overlaps as $overlap) { + $satellite = $overlap['grid1']->satname; + $skedDate = Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone ?? 'UTC', $format); + + $skedAOS = $overlap['grid1']->visible_aos < $overlap['grid2']->visible_aos ? $overlap['grid2']->visible_aos : $overlap['grid1']->visible_aos; + $skedLOS = $overlap['grid1']->visible_los < $overlap['grid2']->visible_los ? $overlap['grid1']->visible_los : $overlap['grid2']->visible_los; + $timestamp = strtotime($date); + + echo ''; + echo "". $satellite . ""; + echo "" . date($custom_date_format, $timestamp) . ""; + echo "" . Predict_Time::daynum2readable($skedAOS, $zone ?? 'UTC', $format) . ""; + echo "" . Predict_Time::daynum2readable($skedLOS, $zone ?? 'UTC', $format) . ""; + echo "" . returntimediff(Predict_Time::daynum2readable($skedAOS, $zone ?? 'UTC', $format), Predict_Time::daynum2readable($skedLOS, $zone ?? 'UTC', $format), $format) . ""; + echo ""; + } echo ''; echo ' @@ -49,35 +77,8 @@ if (!empty($overlaps)) { echo ""; echo "
"; + echo ""; - echo ''; - echo ' - - - - - - - - - '; - - foreach ($overlaps as $overlap) { - $satellite = $overlap['grid1']->satname; - $skedDate = Predict_Time::daynum2readable($overlap['grid1']->visible_aos, $zone ?? 'UTC', $format); - - $skedAOS = $overlap['grid1']->visible_aos < $overlap['grid2']->visible_aos ? $overlap['grid2']->visible_aos : $overlap['grid1']->visible_aos; - $skedLOS = $overlap['grid1']->visible_los < $overlap['grid2']->visible_los ? $overlap['grid1']->visible_los : $overlap['grid2']->visible_los; - $timestamp = strtotime($date); - - echo ''; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - } } else { echo '
'; echo '

'.__('Search failed!').'

';
' . __("Satellite") . '' . __("Date") . '' . __("Sked AOS Time") . '' . __("Sked LOS Time") . '' . __("Duration") . '
". $satellite . "" . date($custom_date_format, $timestamp) . "" . Predict_Time::daynum2readable($skedAOS, $zone ?? 'UTC', $format) . "" . Predict_Time::daynum2readable($skedLOS, $zone ?? 'UTC', $format) . "" . returntimediff(Predict_Time::daynum2readable($skedAOS, $zone ?? 'UTC', $format), Predict_Time::daynum2readable($skedLOS, $zone ?? 'UTC', $format), $format) . "