Implemeted applications unarchive

Updates #258

Author: inghamn

access_control.inc

@@ -86,7 +86,7 @@ $ZEND_ACL->allow('Reviewer', 'legislation', ['index', 'view', 'years', 'update']
 $ZEND_ACL->allow('Reviewer', ['legislationFiles', 'legislationActions', 'reports']);
 $ZEND_ACL->allow('Reviewer',  'legislationStatuses', 'index');
 $ZEND_ACL->allow('Reviewer',  'applicants',   ['index', 'view', 'update']);
-$ZEND_ACL->allow('Reviewer',  'applications', ['index', 'archive', 'report']);
+$ZEND_ACL->allow('Reviewer',  'applications', ['index', 'archive', 'unarchive', 'report']);
 $ZEND_ACL->allow('Reviewer',  'people', 'viewContactInfo');
 
 $ZEND_ACL->allow('Staff', 'committees', ['update']);

blocks/html/applications/partials/table.inc

@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright 2016 City of Bloomington, Indiana
- * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
+ * @copyright 2016-2020 City of Bloomington, Indiana
+ * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE
  * @param Zend\Db\Result $this->applications
  * @param Committee $this->committee (optional)
  * @param Applicant $this->applicant (optional)
@@ -26,6 +26,7 @@ use Application\Models\Person;
         $userCanViewApplications = Person::isAllowed('committees',   'applications');
         $userCanViewApplicant    = Person::isAllowed('applicants',   'view');
         $userCanArchive          = Person::isAllowed('applications', 'archive');
+        $userCanUnArchive        = Person::isAllowed('applications', 'unarchive');
         $userCanDelete           = Person::isAllowed('applications', 'delete');
 
         $helper = $this->template->getHelper('buttonLink');
@@ -62,7 +63,14 @@ use Application\Models\Person;
 
             if ($this->type === 'archived') {
                 $archived = $a->getArchived(DATE_FORMAT);
-                echo "<td>$archived</td>";
+                $button   = '';
+                if ($userCanUnArchive) {
+                    $button = $helper->buttonLink(
+                        BASE_URI.'/applications/unarchive?application_id='.$a->getId(),
+                        $this->_('application_unarchive')
+                    );
+                }
+                echo "<td>$archived $button</td>";
             }
             else {
                 $expires = $a->getExpires(DATE_FORMAT);

language/en_US/LC_MESSAGES/labels.po

@@ -614,13 +614,16 @@ msgid "application_add"
 msgstr "New Application"
 
 msgid "application_edit"
-msgstr "Edit Application"
+msgstr "Edit"
 
 msgid "application_delete"
-msgstr "Delete Application"
+msgstr "Delete"
 
 msgid "application_archive"
-msgstr "Archive Application"
+msgstr "Archive"
+
+msgid "application_unarchive"
+msgstr "Unarchive"
 
 msgid "applications_current"
 msgstr "Current Applications"

src/Application/Controllers/ApplicationsController.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright 2016 City of Bloomington, Indiana
- * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
+ * @copyright 2016-2020 City of Bloomington, Indiana
+ * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE
  */
 namespace Application\Controllers;
 
@@ -38,6 +38,26 @@ public function archive()
         }
     }
 
+    public function unarchive()
+    {
+        if (!empty($_REQUEST['application_id'])) {
+            try { $application = new Application($_REQUEST['application_id']); }
+            catch (\Exception $e) { $_SESSION['errorMessages'][] = $e; }
+        }
+
+        if (isset($application)) {
+            try { $application->unarchive(); }
+            catch (\Exception $e) { $_SESSION['errorMessages'][] = $e; }
+
+            header('Location: '.BASE_URI.'/committees/applications?committee_id='.$application->getCommittee_id());
+            exit();
+        }
+        else {
+            header('HTTP/1.1 404 Not Found', true, 404);
+            $this->template->blocks[] = new Block('404.inc');
+        }
+    }
+
     public function report()
     {
         if (!empty($_REQUEST['committee_id'])) {

src/Application/Models/Application.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * @copyright 2016 City of Bloomington, Indiana
- * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE.txt
+ * @copyright 2016-2020 City of Bloomington, Indiana
+ * @license http://www.gnu.org/licenses/agpl.txt GNU/AGPL, see LICENSE
  */
 namespace Application\Models;
 
@@ -77,6 +77,15 @@ public function archive()
         }
     }
 
+    public function unarchive()
+    {
+        if ($this->getId()) {
+            $sql = 'update applications set archived=null where id=?';
+            $zend_db = Database::getConnection();
+            $zend_db->query($sql, [$this->getId()]);
+        }
+    }
+
 	//----------------------------------------------------------------
 	// Generic Getters & Setters
 	//----------------------------------------------------------------