mirror of https://github.com/itsmrval/subway
Compare commits
No commits in common. "main" and "v1.0.2" have entirely different histories.
|
|
@ -30,7 +30,7 @@ Note: This app is not intended for production use, but for personal or education
|
||||||
This section list major frameworks/libraries used
|
This section list major frameworks/libraries used
|
||||||
|
|
||||||
* 
|
* 
|
||||||
* 
|
* 
|
||||||
* 
|
* 
|
||||||
|
|
||||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||||
|
|
@ -74,9 +74,7 @@ Then, create a user with a database
|
||||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||||
|
|
||||||
|
|
||||||
## Known issues
|
|
||||||
|
|
||||||
- Some stations with RER A doesnt display timetables
|
|
||||||
|
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
|
||||||
|
|
@ -71,21 +71,10 @@ $userDetails = getUserDetails($_SESSION['user_id']);
|
||||||
<button type="submit" class="btn btn-primary">Save Changes</button>
|
<button type="submit" class="btn btn-primary">Save Changes</button>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
||||||
<?php
|
<?php
|
||||||
function getUserLogs($userId) {
|
$query = $conn->prepare("SELECT logs.ip, logs.date, users.email FROM logs JOIN users ON logs.userId = users.id");
|
||||||
global $conn;
|
$query->execute();
|
||||||
try {
|
$logDetails = $query->fetchAll(PDO::FETCH_ASSOC);
|
||||||
$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">
|
<table class="table mt-4">
|
||||||
<thead>
|
<thead>
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,8 @@ function getStopName($stopId) {
|
||||||
function getFavorites($lineId) {
|
function getFavorites($lineId) {
|
||||||
global $conn;
|
global $conn;
|
||||||
try {
|
try {
|
||||||
$query = $conn->prepare("SELECT stopId FROM favorites WHERE lineId = ? AND userId = ?");
|
$query = $conn->prepare("SELECT stopId FROM favorites WHERE lineId = ?");
|
||||||
$query->execute([$lineId, $_SESSION['user_id']]);
|
$query->execute([$lineId]);
|
||||||
$result = $query->fetchAll(PDO::FETCH_ASSOC);
|
$result = $query->fetchAll(PDO::FETCH_ASSOC);
|
||||||
|
|
||||||
return $result;
|
return $result;
|
||||||
|
|
|
||||||
|
|
@ -13,15 +13,13 @@ $directions = [];
|
||||||
if (isset($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'])) {
|
if (isset($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'])) {
|
||||||
foreach ($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'] as $visit) {
|
foreach ($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['MonitoredStopVisit'] as $visit) {
|
||||||
$vehicleJourney = $visit['MonitoredVehicleJourney'];
|
$vehicleJourney = $visit['MonitoredVehicleJourney'];
|
||||||
if (strpos($vehicleJourney['OperatorRef']['value'], '.' . $lineId . '.' . $lineId . ':')) {
|
if (isset($vehicleJourney['MonitoredCall']['ExpectedArrivalTime'])) {
|
||||||
if (isset($vehicleJourney['MonitoredCall']['ExpectedDepartureTime'])) {
|
$direction = $vehicleJourney['DirectionName'][0]['value'];
|
||||||
$direction = $vehicleJourney['DestinationName'][0]['value'];
|
$expectedArrival = $vehicleJourney['MonitoredCall']['ExpectedArrivalTime'];
|
||||||
$expectedDeparture = $vehicleJourney['MonitoredCall']['ExpectedDepartureTime'];
|
$expectedDeparture = $vehicleJourney['MonitoredCall']['ExpectedDepartureTime'];
|
||||||
|
|
||||||
$departureTime = date('H:i', strtotime($expectedDeparture . ' +2 hours'));
|
$departureTime = date('H:i', strtotime($expectedArrival . ' +2 hours'));
|
||||||
$currentTime = date('H:i', strtotime('now' . ' +2 hours'));
|
|
||||||
|
|
||||||
if ($departureTime > $currentTime) {
|
|
||||||
if (!isset($directions[$direction])) {
|
if (!isset($directions[$direction])) {
|
||||||
$directions[$direction] = [];
|
$directions[$direction] = [];
|
||||||
}
|
}
|
||||||
|
|
@ -30,8 +28,6 @@ if (isset($data['Siri']['ServiceDelivery']['StopMonitoringDelivery'][0]['Monitor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$finalDirections = [];
|
$finalDirections = [];
|
||||||
|
|
|
||||||
|
|
@ -3,8 +3,7 @@
|
||||||
<head>
|
<head>
|
||||||
<meta charset="UTF-8">
|
<meta charset="UTF-8">
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||||
<title>Subway</title>
|
<title>Subway schedules</title>
|
||||||
<link rel="icon" href="assets/logo/favicon.png">
|
|
||||||
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
|
<link href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
|
||||||
<?php
|
<?php
|
||||||
if (!isset($_SESSION['user_id'])) {
|
if (!isset($_SESSION['user_id'])) {
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
Binary file not shown.
|
Before Width: | Height: | Size: 42 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Loading…
Reference in New Issue