Approve/void. Breaking changes to schema. Backend updates.
This commit is contained in:
166
index.php
166
index.php
@@ -119,12 +119,16 @@
|
||||
else { $badge_error="0";
|
||||
if (empty($_POST['initials'])) { $initials_error="1"; }
|
||||
else { $initials_error="0";
|
||||
if (isset($_POST['id_checked']) && $_POST['id_checked'] == '1') { $id_checked="1"; }
|
||||
else { $id_checked="0"; }
|
||||
if (isset($_POST['citizen']) && $_POST['citizen'] == '1') { $citizen="1"; }
|
||||
else { $citizen="0"; }
|
||||
$approved="2";
|
||||
echo $VisitActions->approveVisit($_POST['approvevisit'], $_POST['id_type'], $id_checked, $citizen, $_POST['badge'], $_POST['initials'], $approved);
|
||||
if (empty($_POST['citizen'])) { $citizen_error="1"; }
|
||||
elseif ($_POST['citizen'] === "00") { $citizen_error="1"; }
|
||||
else { $citizen_error="0";
|
||||
|
||||
if (isset($_POST['id_type']) && $_POST['id_type'] === 1 && isset($_POST['id_reference'])) { $id_reference_error="0"; }
|
||||
elseif (isset($_POST['id_type']) && $_POST['id_type'] === 1 && empty($_POST['id_reference'])) { $id_reference_error="1"; }
|
||||
|
||||
$approved="2";
|
||||
echo $VisitActions->approveVisit($_POST['approvevisit'], $_POST['id_type'], $_POST['id_reference'], $_POST['citizen'], $_POST['badge'], $_POST['initials'], $approved);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -218,14 +222,14 @@ $(document).on("click", ".open-voidModal", function (e) {
|
||||
<h2><i class="fas fa-home"></i> <?php echo $transLang['ACTIVEVISITS']; ?></h2>
|
||||
</div>
|
||||
<div class="col-sm">
|
||||
<input type="button" class="btn btn-success btn-lg btn-block" onClick="window.location.reload()" value="<?php echo $transLang['REFRESH']; ?>">
|
||||
<a href="index.php" type="button" class="btn btn-success btn-lg btn-block"><?php echo $transLang['REFRESH']; ?></a>
|
||||
</div>
|
||||
</div>
|
||||
<?php echo '<ul class="pagination pagination-sm"><li class="page-item disabled"><a class="page-link" href="#" tabindex="-1">' . $transLang['PAGE'] . '</a></li>'; for ($i = 1; $i <= $page_count; $i++): echo '<li class="page-item'; if ($i === $page_num): echo ' active'; else: echo ' '; endif; echo '"><a class="page-link" href="' . $_SERVER['PHP_SELF'] . '?pnum=' . $i . '">' . $i . '</a></li>'; endfor; echo '</ul>'; ?>
|
||||
<table class="table table-sm table-responsive-sm text-nowrap">
|
||||
<thead class="thead-dark">
|
||||
<tr>
|
||||
<th class="small"><?php echo $transLang['TIMEREASON']; ?></th><th class="small"><?php echo $transLang['NAME']; ?></th><th class="small"><?php echo $transLang['ESCORT']; ?></th><th class="small"><?php echo $transLang['VALIDATIONS']; ?></th><th class="small"><?php echo $transLang['BADGEINITIALS']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th class="small"><?php echo $transLang['CARNUM'] . " / " . $transLang['SSANUM']; ?></th><?php }; ?><th class="small"><?php echo $transLang['ACTIONS']; ?></th><th class="small"> </th>
|
||||
<th class="small"><?php echo $transLang['TIMEREASON']; ?></th><th class="small"><?php echo $transLang['NAME']; ?></th><th class="small"><?php echo $transLang['ESCORT']; ?></th><th class="small"><?php echo $transLang['VALIDATIONS']; ?></th><th class="small"><?php echo $transLang['BADGEINITIALS']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th class="small"><?php echo $transLang['CARNUM'] . " / " . $transLang['SSANUM']; ?></th><?php }; ?><th class="small"><?php echo $transLang['ACTIONS']; ?></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@@ -247,89 +251,114 @@ $(document).on("click", ".open-voidModal", function (e) {
|
||||
<td class="small"><?php echo $row['visits_lastname'] . ", " . $row['visits_firstname']; ?><br><img src="<?php echo $row['visits_signature']; ?>" width="200" height="50"></img></td>
|
||||
<td class="small"><?php if (!empty($row['visits_escort'])) {echo $row['visits_escort'] . '<br /><img src="' . $row['visits_escort_signature'] . '" width="200" height="50"></img>'; } ?></td>
|
||||
<td class="small">
|
||||
<?php if($row['visits_approved']==2) { ?>
|
||||
<input class="form-control form-control-sm" type="text" id="id_type" name="id_type" disabled value="<?php echo $transLang[$IDTypeInfo->getIDTypeInfo($row['visits_id_type'])[0]["idtypes_name"]]; ?>">
|
||||
<?php if($row['visits_id_checked']==1) { ?>
|
||||
<div class="form-check form-group-sm">
|
||||
<input class="form-check-input" type="checkbox" value="1" id="id_checked" name="id_checked" checked disabled>
|
||||
<?php } else { ?>
|
||||
<div class="form-check form-group-sm">
|
||||
<input class="form-check-input" type="checkbox" value="1" id="id_checked" name="id_checked" disabled>
|
||||
<?php if($row['visits_approved'] === 2) { ?>
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['ID_TYPE']; ?></span></div>
|
||||
<input class="form-control form-control-sm bg-white" type="text" id="id_type" name="id_type" disabled value="<?php echo $transLang[$IDTypeInfo->getIDTypeInfo($row['visits_id_type'])[0]["idtypes_name"]]; ?>">
|
||||
</div>
|
||||
<?php if($row['visits_id_type'] === 1) { ?>
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['REFERENCE']; ?></span></div>
|
||||
<input class="form-control form-control-sm bg-white" type="text" id="id_reference" name="id_reference" disabled value="<?php echo $row['visits_id_reference']; ?>">
|
||||
</div>
|
||||
<?php }; ?>
|
||||
<label class="form-check-label" for="id_checked"><?php echo $transLang['ID_CHECKED']; ?></label>
|
||||
</div>
|
||||
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { if($row['visits_citizen']==1) { ?>
|
||||
<div class="form-check form-group-sm">
|
||||
<input class="form-check-input" type="checkbox" value="1" id="citizen" name="citizen" checked disabled>
|
||||
<?php } else { ?>
|
||||
<div class="form-check form-group-sm">
|
||||
<input class="form-check-input" type="checkbox" value="1" id="citizen" name="citizen" disabled>
|
||||
<?php }; ?>
|
||||
<label class="form-check-label" for="citizen"><?php echo $transLang['CITIZEN']; ?></label>
|
||||
</div>
|
||||
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { ?>
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['CITIZEN']; ?></span></div>
|
||||
<input class="form-control form-control-sm bg-white" type="text" id="citizen" name="citizen" disabled value="<?php echo $row['visits_citizen']; ?>">
|
||||
</div>
|
||||
<?php }; ?>
|
||||
</td>
|
||||
<td class="small"><input type="text" id="badge" name="badge" class="form-control form-control-sm" autofocus disabled value="<?php echo $row['visits_badge']; ?>"><br><?php echo $Users->getUserInitials($row['visits_initials'])[0]["users_firstname"] . " " . $Users->getUserInitials($row['visits_initials'])[0]["users_lastname"]; ?></td>
|
||||
<td class="small">
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['BADGE']; ?></span></div>
|
||||
<input class="form-control form-control-sm bg-white" type="text" id="badge" name="badge" disabled value="<?php echo $row['visits_badge']; ?>">
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['USERNAME']; ?></span></div>
|
||||
<input class="form-control form-control-sm bg-white" type="text" id="who" name="who" disabled value="<?php echo $Users->getUserInitials($row['visits_initials'])[0]["users_firstname"] . " " . $Users->getUserInitials($row['visits_initials'])[0]["users_lastname"]; ?>">
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
</td>
|
||||
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
|
||||
<td class="small"><?php echo $carnum; ?> / <?php echo $ssanum; ?></td>
|
||||
<?php }; ?>
|
||||
<td class="small"> </td>
|
||||
<td class="small"><button type="submit" name="endvisit" value="<?php echo $row['visits_id']; ?>" class="btn btn-warning btn-block"><i class="fas fa-sign-out-alt"></i> <?php echo $transLang['SIGNOUT']; ?></button><br>
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<input placeholder=" / / : : " name="outtime" type="text" class="form-control form-control-sm datetimepicker-input datetimepicker-<?php echo $row['visits_id']; ?>" id="datetimepicker-<?php echo $row['visits_id']; ?>" data-toggle="datetimepicker" data-target=".datetimepicker-<?php echo $row['visits_id']; ?>"/>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.datetimepicker-<?php echo $row['visits_id']; ?>').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss'});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
<td class="small">
|
||||
<div class="input-group input-group-sm mb-0">
|
||||
<button type="submit" name="endvisit" value="<?php echo $row['visits_id']; ?>" class="btn btn-warning btn-block btn-sm"><i class="fas fa-sign-out-alt"></i> <?php echo $transLang['SIGNOUT']; ?></button>
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="fas fa-clock"></i></span></div>
|
||||
<input placeholder="<?php echo $transLang['OPTIONAL']; ?>" name="outtime" type="text" class="form-control form-control-sm bg-white datetimepicker-input datetimepicker-<?php echo $row['visits_id']; ?>" id="datetimepicker-<?php echo $row['visits_id']; ?>" data-toggle="datetimepicker" data-target=".datetimepicker-<?php echo $row['visits_id']; ?>"/>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.datetimepicker-<?php echo $row['visits_id']; ?>').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss'});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
|
||||
</td>
|
||||
<?php } else { ?>
|
||||
<select class="form-control form-control-sm custom-select<?php if( isset($id_type_error) && $id_type_error == "1" && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" id="id_type" aria-label="ID Type" name="id_type">
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['ID_TYPE']; ?></span></div>
|
||||
<select class="form-control form-control-sm bg-white custom-select<?php if( isset($id_type_error) && $id_type_error === 1 && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" id="id_type-<?php echo $row['visits_id']; ?>" aria-label="ID Type" name="id_type">
|
||||
<option value="" selected><?php echo $transLang['SELECTID']; ?></option><?php foreach($IDTypeInfo->getIDTypeInfo("%") as $row): ?>
|
||||
<option value="<?php echo $row['idtypes_id']; ?>"><?php echo $transLang[$row['idtypes_name']]; ?></option><?php endforeach; ?>
|
||||
</select>
|
||||
<div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
|
||||
<div class="form-check form-group-sm">
|
||||
<input class="form-check-input" type="checkbox" value="1" id="id_checked" name="id_checked">
|
||||
<label class="form-check-label" for="id_checked"><?php echo $transLang['ID_CHECKED']; ?></label>
|
||||
</div>
|
||||
|
||||
<div id="ticket-<?php echo $visitid; ?>" name="ticket-<?php echo $visitid; ?>" class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['REFERENCE']; ?></span></div>
|
||||
<input class="form-control form-control-sm bg-white<?php if( isset($id_reference_error) && $id_reference_error === 1 && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" type="text" id="id_reference-<?php echo $visitid; ?>" name="id_reference">
|
||||
<div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$('#id_type-<?php echo $visitid; ?>').change(function() {
|
||||
if ($(this).val() === "1") {
|
||||
$('#ticket-<?php echo $visitid; ?>').show();
|
||||
$('#id_reference-<?php echo $visitid; ?>').attr('required', '');
|
||||
$('#id_reference-<?php echo $visitid; ?>').attr('data-error', 'This field is required.');
|
||||
} else {
|
||||
$('#ticket-<?php echo $visitid; ?>').hide();
|
||||
$('#id_reference-<?php echo $visitid; ?>').removeAttr('required');
|
||||
$('#id_reference-<?php echo $visitid; ?>').removeAttr('data-error');
|
||||
}
|
||||
});
|
||||
$('#id_type-<?php echo $visitid; ?>').trigger("change");
|
||||
</script>
|
||||
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "US") { ?>
|
||||
<div class="form-check form-group-sm">
|
||||
<input class="form-check-input" type="checkbox" value="1" id="citizen" name="citizen">
|
||||
<label class="form-check-label" for="citizen"><?php echo $transLang['CITIZEN']; ?></label>
|
||||
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['CITIZEN']; ?></span></div>
|
||||
<select class="form-control form-control-sm bg-white custom-select<?php if( isset($citizen_error) && $citizen_error == "1" && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" id="citizen" name="citizen">
|
||||
<option value="00" selected><?php echo $transLang['COUNTRY']; ?></option>
|
||||
<?php
|
||||
foreach ($VisitInfo->countries as $key => $value) { ?>
|
||||
<option value="<?php echo $key; ?>"><?php echo $value['country']; ?></option><?php }; ?>
|
||||
</select>
|
||||
<div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
|
||||
|
||||
</div>
|
||||
|
||||
<?php }; ?>
|
||||
<td class="small">
|
||||
<input type="text" id="badge" name="badge" class="form-control form-control-sm<?php if( isset($badge_error) && $badge_error == "1" && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" placeholder="<?php echo $transLang['BADGE']; ?>" autofocus maxlength="15">
|
||||
<div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
|
||||
<input type="hidden" id="initials" name="initials" class="form-control<?php if( isset($initials_error) && $initials_error == "1" && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" placeholder="<?php echo $uid; ?>" value="<?php echo $uid; ?>" autofocus maxlength="5">
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><?php echo $transLang['BADGE']; ?></span></div>
|
||||
<input type="text" id="badge" name="badge" class="form-control form-control-sm bg-white<?php if( isset($badge_error) && $badge_error == "1" && $_POST['approvevisit'] == $visitid ) { echo " is-invalid"; } ?>" autofocus maxlength="15">
|
||||
<div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
|
||||
</div>
|
||||
<input type="hidden" id="initials" name="initials" placeholder="<?php echo $uid; ?>" value="<?php echo $uid; ?>">
|
||||
</td>
|
||||
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
|
||||
<td class="small"><?php echo $carnum; ?> / <?php echo $ssanum; ?></td>
|
||||
<?php }; ?>
|
||||
<td class="small">
|
||||
<button type="submit" name="approvevisit" value="<?php echo $visitid; ?>" class="btn btn-success btn-block btn-sm"><i class="fas fa-thumbs-up"></i> <?php echo $transLang['APPROVE']; ?></button><br /><a data-toggle="modal" data-target="#voidModal" data-id="<?php echo $visitid; ?>" href="#voidModal" name="voidvisit" value="<?php echo $visitid; ?>" class="btn btn-danger btn-block btn-sm open-voidModal"><i class="fas fa-thumbs-down"></i> <?php echo $transLang['DECLINE']; ?></a>
|
||||
</td>
|
||||
<td class="small">
|
||||
<button type="submit" name="endvisit" value="<?php echo $visitid; ?>" class="btn btn-warning btn-block btn-sm"><i class="fas fa-sign-out-alt"></i> <?php echo $transLang['SIGNOUT']; ?></button>
|
||||
<br>
|
||||
<div>
|
||||
<div class="row">
|
||||
<div class="col">
|
||||
<input placeholder=" / / : : " name="outtime" type="text" class="form-control form-control-sm datetimepicker-input datetimepicker-<?php echo $visitid; ?>" id="datetimepicker-<?php echo $visitid; ?>" data-toggle="datetimepicker" data-target=".datetimepicker-<?php echo $visitid; ?>" />
|
||||
</div>
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.datetimepicker-<?php echo $visitid; ?>').datetimepicker({'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss'});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-0">
|
||||
<button type="submit" name="approvevisit" value="<?php echo $visitid; ?>" class="btn btn-success btn-block btn-sm"><i class="fas fa-thumbs-up"></i> <?php echo $transLang['APPROVE']; ?></button>
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-0">
|
||||
<a data-toggle="modal" data-target="#voidModal" data-id="<?php echo $visitid; ?>" href="#voidModal" name="voidvisit" value="<?php echo $visitid; ?>" class="btn btn-danger btn-block btn-sm open-voidModal"><i class="fas fa-thumbs-down"></i> <?php echo $transLang['DECLINE']; ?></a>
|
||||
</div>
|
||||
<div class="input-group input-group-sm mb-0"><div class="input-group-prepend"><span class="input-group-text" id="basic-addon1"><i class="fas fa-clock"></i></span></div>
|
||||
<input placeholder="<?php echo $transLang['OPTIONAL']; ?>" name="outtime" type="text" class="form-control form-control-sm bg-white datetimepicker-input datetimepicker-<?php echo $visitid; ?>" id="datetimepicker-<?php echo $visitid; ?>" data-toggle="datetimepicker" data-target=".datetimepicker-<?php echo $visitid; ?>" />
|
||||
<script type="text/javascript">
|
||||
$(function () {
|
||||
$('.datetimepicker-<?php echo $visitid; ?>').datetimepicker({'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss'});
|
||||
});
|
||||
</script>
|
||||
</div>
|
||||
</td>
|
||||
<?php }; ?>
|
||||
@@ -340,7 +369,8 @@ $(document).on("click", ".open-voidModal", function (e) {
|
||||
</table>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<!-- USER CONTENT END -->
|
||||
<?php }; require_once("inc/footer.inc.php");
|
||||
|
||||
Reference in New Issue
Block a user