From eec1751a5e4b5e92f35338e03cc14aa7d2a059fc Mon Sep 17 00:00:00 2001 From: Tim Steiner <tsteiner2@unl.edu> Date: Tue, 2 Oct 2007 19:31:00 +0000 Subject: [PATCH] Insert a 5 minute offset between view and vote queue roll over. --- .../models/rows/ApprovalActionQueue.php | 21 +++++++++++++------ .../models/rows/ApprovalActionVote.php | 7 +++++++ 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/application/models/rows/ApprovalActionQueue.php b/application/models/rows/ApprovalActionQueue.php index 75814e2b..ac62e49f 100644 --- a/application/models/rows/ApprovalActionQueue.php +++ b/application/models/rows/ApprovalActionQueue.php @@ -82,13 +82,22 @@ class ApprovalActionQueue extends ApprovalAction continue; } } + + $year = Zend_Filter_Int::filter($scheduleData['year']); + $month = Zend_Filter_Int::filter($scheduleData['month']); + $day = Zend_Filter_Int::filter($scheduleData['day']); + $hour = Zend_Filter_Int::filter($scheduleData['hour']); + $minute = Zend_Filter_Int::filter($scheduleData['minute']); + $second = Zend_Filter_Int::filter($scheduleData['second']); + $date = new Zend_Date(); - $date->setYear($scheduleData['year']); - $date->setMonth($scheduleData['month']); - $date->setDay($scheduleData['day']); - $date->setHour(0); - $date->setMinute(0); - $date->setSecond(0); + $date->setYear($year); + $date->setMonth($month); + $date->setDay($day); + $date->setHour($hour); + $date->setMinute($minute); + $date->setSecond($second); + $schedule->date = $date; $schedule->save(); try { diff --git a/application/models/rows/ApprovalActionVote.php b/application/models/rows/ApprovalActionVote.php index 16c5d45f..7e5f6cc8 100644 --- a/application/models/rows/ApprovalActionVote.php +++ b/application/models/rows/ApprovalActionVote.php @@ -81,6 +81,13 @@ class ApprovalActionVote extends ApprovalActionQueue $this->votingRole = ApprovalBodyRoles::getInstance()->findOne($votingRoleId); $this->quorum = Zend_Filter_Int::filter($formData['quorum']); + if (is_array($formData['schedule'])) { + foreach ($formData['schedule'] as $scheduleId => $scheduleData) { + $formData['schedule'][$scheduleId]['hour'] = 0; + $formData['schedule'][$scheduleId]['minute'] = 5; + } + } + parent::updateFromForm($formData); } -- GitLab