valentin
/
subway
mirror of https://github.com/itsmrval/subway
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(home) direction for 3 branches

main v1.0.3
Valentin 2024-06-19 17:08:35 +02:00
parent 8d942f4e78
commit c80e41c953
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
components/account/main.php
View File

@ -71,10 +71,21 @@ $userDetails = getUserDetails($_SESSION['user_id']);
<button type="submit" class="btn btn-primary">Save Changes</button>
</form>
</div>
<?php
$query = $conn->prepare("SELECT logs.ip, logs.date, users.email FROM logs JOIN users ON logs.userId = users.id");
$query->execute();
$logDetails = $query->fetchAll(PDO::FETCH_ASSOC);
function getUserLogs($userId) {
global $conn;
try {
$query = $conn->prepare("SELECT logs.ip, logs.date, users.email FROM logs JOIN users ON logs.userId = users.id WHERE logs.userId = ?");
$query->execute([$userId]);
return $query->fetchAll(PDO::FETCH_ASSOC);
} catch(PDOException $e) {
return [];
}
}
$logDetails = getUserLogs($_SESSION['user_id']);
?>
<table class="table mt-4">
<thead>

12
components/homepage/stop.php
View File

@ -13,13 +13,15 @@ $directions = [];
if (isset($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'])) {
foreach ($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'] as $visit) {
$vehicleJourney = $visit['MonitoredVehicleJourney'];
if (isset($vehicleJourney['MonitoredCall']['ExpectedArrivalTime'])) {
$direction = $vehicleJourney['DirectionName'][0]['value'];
$expectedArrival = $vehicleJourney['MonitoredCall']['ExpectedArrivalTime'];
if (strpos($vehicleJourney['OperatorRef']['value'], '.' . $lineId . '.' . $lineId . ':')) {
if (isset($vehicleJourney['MonitoredCall']['ExpectedDepartureTime'])) {
$direction = $vehicleJourney['DestinationName'][0]['value'];
$expectedDeparture = $vehicleJourney['MonitoredCall']['ExpectedDepartureTime'];
$departureTime = date('H:i', strtotime($expectedArrival . ' +2 hours'));
$departureTime = date('H:i', strtotime($expectedDeparture . ' +2 hours'));
$currentTime = date('H:i', strtotime('now' . ' +2 hours'));
if ($departureTime > $currentTime) {
if (!isset($directions[$direction])) {
$directions[$direction] = [];
}
@ -28,6 +30,8 @@ if (isset($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['Monitor
}
}
}
}
}
}
$finalDirections = [];