Add a "hide" link to completed requests.

application/modules/requests/controllers/IndexController.php

@@ -71,8 +71,10 @@ class Requests_IndexController extends App_Controller_Action
             $request['comments'] = $requestComments[$requestId];
             if ($requestViewTimes[$requestId] instanceof Requests_ViewTimeModel) {
                 $request['viewTime'] = $requestViewTimes[$requestId]->getTime();
+                $request['hidden'] = $requestViewTimes[$requestId]->isHidden();
             } else {
             	$request['viewTime'] = 0;
+            	$request['hidden'] = false;
             }
             if ($requestVotes[$requestId] instanceof Requests_ApproverVoteModel) {
                 $request['vote'] = $requestVotes[$requestId];
@@ -150,8 +152,10 @@ class Requests_IndexController extends App_Controller_Action
                     $request['comments'] = $requestComments[$requestId];
                     if ($requestViewTimes[$requestId] instanceof Requests_ViewTimeModel) {
                         $request['viewTime'] = $requestViewTimes[$requestId]->getTime();
+                        $request['hidden'] = $requestViewTimes[$requestId]->isHidden();
                     } else {
                         $request['viewTime'] = 0;
+                        $request['hidden'] = false;
                     }
 		            foreach ($session->sortBy as $key => $sortBy) {
 		                if ($sortBy == 'courseCode') {
@@ -244,4 +248,26 @@ class Requests_IndexController extends App_Controller_Action
         $this->_redirect('/requests');
 	}
 
+	public function hideRequestPostAction()
+	{
+		$requestId = $this->getRequest()->getParam('id');
+		
+		$user = Auth_UserModel::findCurrentUser();
+		$request = Requests_RequestModel::find($requestId);
+		if ($request && $user) {
+            $viewTime = Requests_ViewTimeModel::findByUserAndRequest($user, $request);
+            if (!$viewTime) {
+            	$viewTime = Requests_ViewTimeModel::fetchNew();
+            	$viewTime->setUser($user);
+            	$viewTime->setRequest($request);
+            }
+            $viewTime->setHidden();
+            
+            $collection = new Unl_Model_Collection('Requests_ViewTimeModel');
+            $collection[] = $viewTime;
+            Requests_ViewTimeModel::save($collection);
+		}
+		
+		$this->_redirect('/requests');
+	}
 }

application/modules/requests/models/ViewTimeModel.php

@@ -100,7 +100,8 @@ class Requests_ViewTimeModel extends Unl_Model
     	$data = array(
             'request'  => null,
             'user'     => null,
-    	    'viewTime' => null
+    	    'viewTime' => 0,
+    	    'hidden'   => 'no'
         );
     	$new = new self($data);
     	$new->_setClean();
@@ -156,7 +157,8 @@ class Requests_ViewTimeModel extends Unl_Model
             $sqlParts[] = $db->quoteInto('(?, ', $model->_data['requestViewTimeId'])
                         . $db->quoteInto('?, ' , $model->_data['request'])
                         . $db->quoteInto('?, ' , $model->_data['user'])
-                        . $db->quoteInto('?)'  , $model->_data['viewTime']);
+                        . $db->quoteInto('?, ' , $model->_data['viewTime'])
+                        . $db->quoteInto('?)'  , $model->_data['hidden']);
         }
         $sql .= implode(', ', $sqlParts);
         $db->query($sql);
@@ -165,7 +167,8 @@ class Requests_ViewTimeModel extends Unl_Model
              . '       creqRequestViewTimesUpdate AS b '
              . 'SET a.request  = b.request, '
              . '    a.user     = b.user, '
-             . '    a.viewTime = b.viewTime '
+             . '    a.viewTime = b.viewTime, '
+             . '    a.hidden   = b.hidden '
              . 'WHERE a.requestViewTimeId = b.requestViewTimeId ';
         $db->query($sql);
     }
@@ -174,12 +177,13 @@ class Requests_ViewTimeModel extends Unl_Model
     {
         $db = Zend_Registry::get('db');
 
-        $sql = 'INSERT INTO creqRequestViewTimes (request, user, viewTime) VALUES ';
+        $sql = 'INSERT INTO creqRequestViewTimes (request, user, viewTime, hidden) VALUES ';
         $sqlParts = array();
         foreach ($models as $model) {
             $sqlParts[] = $db->quoteInto('(?, ', $model->_data['request'])
                         . $db->quoteInto('?, ' , $model->_data['user'])
-                        . $db->quoteInto('?)'  , $model->_data['viewTime']);
+                        . $db->quoteInto('?, ' , $model->_data['viewTime'])
+                        . $db->quoteInto('?)'  , $model->_data['hidden']);
         }
         $sql .= implode(', ', $sqlParts);
         $db->query($sql);
@@ -226,4 +230,18 @@ class Requests_ViewTimeModel extends Unl_Model
     {
     	$this->_data['viewTime'] = $date->getTimestamp();
     }
+    
+    public function isHidden()
+    {
+    	return (bool) ($this->_data['hidden'] == 'yes');
+    }
+    
+    public function setHidden($hidden = true)
+    {
+    	if ($hidden) {
+    		$this->_data['hidden'] = 'yes';
+    	} else {
+    		$this->_data['hidden'] = 'no';
+    	}
+    }
 }

application/modules/requests/views/scripts/index/index.phtml

@@ -148,6 +148,10 @@
 	                    }
 	                }
                 }
+            
+                if ($request->isComplete() && $requestData['hidden']) {
+                    continue;
+                }
             ?>
             <tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
                 <!-- td><input type="checkbox" /></td -->
@@ -181,6 +185,9 @@
                     <?php if ($request->isEditable() || $request->isSubmitterAttentionRequired()) { ?>
                     /
                     <a class="requestLink<?php echo $linkClass; ?>" href="<?php echo $this->baseUrl(); ?>/requests/edit/load/id/<?php echo $request->getId(); ?>">Edit</a>
+                    <?php } else if ($request->isComplete()) { ?>
+                    /
+                    <a class="requestLink<?php echo $linkClass; ?>" href="<?php echo $this->baseUrl(); ?>/requests/index/hide-request.post/id/<?php echo $request->getId(); ?>">Hide</a>
                     <?php } ?>
                 </td>
                 <td>
@@ -386,6 +393,10 @@ foreach($this->roles as $roleData) {
                 } else {
                 	$linkClass = 'New';
                 }
+            
+                if ($request->isComplete() && $requestData['hidden']) {
+                    continue;
+                }
             ?>
             <tr <?php echo (++$row % 2 ? 'class="odd"' : ''); ?>>
                 <!-- td><input type="checkbox" /></td -->
@@ -406,6 +417,10 @@ foreach($this->roles as $roleData) {
                 </td>
                 <td>
                     <a class="requestLink<?php echo $linkClass; ?>" href="<?php echo $this->baseUrl(); ?>/requests/view/index/id/<?php echo $request->getId(); ?>/role/<?php echo $role->getId(); ?>/list/watching">View</a>
+                    <?php if ($request->isComplete()) { ?>
+                    /
+                    <a class="requestLink<?php echo $linkClass; ?>" href="<?php echo $this->baseUrl(); ?>/requests/index/hide-request.post/id/<?php echo $request->getId(); ?>">Hide</a>
+                    <?php } ?>
                 </td>
                 <td>
                     <?php