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

18
src/Database/VisitActions.php
View File

@@ -83,20 +83,22 @@ class VisitActions {
}
public function setInfoVendorVisitNew ($db_vendorinfo_visitid, $db_vendorinfo_contact1, $db_vendorinfo_contact2, $db_vendorinfo_workstart, $db_vendorinfo_workend) {
public function setInfoVendorVisitNew ($db_vendorinfo_visitid, $db_vendorinfo_contact1, $db_vendorinfo_contact2, $db_vendorinfo_workstart, $db_vendorinfo_workend, $db_vendorinfo_customerimpacted) {
$query = "
INSERT INTO " . Registry::DB_PRFX . "vendorinfo (
" . Registry::DB_PRFX . "vendorinfo.visitid,
" . Registry::DB_PRFX . "vendorinfo.contact1,
" . Registry::DB_PRFX . "vendorinfo.contact2,
" . Registry::DB_PRFX . "vendorinfo.workstart,
" . Registry::DB_PRFX . "vendorinfo.workend)
" . Registry::DB_PRFX . "vendorinfo.workend,
" . Registry::DB_PRFX . "vendorinfo.customerimpacted)
VALUES (
\"$db_vendorinfo_visitid\",
\"$db_vendorinfo_contact1\",
\"$db_vendorinfo_contact2\",
\"$db_vendorinfo_workstart\",
\"$db_vendorinfo_workend\")
\"$db_vendorinfo_workend\",
\"$db_vendorinfo_customerimpacted\")
";
$database = new \App\LobbySIO\Database\Connect();
$db_vendorinfo_lastid = $database->runQueryWithId($query);
@@ -115,14 +117,10 @@ class VisitActions {
public function setInfoVendorVisitInitial ($id, $db_vendorinfo_contact1, $db_vendorinfo_contact2, $db_vendorinfo_workstart, $db_vendorinfo_workend, $db_vendorinfo_checklistrequired, $db_vendorinfo_routinework, $db_vendorinfo_nonroutinework, $db_vendorinfo_coi, $db_vendorinfo_worksummary, $db_vendorinfo_equipmentsummary) {
public function setInfoVendorVisitInitial ($id, $db_vendorinfo_checklistrequired, $db_vendorinfo_routinework, $db_vendorinfo_nonroutinework, $db_vendorinfo_coi, $db_vendorinfo_worksummary, $db_vendorinfo_equipmentsummary) {
$query = "
UPDATE " . Registry::DB_PRFX . "vendorinfo
SET
" . Registry::DB_PRFX . "vendorinfo.contact1 = \"$db_vendorinfo_contact1\",
" . Registry::DB_PRFX . "vendorinfo.contact2 = \"$db_vendorinfo_contact2\",
" . Registry::DB_PRFX . "vendorinfo.workstart = \"$db_vendorinfo_workstart\",
" . Registry::DB_PRFX . "vendorinfo.workend = \"$db_vendorinfo_workend\",
" . Registry::DB_PRFX . "vendorinfo.checklistrequired = \"$db_vendorinfo_checklistrequired\",
" . Registry::DB_PRFX . "vendorinfo.routinework = \"$db_vendorinfo_routinework\",
" . Registry::DB_PRFX . "vendorinfo.nonroutinework = \"$db_vendorinfo_nonroutinework\",
@@ -133,7 +131,7 @@ class VisitActions {
";
$database = new \App\LobbySIO\Database\Connect();
$count = $database->runQuery($query);
return $count;
//return $count;
}
public function setInfoVendorVisitFinal ($id, $db_vendorinfo_checklistcompleted, $db_vendorinfo_workcompleted, $db_vendorinfo_sitecleanup, $db_vendorinfo_approverid, $db_vendorinfo_doccompleted) {
@@ -149,7 +147,7 @@ class VisitActions {
";
$database = new \App\LobbySIO\Database\Connect();
$count = $database->runQuery($query);
return $count;
//return $count;
}

2
src/Database/VisitInfo.php
View File

@@ -85,6 +85,7 @@ class VisitInfo {
" . Registry::DB_PRFX . "vendorinfo.contact2 as db_vendorinfo_contact2,
" . Registry::DB_PRFX . "vendorinfo.workstart as db_vendorinfo_workstart,
" . Registry::DB_PRFX . "vendorinfo.workend as db_vendorinfo_workend,
" . Registry::DB_PRFX . "vendorinfo.customerimpacted as db_vendorinfo_customerimpacted,
" . Registry::DB_PRFX . "vendorinfo.checklistrequired as db_vendorinfo_checklistrequired,
" . Registry::DB_PRFX . "vendorinfo.routinework as db_vendorinfo_routinework,
" . Registry::DB_PRFX . "vendorinfo.nonroutinework as db_vendorinfo_nonroutinework,
@@ -108,6 +109,7 @@ class VisitInfo {
" . Registry::DB_PRFX . "vendorinfo.contact2 as db_vendorinfo_contact2,
" . Registry::DB_PRFX . "vendorinfo.workstart as db_vendorinfo_workstart,
" . Registry::DB_PRFX . "vendorinfo.workend as db_vendorinfo_workend,
" . Registry::DB_PRFX . "vendorinfo.customerimpacted as db_vendorinfo_customerimpacted,
" . Registry::DB_PRFX . "vendorinfo.checklistrequired as db_vendorinfo_checklistrequired,
" . Registry::DB_PRFX . "vendorinfo.routinework as db_vendorinfo_routinework,
" . Registry::DB_PRFX . "vendorinfo.nonroutinework as db_vendorinfo_nonroutinework,

3
src/Language/en.lang.ini.example
View File

@@ -70,6 +70,9 @@ VENDORINFO-FORM = 'Vendor Work Form'
VENDORINFO-WORKSTART = 'Work Start Date'
VENDORINFO-WORKEND = 'Work End Date'
VENDORINFO-VENDORTITLE = 'Vendor'
VENDORINFO-UNABLETOSIGNOUT-HELP = 'Vendor Work Form has not yet been completed by the company, please ask security to complete the form in order to sign out.'
VENDORINFO-DOCUMENTATIONREQUIRED = 'NOTICE - All vendors are required to complete a MOP, use a pre-authorized checklist, or a company-approved standard form to document work to be completed.'
VENDORINFO-CUSTOMERIMPACTED = 'Customer Impacted'
TAGS-FORMINCOMPLETE = 'Form Incomplete'
TAGS-FORMCOMPLETE = 'Form Complete'