Approve/void. Breaking changes to schema. Backend updates.

This commit is contained in:
2021-04-29 10:58:48 -04:00
parent 2664bd9e23
commit 3eb9932448
9 changed files with 362 additions and 80 deletions

View File

@@ -51,14 +51,14 @@ class VisitActions {
return $count;
}
public function approveVisit ($approvevisit, $id_type, $id_checked, $citizen, $badge, $initials, $approved) {
public function approveVisit ($approvevisit, $id_type, $id_reference, $citizen, $badge, $initials, $approved) {
$query = "
UPDATE " . Registry::DB_PRFX . "visits
SET
" . Registry::DB_PRFX . "visits.initials = \"$initials\",
" . Registry::DB_PRFX . "visits.approved = \"$approved\",
" . Registry::DB_PRFX . "visits.id_type = \"$id_type\",
" . Registry::DB_PRFX . "visits.id_checked = \"$id_checked\",
" . Registry::DB_PRFX . "visits.id_reference = \"$id_reference\",
" . Registry::DB_PRFX . "visits.badge = \"$badge\",
" . Registry::DB_PRFX . "visits.citizen = \"$citizen\"
WHERE " . Registry::DB_PRFX . "visits.id = \"$approvevisit\"

View File

@@ -57,14 +57,15 @@ class VisitInfo {
" . Registry::DB_PRFX . "visits.reason as visits_reason,
" . Registry::DB_PRFX . "visits.citizen as visits_citizen,
" . Registry::DB_PRFX . "visits.id_type as visits_id_type,
" . Registry::DB_PRFX . "visits.id_checked as visits_id_checked,
" . Registry::DB_PRFX . "visits.id_reference as visits_id_reference,
" . Registry::DB_PRFX . "visits.initials as visits_initials,
" . Registry::DB_PRFX . "visits.badge as visits_badge,
" . Registry::DB_PRFX . "visits.site_id as visits_site_id,
" . Registry::DB_PRFX . "visits.company as visits_company,
" . Registry::DB_PRFX . "visits.approved as visits_approved,
" . Registry::DB_PRFX . "visits.carnum as visits_carnum,
" . Registry::DB_PRFX . "visits.ssanum as visits_ssanum
" . Registry::DB_PRFX . "visits.ssanum as visits_ssanum,
" . Registry::DB_PRFX . "visits.notes as visits_notes
FROM " . Registry::DB_PRFX . "visits
WHERE " . $cond_siteid . Registry::DB_PRFX . "visits.approved>=\"$approved\" AND " . $cond_outtime . $cond_intime . Registry::DB_PRFX . "visits.id LIKE \"$visitid\"" . $cond_rowsperpage . $cond_offset;
$database = new \App\LobbySIO\Database\Connect();
@@ -72,5 +73,251 @@ class VisitInfo {
return $rows;
}
public $countries = [
"FR" => ["country" => "France", "continent" => "Europe"],
"US" => ["country" => "United States", "continent" => "North America"],
"CN" => ["country" => "China", "continent" => "Asia"],
"ES" => ["country" => "Spain", "continent" => "Europe"],
"IT" => ["country" => "Italy", "continent" => "Europe"],
"TR" => ["country" => "Turkey", "continent" => "Asia"],
"GB" => ["country" => "United Kingdom", "continent" => "Europe"],
"DE" => ["country" => "Germany", "continent" => "Europe"],
"RU" => ["country" => "Russian Federation", "continent" => "Europe"],
"MY" => ["country" => "Malaysia", "continent" => "Asia"],
"AF" => ["country" => "Afghanistan", "continent" => "Asia"],
"AX" => ["country" => "Åland Islands", "continent" => "Europe"],
"AL" => ["country" => "Albania", "continent" => "Europe"],
"DZ" => ["country" => "Algeria", "continent" => "Africa"],
"AS" => ["country" => "American Samoa", "continent" => "Oceania"],
"AD" => ["country" => "Andorra", "continent" => "Europe"],
"AO" => ["country" => "Angola", "continent" => "Africa"],
"AI" => ["country" => "Anguilla", "continent" => "North America"],
"AQ" => ["country" => "Antarctica", "continent" => "Antarctica"],
"AG" => ["country" => "Antigua and Barbuda", "continent" => "North America"],
"AR" => ["country" => "Argentina", "continent" => "South America"],
"AM" => ["country" => "Armenia", "continent" => "Asia"],
"AW" => ["country" => "Aruba", "continent" => "North America"],
"AU" => ["country" => "Australia", "continent" => "Oceania"],
"AT" => ["country" => "Austria", "continent" => "Europe"],
"AZ" => ["country" => "Azerbaijan", "continent" => "Asia"],
"BS" => ["country" => "Bahamas", "continent" => "North America"],
"BH" => ["country" => "Bahrain", "continent" => "Asia"],
"BD" => ["country" => "Bangladesh", "continent" => "Asia"],
"BB" => ["country" => "Barbados", "continent" => "North America"],
"BY" => ["country" => "Belarus", "continent" => "Europe"],
"BE" => ["country" => "Belgium", "continent" => "Europe"],
"BZ" => ["country" => "Belize", "continent" => "North America"],
"BJ" => ["country" => "Benin", "continent" => "Africa"],
"BM" => ["country" => "Bermuda", "continent" => "North America"],
"BT" => ["country" => "Bhutan", "continent" => "Asia"],
"BO" => ["country" => "Bolivia", "continent" => "South America"],
"BA" => ["country" => "Bosnia and Herzegovina", "continent" => "Europe"],
"BW" => ["country" => "Botswana", "continent" => "Africa"],
"BV" => ["country" => "Bouvet Island", "continent" => "Antarctica"],
"BR" => ["country" => "Brazil", "continent" => "South America"],
"IO" => ["country" => "British Indian Ocean Territory", "continent" => "Asia"],
"BN" => ["country" => "Brunei Darussalam", "continent" => "Asia"],
"BG" => ["country" => "Bulgaria", "continent" => "Europe"],
"BF" => ["country" => "Burkina Faso", "continent" => "Africa"],
"BI" => ["country" => "Burundi", "continent" => "Africa"],
"KH" => ["country" => "Cambodia", "continent" => "Asia"],
"CM" => ["country" => "Cameroon", "continent" => "Africa"],
"CA" => ["country" => "Canada", "continent" => "North America"],
"CV" => ["country" => "Cape Verde", "continent" => "Africa"],
"KY" => ["country" => "Cayman Islands", "continent" => "North America"],
"CF" => ["country" => "Central African Republic", "continent" => "Africa"],
"TD" => ["country" => "Chad", "continent" => "Africa"],
"CL" => ["country" => "Chile", "continent" => "South America"],
"CX" => ["country" => "Christmas Island", "continent" => "Asia"],
"CC" => ["country" => "Cocos (Keeling] Islands", "continent" => "Asia"],
"CO" => ["country" => "Colombia", "continent" => "South America"],
"KM" => ["country" => "Comoros", "continent" => "Africa"],
"CG" => ["country" => "Congo", "continent" => "Africa"],
"CD" => ["country" => "The Democratic Republic of The Congo", "continent" => "Africa"],
"CK" => ["country" => "Cook Islands", "continent" => "Oceania"],
"CR" => ["country" => "Costa Rica", "continent" => "North America"],
"CI" => ["country" => "Cote D'ivoire", "continent" => "Africa"],
"HR" => ["country" => "Croatia", "continent" => "Europe"],
"CU" => ["country" => "Cuba", "continent" => "North America"],
"CY" => ["country" => "Cyprus", "continent" => "Asia"],
"CZ" => ["country" => "Czech Republic", "continent" => "Europe"],
"DK" => ["country" => "Denmark", "continent" => "Europe"],
"DJ" => ["country" => "Djibouti", "continent" => "Africa"],
"DM" => ["country" => "Dominica", "continent" => "North America"],
"DO" => ["country" => "Dominican Republic", "continent" => "North America"],
"EC" => ["country" => "Ecuador", "continent" => "South America"],
"EG" => ["country" => "Egypt", "continent" => "Africa"],
"SV" => ["country" => "El Salvador", "continent" => "North America"],
"GQ" => ["country" => "Equatorial Guinea", "continent" => "Africa"],
"ER" => ["country" => "Eritrea", "continent" => "Africa"],
"EE" => ["country" => "Estonia", "continent" => "Europe"],
"ET" => ["country" => "Ethiopia", "continent" => "Africa"],
"FK" => ["country" => "Falkland Islands (Malvinas]", "continent" => "South America"],
"FO" => ["country" => "Faroe Islands", "continent" => "Europe"],
"FJ" => ["country" => "Fiji", "continent" => "Oceania"],
"FI" => ["country" => "Finland", "continent" => "Europe"],
"GF" => ["country" => "French Guiana", "continent" => "South America"],
"PF" => ["country" => "French Polynesia", "continent" => "Oceania"],
"TF" => ["country" => "French Southern Territories", "continent" => "Antarctica"],
"GA" => ["country" => "Gabon", "continent" => "Africa"],
"GM" => ["country" => "Gambia", "continent" => "Africa"],
"GE" => ["country" => "Georgia", "continent" => "Asia"],
"GH" => ["country" => "Ghana", "continent" => "Africa"],
"GI" => ["country" => "Gibraltar", "continent" => "Europe"],
"GR" => ["country" => "Greece", "continent" => "Europe"],
"GL" => ["country" => "Greenland", "continent" => "North America"],
"GD" => ["country" => "Grenada", "continent" => "North America"],
"GP" => ["country" => "Guadeloupe", "continent" => "North America"],
"GU" => ["country" => "Guam", "continent" => "Oceania"],
"GT" => ["country" => "Guatemala", "continent" => "North America"],
"GG" => ["country" => "Guernsey", "continent" => "Europe"],
"GN" => ["country" => "Guinea", "continent" => "Africa"],
"GW" => ["country" => "Guinea-bissau", "continent" => "Africa"],
"GY" => ["country" => "Guyana", "continent" => "South America"],
"HT" => ["country" => "Haiti", "continent" => "North America"],
"HM" => ["country" => "Heard Island and Mcdonald Islands", "continent" => "Antarctica"],
"VA" => ["country" => "Holy See (Vatican City State]", "continent" => "Europe"],
"HN" => ["country" => "Honduras", "continent" => "North America"],
"HK" => ["country" => "Hong Kong", "continent" => "Asia"],
"HU" => ["country" => "Hungary", "continent" => "Europe"],
"IS" => ["country" => "Iceland", "continent" => "Europe"],
"IN" => ["country" => "India", "continent" => "Asia"],
"ID" => ["country" => "Indonesia", "continent" => "Asia"],
"IR" => ["country" => "Iran", "continent" => "Asia"],
"IQ" => ["country" => "Iraq", "continent" => "Asia"],
"IE" => ["country" => "Ireland", "continent" => "Europe"],
"IM" => ["country" => "Isle of Man", "continent" => "Europe"],
"IL" => ["country" => "Israel", "continent" => "Asia"],
"JM" => ["country" => "Jamaica", "continent" => "North America"],
"JP" => ["country" => "Japan", "continent" => "Asia"],
"JE" => ["country" => "Jersey", "continent" => "Europe"],
"JO" => ["country" => "Jordan", "continent" => "Asia"],
"KZ" => ["country" => "Kazakhstan", "continent" => "Asia"],
"KE" => ["country" => "Kenya", "continent" => "Africa"],
"KI" => ["country" => "Kiribati", "continent" => "Oceania"],
"KP" => ["country" => "Democratic People's Republic of Korea", "continent" => "Asia"],
"KR" => ["country" => "Republic of Korea", "continent" => "Asia"],
"KW" => ["country" => "Kuwait", "continent" => "Asia"],
"KG" => ["country" => "Kyrgyzstan", "continent" => "Asia"],
"LA" => ["country" => "Lao People's Democratic Republic", "continent" => "Asia"],
"LV" => ["country" => "Latvia", "continent" => "Europe"],
"LB" => ["country" => "Lebanon", "continent" => "Asia"],
"LS" => ["country" => "Lesotho", "continent" => "Africa"],
"LR" => ["country" => "Liberia", "continent" => "Africa"],
"LY" => ["country" => "Libya", "continent" => "Africa"],
"LI" => ["country" => "Liechtenstein", "continent" => "Europe"],
"LT" => ["country" => "Lithuania", "continent" => "Europe"],
"LU" => ["country" => "Luxembourg", "continent" => "Europe"],
"MO" => ["country" => "Macao", "continent" => "Asia"],
"MK" => ["country" => "Macedonia", "continent" => "Europe"],
"MG" => ["country" => "Madagascar", "continent" => "Africa"],
"MW" => ["country" => "Malawi", "continent" => "Africa"],
"MV" => ["country" => "Maldives", "continent" => "Asia"],
"ML" => ["country" => "Mali", "continent" => "Africa"],
"MT" => ["country" => "Malta", "continent" => "Europe"],
"MH" => ["country" => "Marshall Islands", "continent" => "Oceania"],
"MQ" => ["country" => "Martinique", "continent" => "North America"],
"MR" => ["country" => "Mauritania", "continent" => "Africa"],
"MU" => ["country" => "Mauritius", "continent" => "Africa"],
"YT" => ["country" => "Mayotte", "continent" => "Africa"],
"MX" => ["country" => "Mexico", "continent" => "North America"],
"FM" => ["country" => "Micronesia", "continent" => "Oceania"],
"MD" => ["country" => "Moldova", "continent" => "Europe"],
"MC" => ["country" => "Monaco", "continent" => "Europe"],
"MN" => ["country" => "Mongolia", "continent" => "Asia"],
"ME" => ["country" => "Montenegro", "continent" => "Europe"],
"MS" => ["country" => "Montserrat", "continent" => "North America"],
"MA" => ["country" => "Morocco", "continent" => "Africa"],
"MZ" => ["country" => "Mozambique", "continent" => "Africa"],
"MM" => ["country" => "Myanmar", "continent" => "Asia"],
"NA" => ["country" => "Namibia", "continent" => "Africa"],
"NR" => ["country" => "Nauru", "continent" => "Oceania"],
"NP" => ["country" => "Nepal", "continent" => "Asia"],
"NL" => ["country" => "Netherlands", "continent" => "Europe"],
"AN" => ["country" => "Netherlands Antilles", "continent" => "North America"],
"NC" => ["country" => "New Caledonia", "continent" => "Oceania"],
"NZ" => ["country" => "New Zealand", "continent" => "Oceania"],
"NI" => ["country" => "Nicaragua", "continent" => "North America"],
"NE" => ["country" => "Niger", "continent" => "Africa"],
"NG" => ["country" => "Nigeria", "continent" => "Africa"],
"NU" => ["country" => "Niue", "continent" => "Oceania"],
"NF" => ["country" => "Norfolk Island", "continent" => "Oceania"],
"MP" => ["country" => "Northern Mariana Islands", "continent" => "Oceania"],
"NO" => ["country" => "Norway", "continent" => "Europe"],
"OM" => ["country" => "Oman", "continent" => "Asia"],
"PK" => ["country" => "Pakistan", "continent" => "Asia"],
"PW" => ["country" => "Palau", "continent" => "Oceania"],
"PS" => ["country" => "Palestinia", "continent" => "Asia"],
"PA" => ["country" => "Panama", "continent" => "North America"],
"PG" => ["country" => "Papua New Guinea", "continent" => "Oceania"],
"PY" => ["country" => "Paraguay", "continent" => "South America"],
"PE" => ["country" => "Peru", "continent" => "South America"],
"PH" => ["country" => "Philippines", "continent" => "Asia"],
"PN" => ["country" => "Pitcairn", "continent" => "Oceania"],
"PL" => ["country" => "Poland", "continent" => "Europe"],
"PT" => ["country" => "Portugal", "continent" => "Europe"],
"PR" => ["country" => "Puerto Rico", "continent" => "North America"],
"QA" => ["country" => "Qatar", "continent" => "Asia"],
"RE" => ["country" => "Reunion", "continent" => "Africa"],
"RO" => ["country" => "Romania", "continent" => "Europe"],
"RW" => ["country" => "Rwanda", "continent" => "Africa"],
"SH" => ["country" => "Saint Helena", "continent" => "Africa"],
"KN" => ["country" => "Saint Kitts and Nevis", "continent" => "North America"],
"LC" => ["country" => "Saint Lucia", "continent" => "North America"],
"PM" => ["country" => "Saint Pierre and Miquelon", "continent" => "North America"],
"VC" => ["country" => "Saint Vincent and The Grenadines", "continent" => "North America"],
"WS" => ["country" => "Samoa", "continent" => "Oceania"],
"SM" => ["country" => "San Marino", "continent" => "Europe"],
"ST" => ["country" => "Sao Tome and Principe", "continent" => "Africa"],
"SA" => ["country" => "Saudi Arabia", "continent" => "Asia"],
"SN" => ["country" => "Senegal", "continent" => "Africa"],
"RS" => ["country" => "Serbia", "continent" => "Europe"],
"SC" => ["country" => "Seychelles", "continent" => "Africa"],
"SL" => ["country" => "Sierra Leone", "continent" => "Africa"],
"SG" => ["country" => "Singapore", "continent" => "Asia"],
"SK" => ["country" => "Slovakia", "continent" => "Europe"],
"SI" => ["country" => "Slovenia", "continent" => "Europe"],
"SB" => ["country" => "Solomon Islands", "continent" => "Oceania"],
"SO" => ["country" => "Somalia", "continent" => "Africa"],
"ZA" => ["country" => "South Africa", "continent" => "Africa"],
"GS" => ["country" => "South Georgia and The South Sandwich Islands", "continent" => "Antarctica"],
"LK" => ["country" => "Sri Lanka", "continent" => "Asia"],
"SD" => ["country" => "Sudan", "continent" => "Africa"],
"SR" => ["country" => "Suriname", "continent" => "South America"],
"SJ" => ["country" => "Svalbard and Jan Mayen", "continent" => "Europe"],
"SZ" => ["country" => "Swaziland", "continent" => "Africa"],
"SE" => ["country" => "Sweden", "continent" => "Europe"],
"CH" => ["country" => "Switzerland", "continent" => "Europe"],
"SY" => ["country" => "Syrian Arab Republic", "continent" => "Asia"],
"TW" => ["country" => "Taiwan, Province of China", "continent" => "Asia"],
"TJ" => ["country" => "Tajikistan", "continent" => "Asia"],
"TZ" => ["country" => "Tanzania, United Republic of", "continent" => "Africa"],
"TH" => ["country" => "Thailand", "continent" => "Asia"],
"TL" => ["country" => "Timor-leste", "continent" => "Asia"],
"TG" => ["country" => "Togo", "continent" => "Africa"],
"TK" => ["country" => "Tokelau", "continent" => "Oceania"],
"TO" => ["country" => "Tonga", "continent" => "Oceania"],
"TT" => ["country" => "Trinidad and Tobago", "continent" => "North America"],
"TN" => ["country" => "Tunisia", "continent" => "Africa"],
"TM" => ["country" => "Turkmenistan", "continent" => "Asia"],
"TC" => ["country" => "Turks and Caicos Islands", "continent" => "North America"],
"TV" => ["country" => "Tuvalu", "continent" => "Oceania"],
"UG" => ["country" => "Uganda", "continent" => "Africa"],
"UA" => ["country" => "Ukraine", "continent" => "Europe"],
"AE" => ["country" => "United Arab Emirates", "continent" => "Asia"],
"UM" => ["country" => "United States Minor Outlying Islands", "continent" => "Oceania"],
"UY" => ["country" => "Uruguay", "continent" => "South America"],
"UZ" => ["country" => "Uzbekistan", "continent" => "Asia"],
"VU" => ["country" => "Vanuatu", "continent" => "Oceania"],
"VE" => ["country" => "Venezuela", "continent" => "South America"],
"VN" => ["country" => "Viet Nam", "continent" => "Asia"],
"VG" => ["country" => "Virgin Islands, British", "continent" => "North America"],
"VI" => ["country" => "Virgin Islands, U.S.", "continent" => "North America"],
"WF" => ["country" => "Wallis and Futuna", "continent" => "Oceania"],
"EH" => ["country" => "Western Sahara", "continent" => "Africa"],
"YE" => ["country" => "Yemen", "continent" => "Asia"],
"ZM" => ["country" => "Zambia", "continent" => "Africa"],
"ZW" => ["country" => "Zimbabwe", "continent" => "Africa"]
];
}

View File

@@ -28,6 +28,7 @@ CITIZEN = 'Bürger?'
CLOSE = 'Schließen'
COMPANY = 'Firma'
CONFIRM = 'Bestätigen'
COUNTRY = 'Land'
CREATED = 'Erstellt'
CUSTSIGNIN = 'Kundenanmeldung'
CUSTSIGNOUT = 'Kunde Abmelden'

View File

@@ -28,6 +28,7 @@ CITIZEN = 'Citizen?'
CLOSE = 'Close'
COMPANY = 'Company'
CONFIRM = 'Confirm'
COUNTRY = 'Country'
CREATED = 'Created'
CUSTSIGNIN = 'Visitor Sign In'
CUSTSIGNOUT = 'Visitor Sign Out'

View File

@@ -28,6 +28,7 @@ CITIZEN = 'Ciudadano de estados unidos?'
CLOSE = 'Cerrar'
COMPANY = 'Organización'
CONFIRM = 'Confirmar'
COUNTRY = 'País'
CREATED = 'Creado'
CUSTSIGNIN = 'Llegada del cliente'
CUSTSIGNOUT = 'Salida del cliente'

View File

@@ -28,6 +28,7 @@ CITIZEN = 'Citoyen?'
CLOSE = 'Terminer'
COMPANY = 'Organisation'
CONFIRM = 'Confirmer'
COUNTRY = 'Pays'
CREATED = 'Créé'
CUSTSIGNIN = 'Connexion client'
CUSTSIGNOUT = 'Déconnexion du client'