From 27d8600ea8a4b90a6cdab8706967d11cf2046002 Mon Sep 17 00:00:00 2001 From: Joshua Perry <45966243+jpez-development@users.noreply.github.com> Date: Sun, 5 Feb 2023 14:58:16 +0000 Subject: [PATCH] better addjob --- jobs/controllers/Portal.php | 48 ++++++++++++++++++---------- templates/category_table.html.php | 2 +- templates/job_add.html.php | 53 +++++++++++++++++++++++-------- templates/job_edit.html.php | 12 ------- templates/job_table.html.php | 4 +-- todo | 2 +- 6 files changed, 74 insertions(+), 47 deletions(-) delete mode 100644 templates/job_edit.html.php diff --git a/jobs/controllers/Portal.php b/jobs/controllers/Portal.php index 77b4715..0f6dfdc 100644 --- a/jobs/controllers/Portal.php +++ b/jobs/controllers/Portal.php @@ -40,7 +40,9 @@ class Portal { public function homeSubmit() { if ($_POST['submit'] == "List") { $this->vars['job'] = $this->jobsTable->find(['id'], ['value0' => $_POST['job_id']])[0]; - return ['template' => 'job_edit.html.php', + $this->vars['archive'] = true; + $this->vars['update'] = true; + return ['template' => 'job_add.html.php', 'title' => 'Jo\'s Jobs- Update Job', 'vars' => $this->vars]; } @@ -55,20 +57,17 @@ class Portal { } if (isset($_POST['cat_id'])) { $this->catsTable->delete("id", $_POST['cat_id']); + $jobs = $this->jobsTable->find(['categoryId'], ['value0' => $_POST['cat_id']]); + foreach ($jobs as $job) { + $this->jobsTable->delete("id", $job->id); + } return $this->categories(); } } } public function secondHomeSubmit() { - if(isset($_POST['archived'])) { - $record = [ - 'id' => $_POST['jobId'], - 'closingDate' => $_POST['closingDate'], - 'archived' => $_POST['archived'] - ]; - $this->jobsTable->save($record); - } + $this->vars['response'] = 'Update successful'; return ['template' => 'response.html.php', 'title' => 'Jo\'s Jobs- Success', @@ -97,15 +96,21 @@ class Portal { } public function edit() { //TODO: finish this function - if (isset($_GET['job_id'])) { - $this->vars['job'] = $this->jobsTable->find(["id"], ['value0' => $_GET['job_id']]); - } if (isset($_GET['cat_id'])) { $this->vars['cat'] = $this->catsTable->find(["id"], ['value0' => $_GET['cat_id']]); } } public function addJob() { + if (isset($_GET['job_id'])) { + $this->vars['job'] = $this->jobsTable->find(["id"], ['value0' => $_GET['job_id']])[0]; + $this->vars['archive'] = false; + $this->vars['update'] = true; + } + else { + $this->vars['archive'] = false; + $this->vars['update'] = false; + } return ['template' => 'job_add.html.php', 'title' => 'Jo\'s Jobs- Add Job', 'vars' => $this->vars @@ -113,7 +118,7 @@ class Portal { } public function addJobSubmit() { - if (count($this->jobsTable->find(['title', 'clientId'], ['value0' => $_POST['title'], 'value1' => $_POST['client_id']])) == 0 && $this->catsTable->find(['name'], ['value0' => $_POST['categoryName']]) != 0) { + if ($this->catsTable->find(['name'], ['value0' => $_POST['categoryName']]) != 0) { $record = [ 'title' => $_POST['title'], 'description' => $_POST['description'], @@ -121,17 +126,26 @@ class Portal { 'closingDate' => $_POST['closingDate'], 'categoryId' => $this->catsTable->find(['name'], ['value0' => $_POST['categoryName']])[0]->id, 'location' => $_POST['location'], - 'clientId' => $_POST['client_id'] + 'clientId' => $_POST['client_id'], + 'archived' => $_POST['archived'] ]; - $this->jobsTable->save($record); - $this->vars['response'] = 'Job made successfully'; + + if ($_POST['submit'] == 'Create' && count($this->jobsTable->find(['title', 'clientId'], ['value0' => $_POST['title'], 'value1' => $_POST['client_id']])) == 0) { + $this->jobsTable->save($record); + $this->vars['response'] = 'Job made successfully'; + } + else if ($_POST['submit'] == 'Update') { + $record['id'] = $_POST['jobId']; + $this->jobsTable->save($record); + $this->vars['response'] = 'Job updated successfully'; + } } else { $this->vars['response'] = 'Some data was incorrect'; } return ['template' => 'response.html.php', - 'title' => 'Jo\'s Jobs- Add Job', + 'title' => 'Jo\'s Jobs- Edit Job', 'vars' => $this->vars ]; } diff --git a/templates/category_table.html.php b/templates/category_table.html.php index 7a4edde..0d68d56 100644 --- a/templates/category_table.html.php +++ b/templates/category_table.html.php @@ -13,7 +13,7 @@ Edit
- +
diff --git a/templates/job_add.html.php b/templates/job_add.html.php index f860398..9554433 100644 --- a/templates/job_add.html.php +++ b/templates/job_add.html.php @@ -1,18 +1,43 @@
- - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
\ No newline at end of file diff --git a/templates/job_edit.html.php b/templates/job_edit.html.php deleted file mode 100644 index d1ac4b5..0000000 --- a/templates/job_edit.html.php +++ /dev/null @@ -1,12 +0,0 @@ -
-

Update title?>

-
- archived == 'y') { ?> - - - - - - -
-
\ No newline at end of file diff --git a/templates/job_table.html.php b/templates/job_table.html.php index f34c2fe..59af36b 100644 --- a/templates/job_table.html.php +++ b/templates/job_table.html.php @@ -34,10 +34,10 @@ echo 'yes'; } ?> - Edit + Edit View applicants (getApps())?>) -
+ archived == 'n') { ?> diff --git a/todo b/todo index 9060f64..5ca7ca8 100644 --- a/todo +++ b/todo @@ -16,7 +16,7 @@ Assignment 2: - Relist archived jobs with new closing date @done - Add admin user control to admin portal - User accounts made in admin portal - - Client user accounts + - Client user accounts @done - restricted admin panel @done - add and archive jobs @done - see who has applied for jobs @done