Point808/LobbySIO
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VWF fixes. Guard fixes. Signout fixes. Impact fields added. Date fix. Manual sign-in added. VWF verbiage. Lock VWF fields. Split sigs. Force form completion before signout. Fix all datetimes. Fix leftover error/troubleshooting array printout.

Browse Source
This commit is contained in:
Josh North
2021-06-15 01:47:09 -04:00
parent 51a2df894e
commit eea5a03e9c
52 changed files with 31753 additions and 4105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

239
index.php
View File

@@ -166,14 +166,60 @@ if (Registry::AUTHMETHOD == 'SAML') {
// UPDATE VENDOR RECORD IF POSTED
if (!empty($_POST['updateinitialvendorvisit'])) {
echo $VisitActions->setInfoVendorVisitInitial($_POST['db_vendorinfo_id'], $_POST['db_vendorinfo_contact1'], $_POST['db_vendorinfo_contact2'], $_POST['db_vendorinfo_workstart'], $_POST['db_vendorinfo_workend'], $_POST['db_vendorinfo_checklistrequired'], $_POST['db_vendorinfo_routinework'], $_POST['db_vendorinfo_nonroutinework'], $_POST['db_vendorinfo_coi'], $_POST['db_vendorinfo_worksummary'], $_POST['db_vendorinfo_equipmentsummary'] );
echo $VisitActions->setInfoVendorVisitInitial($_POST['db_vendorinfo_id'], $_POST['db_vendorinfo_checklistrequired'], $_POST['db_vendorinfo_routinework'], $_POST['db_vendorinfo_nonroutinework'], $_POST['db_vendorinfo_coi'], $_POST['db_vendorinfo_worksummary'], $_POST['db_vendorinfo_equipmentsummary'] );
}
// FINALIZE VENDOR RECORD IF POSTED
if (!empty($_POST['updatefinalvendorvisit'])) {
echo $VisitActions->setInfoVendorVisitFinal($_POST['db_vendorinfo_id'], $_POST['db_vendorinfo_checklistcompleted'], $_POST['db_vendorinfo_workcompleted'], $_POST['db_vendorinfo_sitecleanup'], $uid, $_POST['db_vendorinfo_doccompleted'] );
}
// MANUAL SIGNIN
$form_data = filter_input_array(INPUT_POST, [
'form_data_stage' => (string)FILTER_SANITIZE_STRING,
'form_data_siteid' => (int)FILTER_VALIDATE_INT,
'form_data_isvendor' => (int)FILTER_VALIDATE_INT,
'form_data_manualsignindate' => (string)FILTER_SANITIZE_STRING,
'form_data_firstname' => (string)FILTER_SANITIZE_STRING,
'form_data_lastname' => (string)FILTER_SANITIZE_STRING,
'form_data_carnum' => (string)FILTER_SANITIZE_STRING,
'form_data_ssanum' => (string)FILTER_SANITIZE_STRING,
'form_data_company' => (string)FILTER_SANITIZE_STRING,
'form_data_contact1' => (string)FILTER_SANITIZE_STRING,
'form_data_contact2' => (string)FILTER_SANITIZE_STRING,
'form_data_workstart' => (string)FILTER_SANITIZE_STRING,
'form_data_workend' => (string)FILTER_SANITIZE_STRING,
'form_data_visittype' => (int)FILTER_VALIDATE_INT,
'form_data_escortrequired' => (int)FILTER_VALIDATE_INT,
'form_data_v_signature' => (string)FILTER_SANITIZE_STRING,
'form_data_e_signature' => (string)FILTER_SANITIZE_STRING,
'form_data_escortname' => (string)FILTER_SANITIZE_STRING
]);
// SET MANUALSIGNIN STAGE
if(!empty($form_data['form_data_stage'])){
if($form_data['form_data_stage']==='manualsignin'){
if(!empty($form_data['form_data_manualsignindate'])){
$manualdate = new DateTime($form_data['form_data_manualsignindate'], new DateTimeZone($timezone));
$manualdate->setTimeZone(new DateTimeZone('UTC'));
$form_data['form_data_manualsignindate']=$manualdate->format('Y-m-d H:i:s');
} else {
$form_data['form_data_manualsignindate'] = $StaticFunctions->getUTC();
}
if (empty($form_data['form_data_carnum'])) { $carnum="";} else {$carnum=$form_data['form_data_carnum'];}
if (empty($form_data['form_data_ssanum'])) { $ssanum="";} else {$ssanum=$form_data['form_data_ssanum'];}
if (empty($form_data['form_data_isvendor'])) { $isvendor="0";} else {$isvendor=$form_data['form_data_isvendor'];}
if (empty($form_data['form_data_contact1'])) { $db_vendorinfo_contact1="";} else {$db_vendorinfo_contact1=$form_data['form_data_contact1'];}
if (empty($form_data['form_data_contact2'])) { $db_vendorinfo_contact2="";} else {$db_vendorinfo_contact2=$form_data['form_data_contact2'];}
if (empty($form_data['form_data_workstart'])) { $db_vendorinfo_workstart="";} else {$db_vendorinfo_workstart=$form_data['form_data_workstart'];}
if (empty($form_data['form_data_workend'])) { $db_vendorinfo_workend="";} else {$db_vendorinfo_workend=$form_data['form_data_workend'];}
$visitid = $VisitActions->newVisit($form_data['form_data_firstname'], $form_data['form_data_lastname'], $form_data['form_data_company'], $form_data['form_data_visittype'], $form_data['form_data_manualsignindate'], $form_data['form_data_v_signature'], $form_data['form_data_siteid'], "1", $form_data['form_data_e_signature'], $form_data['form_data_escortname'], $carnum, $ssanum, $isvendor);
if($form_data['form_data_isvendor'] === (int)"1") {
$vendorid = $VisitActions->setInfoVendorVisitNew($visitid, $db_vendorinfo_contact1, $db_vendorinfo_contact2, $db_vendorinfo_workstart, $db_vendorinfo_workend);
}
}
}
// If post is approved, save after error checking.
if (!empty($_POST['approvevisit'])) {
if (empty($_POST['id_type'])) { $id_type_error=1; } else {$id_type_error=0;};
@@ -217,6 +263,9 @@ if (Registry::AUTHMETHOD == 'SAML') {
<!-- void notes -->
<!-- START VOID MODAL -->
<div class="modal fade" id="voidModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
@@ -251,13 +300,15 @@ if (Registry::AUTHMETHOD == 'SAML') {
<!-- START VISITS LIST -->
<div class="container-fluid">
<div class="row">&nbsp;</div>
<div class="row row-cols-2">
<div class="row row-cols-3">
<div class="col d-grid gap-2">
<h2><i class="fas fa-home"></i> <?php echo $transLang['ACTIVEVISITS']; ?></h2>
</div>
<div class="col d-grid gap-2">
<a href="index.php" type="button" class="btn btn-success btn-lg"><?php echo $transLang['REFRESH']; ?></a>
<a data-bs-toggle="modal" data-bs-target="#signinModal" href="#signinModal" name="signinModal" type="button" class="btn btn-primary btn-lg open-signinModal"><i class="fa fas fa-sign-in-alt"></i> <?php echo $transLang['SIGNIN']; ?></a>
</div>
<div class="col d-grid gap-2">
<a href="index.php" type="button" class="btn btn-success btn-lg"><i class="fa fa-redo"></i> <?php echo $transLang['REFRESH']; ?></a>
</div>
</div>
<div class="row row-cols-1">
@@ -270,6 +321,144 @@ if (Registry::AUTHMETHOD == 'SAML') {
</ul>
</div>
</div>
<!-- START MANUAL SIGNIN FORM MODAL -->
<div class="modal fade" id="signinModal" tabindex="-1" role="dialog">
<div class="modal-dialog modal-lg" role="document">
<div class="modal-content">
<div class="modal-header text-light bg-secondary">
<h5 class="modal-title" id="termsModalLongTitle"><?php echo $transLang['SIGNIN']; ?></h5>
<button type="button" class="btn-close" data-bs-dismiss="modal"></button>
</div>
<div class="modal-body">
<form method="post">
<input type="hidden" name="form_data_stage" id="form_data_stage" value="manualsignin" />
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_manualsignindate">Sign In Date/Time&nbsp;<i class="fas fa-clock"></i></span>
<input placeholder="" name="form_data_manualsignindate" type="text" class="form-control bg-white datetimepicker-input datetimepicker-form_data_manualsignindate" id="datetimepicker-form_data_manualsignindate" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_manualsignindate"/>
<script type="text/javascript">
$(function () {
$('.datetimepicker-form_data_manualsignindate').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
});
</script>
</div>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['FIRSTNAME']; ?></span>
<input class="form-control" id="form_data_firstname" name="form_data_firstname" />
</div>
</div>
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['LASTNAME']; ?></span>
<input class="form-control" id="form_data_lastname" name="form_data_lastname" />
</div>
</div>
</div>
<input type="hidden" name="form_data_siteid" id="form_data_siteid" value="<?php echo $siteid; ?>" />
<input type="hidden" name="form_data_v_signature" id="form_data_v_signature" value="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAAAyCAQAAACzWFxqAAAAXklEQVR42u3RMQEAAAzCsOHf9CxwcqQSmpymigVABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASIgAARECACAkRABASI2h4b9QAzse8LYwAAAABJRU5ErkJggg==" />
<?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="input-group mb-3">
<span class="input-group-text"><?php echo $transLang['CARNUM']; ?></span>
<input type="text" id="form_data_carnum" name="form_data_carnum" class="form-control" placeholder="<?php echo $transLang['CARNUM']; ?>" required autofocus>
</div>
</div>
<div class="col d-grid gap-2">
<div class="input-group mb-3">
<span class="input-group-text"><?php echo $transLang['SSANUM']; ?></span>
<input type="text" id="form_data_ssanum" name="form_data_ssanum" class="form-control" placeholder="<?php echo $transLang['SSANUM']; ?>" required autofocus>
</div>
</div>
</div>
<?php } ?>
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['COMPANY']; ?></span>
<input class="form-control" id="form_data_company" name="form_data_company" />
</div>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT1']; ?></span>
<input class="form-control" id="form_data_contact1" name="form_data_contact1" />
</div>
</div>
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT2']; ?></span>
<input class="form-control" id="form_data_contact2" name="form_data_contact2" />
</div>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"><?php echo $transLang['VENDORINFO-WORKSTART']; ?>&nbsp;<i class="fas fa-clock"></i></span>
<input placeholder="" name="form_data_workstart" type="text" class="form-control bg-white datetimepicker-input datetimepicker-form_data_workstart" id="datetimepicker-form_data_workstart" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workstart"/>
<script type="text/javascript">
$(function () {
$('.datetimepicker-form_data_workstart').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
});
</script>
</div>
</div>
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text" data-bs-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"><?php echo $transLang['VENDORINFO-WORKEND']; ?>&nbsp;<i class="fas fa-clock"></i></span>
<input placeholder="" name="form_data_workend" type="text" class="form-control bg-white datetimepicker-input datetimepicker-form_data_workend" id="datetimepicker-form_data_workend" data-toggle="datetimepicker" data-target=".datetimepicker-form_data_workend"/>
<script type="text/javascript">
$(function () {
$('.datetimepicker-form_data_workend').datetimepicker({'timeZone': '<?php echo $timezone; ?>', 'sideBySide':true, 'format':'YYYY-MM-DD HH:mm:ss', 'allowInputToggle': true });
});
</script>
</div>
</div>
</div>
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['REASON']; ?></span>
<select class="form-select" id="form_data_visittype" name="form_data_visittype" required>
<option value="" selected><?php echo $transLang['SELECTREASON']; ?></option><?php foreach($VisitTypeInfo->getInfoVisitType("%","%") as $vtrow): ?>
<option value="<?php echo $vtrow['visittypes_id']; ?>">[<?php if($vtrow['visittypes_isvendor']===0){echo "Visitor";}elseif($vtrow['visittypes_isvendor']===1){echo "Vendor";} ?>] <?php echo $transLang[$vtrow['visittypes_name']]; ?></option><?php endforeach; ?>
</select>
</div>
</div>
</div>
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['ENAME']; ?></span>
<input type="text" id="form_data_escortname" name="form_data_escortname" class="form-control" placeholder="<?php echo $transLang['ETAG']; ?>" autofocus>
</div>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<button type="button" class="btn btn-secondary" data-bs-dismiss="modal"><i class="fas fa-ban"></i>&nbsp;<?php echo $transLang['CANCEL']; ?></button>
</div>
<div class="col d-grid gap-2">
<button type="submit" class="btn btn-success"><i class="fas fa-save"></i>&nbsp;<?php echo $transLang['SAVE']; ?></button>
</div>
</div>
</form>
</div>
</div>
</div>
</div>
<!-- END MANUAL SIGNIN FORM MODAL -->
<div class="row row-cols-1">
<div class="col d-grid gap-2">
<table class="table table-sm table-responsive-sm text-nowrap">
@@ -291,6 +480,10 @@ if (Registry::AUTHMETHOD == 'SAML') {
?>
<?php if($isvendor===1 && $visitapproved===1){ ?>
<!-- START INITIAL VENDOR FORM MODAL -->
<?php foreach ($VisitInfo->getInfoVendorVisitInitial($visitid) as $rowvn) {
@@ -299,6 +492,7 @@ if (Registry::AUTHMETHOD == 'SAML') {
$db_vendorinfo_contact2 = $rowvn['db_vendorinfo_contact2'];
$db_vendorinfo_workstart = $rowvn['db_vendorinfo_workstart'];
$db_vendorinfo_workend = $rowvn['db_vendorinfo_workend'];
$db_vendorinfo_customerimpacted = $rowvn['db_vendorinfo_customerimpacted'];
$db_vendorinfo_checklistrequired= $rowvn['db_vendorinfo_checklistrequired'];
$db_vendorinfo_routinework = $rowvn['db_vendorinfo_routinework'];
$db_vendorinfo_nonroutinework = $rowvn['db_vendorinfo_nonroutinework'];
@@ -318,19 +512,24 @@ if (Registry::AUTHMETHOD == 'SAML') {
</div>
<div class="modal-body">
<form method="post">
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<p><?php echo $transLang['VENDORINFO-DOCUMENTATIONREQUIRED']; ?></p>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<input type="hidden" name="updateinitialvendorvisit" id="updateinitialvendorvisit" value="updateinitialvendorvisit" />
<input type="hidden" name="db_vendorinfo_id" id="db_vendorinfo_id" value="<?php echo $db_vendorinfo_id; ?>" />
<span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT1']; ?></span>
<input class="form-control" id="db_vendorinfo_contact1" name="db_vendorinfo_contact1" placeholder="<?php echo $db_vendorinfo_contact1; ?>" value="<?php echo $db_vendorinfo_contact1; ?>" />
<input class="form-control" id="db_vendorinfo_contact1" name="db_vendorinfo_contact1" placeholder="<?php echo $db_vendorinfo_contact1; ?>" value="<?php echo $db_vendorinfo_contact1; ?>" disabled />
</div>
</div>
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-CONTACT2']; ?></span>
<input class="form-control" id="db_vendorinfo_contact2" name="db_vendorinfo_contact2" placeholder="<?php echo $db_vendorinfo_contact2; ?>" value="<?php echo $db_vendorinfo_contact2; ?>" />
<input class="form-control" id="db_vendorinfo_contact2" name="db_vendorinfo_contact2" placeholder="<?php echo $db_vendorinfo_contact2; ?>" value="<?php echo $db_vendorinfo_contact2; ?>" disabled />
</div>
</div>
</div>
@@ -338,13 +537,21 @@ if (Registry::AUTHMETHOD == 'SAML') {
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKSTART']; ?></span>
<input class="form-control" id="db_vendorinfo_workstart" name="db_vendorinfo_workstart" placeholder="<?php echo $db_vendorinfo_workstart; ?>" value="<?php echo $db_vendorinfo_workstart; ?>" />
<input class="form-control" id="db_vendorinfo_workstart" name="db_vendorinfo_workstart" placeholder="<?php echo $db_vendorinfo_workstart; ?>" value="<?php echo $db_vendorinfo_workstart; ?>" disabled />
</div>
</div>
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-WORKEND']; ?></span>
<input class="form-control" id="db_vendorinfo_workend" name="db_vendorinfo_workend" placeholder="<?php echo $db_vendorinfo_workend; ?>" value="<?php echo $db_vendorinfo_workend; ?>" />
<input class="form-control" id="db_vendorinfo_workend" name="db_vendorinfo_workend" placeholder="<?php echo $db_vendorinfo_workend; ?>" value="<?php echo $db_vendorinfo_workend; ?>" disabled />
</div>
</div>
</div>
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-CUSTOMERIMPACTED']; ?></span>
<input class="form-control" id="db_vendorinfo_customerimpacted" name="db_vendorinfo_customerimpacted" placeholder="<?php echo $db_vendorinfo_customerimpacted; ?>" value="<?php echo $db_vendorinfo_customerimpacted; ?>" disabled />
</div>
</div>
</div>
@@ -421,6 +628,7 @@ $db_vendorinfo_contact1 = $rowvm['db_vendorinfo_contact1'];
$db_vendorinfo_contact2 = $rowvm['db_vendorinfo_contact2'];
$db_vendorinfo_workstart = $rowvm['db_vendorinfo_workstart'];
$db_vendorinfo_workend = $rowvm['db_vendorinfo_workend'];
$db_vendorinfo_customerimpacted = $rowvm['db_vendorinfo_customerimpacted'];
$db_vendorinfo_checklistrequired = $rowvm['db_vendorinfo_checklistrequired'];
$db_vendorinfo_routinework = $rowvm['db_vendorinfo_routinework'];
$db_vendorinfo_nonroutinework = $rowvm['db_vendorinfo_nonroutinework'];
@@ -442,6 +650,11 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
</div>
<div class="modal-body">
<form method="post">
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<p><?php echo $transLang['VENDORINFO-DOCUMENTATIONREQUIRED']; ?></p>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
@@ -472,6 +685,14 @@ if ($db_vendorinfo_workcompleted === 1 && $db_vendorinfo_sitecleanup === 1) { $f
</div>
</div>
</div>
<div class="row row-cols-1 mb-2">
<div class="col d-grid gap-2">
<div class="input-group input-group-sm mb-0">
<span class="input-group-text"><?php echo $transLang['VENDORINFO-CUSTOMERIMPACTED']; ?></span>
<input class="form-control" id="db_vendorinfo_customerimpacted" name="db_vendorinfo_customerimpacted" placeholder="<?php echo $db_vendorinfo_customerimpacted; ?>" value="<?php echo $db_vendorinfo_customerimpacted; ?>" disabled />
</div>
</div>
</div>
<div class="row row-cols-2 mb-2">
<div class="col d-grid gap-2">
<div class="form-check form-switch">