ui adjust, country convert to db. db schema updated

This commit is contained in:
2021-04-29 18:45:53 -04:00
parent 1c9db7e5c7
commit 88190020a6
3 changed files with 288 additions and 267 deletions

View File

@@ -231,7 +231,7 @@ $(document).on("click", ".open-voidModal", function (e) {
<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 col-sm-1"><?php echo $transLang['TIMEREASON']; ?></th><th class="small col-sm-2"><?php echo $transLang['NAME']; ?></th><th class="small col-sm-2"><?php echo $transLang['ESCORT']; ?></th><th class="small col-sm-2"><?php echo $transLang['VALIDATIONS']; ?></th><th class="small col-sm-2"><?php echo $transLang['BADGEINITIALS']; ?></th><?php if($SiteInfo->getSite($siteid, $uid, "0", "0")[0]["sites_region"] == "EMEA") { ?><th class="small col-sm-1"><?php echo $transLang['CARNUM'] . " / " . $transLang['SSANUM']; ?></th><?php }; ?><th class="small col-sm-1"><?php echo $transLang['ACTIONS']; ?></th>
</tr>
</thead>
<tbody>
@@ -249,31 +249,31 @@ $(document).on("click", ".open-voidModal", function (e) {
<tr class="alert alert-warning">
<?php }; ?>
<form class="form form-approve" method="post">
<td class="small"><?php echo $timein_disp; ?><br><?php echo $transLang[$VisitTypeInfo->getVisitTypeInfo($row['visits_reason'])[0]["visittypes_name"]]; ?></td>
<td class="small"><div><span class="badge badge-light"><?php echo $timein_disp; ?></span></div><div><span class="badge badge-light"><?php echo $transLang[$VisitTypeInfo->getVisitTypeInfo($row['visits_reason'])[0]["visittypes_name"]]; ?></span></div></td>
<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) { ?>
<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>
<span class="badge badge-light"><?php echo $transLang['ID_TYPE']; ?></span> <?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>
<span class="badge badge-light"><?php echo $transLang['REFERENCE']; ?></span> <?php echo $row['visits_id_reference']; ?>
</div>
<?php }; ?>
<?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>
<span class="badge badge-light"><?php echo $transLang['COUNTRY']; ?>?</span> <?php echo $VisitInfo->getCountryInfo($row['visits_citizen'])[0]["countries_name"]; ?>
</div>
<?php }; ?>
</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']; ?>">
<?php }; ?>
</td>
<td class="small">
<div>
<span class="badge badge-light"><?php echo $transLang['BADGE']; ?></span> <?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>
<span class="badge badge-light"><?php echo $transLang['USERNAME']; ?></span> <?php echo $Users->getUserInitials($row['visits_initials'])[0]["users_firstname"] . " " . $Users->getUserInitials($row['visits_initials'])[0]["users_lastname"]; ?>&nbsp;
</div>
@@ -324,16 +324,14 @@ $(document).on("click", ".open-voidModal", function (e) {
$('#id_type-<?php echo $visitid; ?>').trigger("change");
</script>
<?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>
<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['COUNTRY']; ?></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 }; ?>
foreach ($VisitInfo->getCountryInfo('%') as $row) { ?>
<option value="<?php echo $row['countries_id']; ?>"><?php echo $row['countries_name']; ?></option><?php }; ?>
</select>
<div class="invalid-feedback"><?php echo $transLang['REQUIRED']; ?></div>
</div>
<?php }; ?>