AS1024
/
itflow
mirror of https://github.com/itflow-org/itflow
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Do not show disabled or users that were before the trip creation date

This commit is contained in:
johnnyq 2023-11-07 16:34:32 -05:00
parent afc040bfe6
commit 5d1c283533
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
trip_add_modal.php
View File

@ -57,7 +57,6 @@
<option value="">- Select or Input Destination Address -</option>
<?php
// WIP Need to only show users within the session company
$sql_locations = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
while ($row = mysqli_fetch_array($sql_locations)) {
$location_name = nullable_htmlentities($row['location_name']);

5
trip_copy_modal.php
View File

@ -74,7 +74,10 @@
<?php
// WIP Need to only show users within the session company
$sql_trips = mysqli_query($mysqli, "SELECT * FROM users ORDER BY user_name ASC");
$sql_trips = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
LEFT JOIN user_settings on users.user_id = user_settings.user_id
WHERE user_role > 1 AND user_archived_at IS NULL ORDER BY user_name ASC"
);
while ($row = mysqli_fetch_array($sql_trips)) {
$user_id_select = intval($row['user_id']);
$user_name_select = nullable_htmlentities($row['user_name']);

7
trip_edit_modal.php
View File

@ -60,7 +60,6 @@
<option><?php echo $trip_destination; ?></option>
<?php
// WIP Need to only show users within the session company
$sql_locations_select = mysqli_query($mysqli, "SELECT * FROM locations WHERE location_archived_at IS NULL AND location_client_id = $client_id ORDER BY location_name ASC");
while ($row = mysqli_fetch_array($sql_locations_select)) {
$location_name = nullable_htmlentities($row['location_name']);
@ -95,8 +94,10 @@
<option value="">- Driver -</option>
<?php
// WIP Need to only show users within the session company
$sql_trips = mysqli_query($mysqli, "SELECT * FROM users ORDER BY user_name ASC");
$sql = mysqli_query($mysqli, "SELECT users.user_id, user_name FROM users
LEFT JOIN user_settings on users.user_id = user_settings.user_id
WHERE user_role > 1 AND user_archived_at > trip_created_at ORDER BY user_name ASC"
);
while ($row = mysqli_fetch_array($sql_trips)) {
$user_id_select = intval($row['user_id']);
$user_name_select = nullable_htmlentities($row['user_name']);