Updates to Voting ApprovalAction

application/models/rows/ApprovalActionQueue.php

@@ -110,7 +110,7 @@ class ApprovalActionQueue extends ApprovalAction
      */
     public function userMadeDecision(Request $request, User $user, $decision)
     {
-        $vote = $this->getUserDecision($request, $user);
+        $vote = ApproverVotes::getInstance()->fetchByRequestUserAndAction($request, $user, $this);
         if ($vote) {
             $vote->vote = $decision;
         } else {

application/models/rows/ApprovalActionVote.php

@@ -9,6 +9,8 @@ require_once 'ApprovalActionRow/Interface.php';
  */
 class ApprovalActionVote extends ApprovalActionQueue
 {
+    protected static $_preVotePrefix = '*PREVOTE*';
+
     public function _init()
     {
         parent::_init();
@@ -33,6 +35,29 @@ class ApprovalActionVote extends ApprovalActionQueue
         $this->_registerRelation($votesRelation);
     }
 
+    /**
+     * Reutrns an array of strings, corresponding to the possible
+     * results of performing this action.  If a customized action can only
+     * result a subset of the possible results, return that subset.
+     *
+     * @return array
+     */
+    public function getResultStatusStrings(Request $request = null, User $user = null)
+    {
+        $resultStatusStrings = parent::getResultStatusStrings();
+        if ($request && $user) {
+            $prevote = ApproverVotes::getInstance()->fetchByRequestAndUser($request, $user);
+            if ($prevote) {
+                $resultStatusStrings = array_merge(
+                    array(self::$_preVotePrefix . ' ' . $prevote->vote
+                          => self::$_preVotePrefix . ' ' . $prevote->vote),
+                    $resultStatusStrings
+                );
+            }
+        }
+        return $resultStatusStrings;
+    }
+
     /**
      * Initiates the action, causing it to begin processing the given request.
      * When consideration finishes, the parent chain will be called again.
@@ -69,7 +94,12 @@ class ApprovalActionVote extends ApprovalActionQueue
      */
     public function userMadeDecision(Request $request, User $user, $decision)
     {
-        $vote = $this->getUserDecision($request, $user);
+        if (substr($decision, 0, strlen(self::$_preVotePrefix)) == self::$_preVotePrefix) {
+            // Don't submit prevotes as final votes.
+            return;
+        }
+
+        $vote = parent::getUserDecision($request, $user);
         if ($vote) {
             // TODO: don't fail silently when someone tries to vote again.
             return;
@@ -78,6 +108,19 @@ class ApprovalActionVote extends ApprovalActionQueue
         parent::userMadeDecision($request, $user, $decision);
     }
 
+    public function getUserDecision(Request $request, User $user)
+    {
+        $finalVote = parent::getUserDecision($request, $user);
+        if ($finalVote) {
+            return $finalVote;
+        }
+
+        $preVote = ApproverVotes::getInstance()->fetchByRequestAndUser($request, $user);
+        if ($preVote) {
+            return self::$_preVotePrefix . ' ' . $preVote->vote;
+        }
+    }
+
     public function advanceQueue()
     {
 

application/models/tables/ApproverVotes.php

@@ -32,6 +32,17 @@ class ApproverVotes extends Nmc_Db_Table
         return $new;
     }
 
+    public function fetchByRequestAndUser(Request $request, User $user)
+    {
+        $db = $this->getAdapter();
+        $where = array();
+        $where[] = $db->quoteInto('request=?', $request->getPrimaryKey());
+        $where[] = $db->quoteInto('user=?', $user->getPrimaryKey());
+        $where = implode(' AND ', $where);
+        $order = 'time';
+        return $this->fetchRow($where, $order);
+    }
+
     public function fetchByRequestUserAndAction(Request $request, User $user, ApprovalAction $action)
     {
         $db = $this->getAdapter();

application/views/home.xhtml

@@ -6,7 +6,7 @@
                 Announcements
                 <img src="/images/arrow1.png" alt="arrow 1" class="toggle_arrow" />
             </h2>
-          <h3><em>User ID:</em> <?php echo Nmc_User::getInstance()->getUser()->getUserName(); ?></h3>
+          <h3><em>User ID:</em> <?php echo $this->user->getUserName(); ?></h3>
         </div>
       <div class="bl"></div>
     </div>
@@ -189,10 +189,10 @@
                         <?php
                         if ($request->getCurrentAction()) {
                             echo $this->formSelect('decisions[' . $request->getPrimaryKey() . ']',
-                                                   $request->getCurrentAction()->getUserDecision($request, Nmc_User::getInstance()->getUser()),
+                                                   $request->getCurrentAction()->getUserDecision($request, $this->user),
                                                    array('class' => 'decision_selection'),
                                                    array('_null' => "--Make a decision--")
-                                                   + $request->getCurrentAction()->getResultStatusStrings());
+                                                   + $request->getCurrentAction()->getResultStatusStrings($request, $this->user));
                             //
                         }
                         ?>                    </td>