From 0d3c6eb1803355849e7adc8cee646d4b12db8f2e Mon Sep 17 00:00:00 2001
From: Tim Steiner <tsteiner2@unl.edu>
Date: Mon, 22 Jun 2009 22:22:41 +0000
Subject: [PATCH] Present a feedback message after a user submits decisions.
---
.../modules/courses/controllers/ViewController.php | 4 ++++
.../modules/courses/views/scripts/view/index.phtml | 5 +++++
.../modules/requests/controllers/IndexController.php | 11 +++++++++++
.../modules/requests/views/scripts/index/index.phtml | 3 +++
document_root/css/courses/view.css | 2 ++
document_root/css/requests/index.css | 1 +
6 files changed, 26 insertions(+)
diff --git a/application/modules/courses/controllers/ViewController.php b/application/modules/courses/controllers/ViewController.php
index c86808f3..ec2715a2 100644
--- a/application/modules/courses/controllers/ViewController.php
+++ b/application/modules/courses/controllers/ViewController.php
@@ -104,6 +104,10 @@ class Courses_ViewController extends App_Controller_Action
$this->view->lastRoleId = $roleId;
$this->view->action = $action;
+ $decisionSession = new Zend_Session_Namespace('decidePostAction');
+ $this->view->decisionMessage = $decisionSession->message;
+ unset ($decisionSession->message);
+
$session = new Zend_Session_Namespace(__CLASS__);
if ($session->tabName) {
$this->view->selectedCommentTab = $session->tabName;
diff --git a/application/modules/courses/views/scripts/view/index.phtml b/application/modules/courses/views/scripts/view/index.phtml
index 0319f764..65942c14 100644
--- a/application/modules/courses/views/scripts/view/index.phtml
+++ b/application/modules/courses/views/scripts/view/index.phtml
@@ -8,6 +8,11 @@ if ($this->preview) {
}
$this->layout()->breadcrumbs = array($breadcrumb . ': ' . $this->course->getCourseCode() . ' (' . $this->request->getTypeDescription() . ')');
?>
+
+<?php if ($this->decisionMessage) { ?>
+<div id="decisionMessage"><?php echo $this->decisionMessage;?></div>
+<?php } ?>
+
<div id="viewRequest">
<?php echo $this->partial('view/course-info.phtml', $this); ?>
<?php echo $this->partial('view/course-files.phtml', $this); ?>
diff --git a/application/modules/requests/controllers/IndexController.php b/application/modules/requests/controllers/IndexController.php
index d3177fa3..97adc904 100644
--- a/application/modules/requests/controllers/IndexController.php
+++ b/application/modules/requests/controllers/IndexController.php
@@ -210,6 +210,10 @@ class Requests_IndexController extends App_Controller_Action
$this->view->user = $user;
$this->view->userRequests = $userRequestsData;
+ $decisionSession = new Zend_Session_Namespace('decidePostAction');
+ $this->view->decisionMessage = $decisionSession->message;
+ unset($decisionSession->message);
+
// save the order of requests to the session so we can have next/previous links on other pages.
$session = new Zend_Session_Namespace('My Requests');
$session->requestOrder = array();
@@ -271,6 +275,13 @@ class Requests_IndexController extends App_Controller_Action
}
Requests_ApprovalChainModel::consider($requests);
+
+ $session = new Zend_Session_Namespace('decidePostAction');
+ if (count($requests) == 1) {
+ $session->message = 'Successfully submitted decision for 1 request.';
+ } else {
+ $session->message = 'Successfully submitted decisions for ' . count($requests) . ' requests.';
+ }
if (array_key_exists('returnUrl', $in)) {
$this->_redirect($in['returnUrl']);
diff --git a/application/modules/requests/views/scripts/index/index.phtml b/application/modules/requests/views/scripts/index/index.phtml
index d7f8147b..159cfeac 100644
--- a/application/modules/requests/views/scripts/index/index.phtml
+++ b/application/modules/requests/views/scripts/index/index.phtml
@@ -7,6 +7,9 @@
+<?php if ($this->decisionMessage) { ?>
+<div id="decisionMessage"><?php echo $this->decisionMessage;?></div>
+<?php } ?>
<div id="announcements" class="titled_box">
diff --git a/document_root/css/courses/view.css b/document_root/css/courses/view.css
index a7bd765f..80e844f2 100644
--- a/document_root/css/courses/view.css
+++ b/document_root/css/courses/view.css
@@ -1,6 +1,8 @@
@CHARSET "UTF-8";
#creqMain {width: 720px;}
+#decisionMessage {margin: 1em; padding: 0.5em; text-align: center; color: #060; background-color: #cfc; border: 1px solid #4c4;}
+
#editLink {
text-align:center;
}
diff --git a/document_root/css/requests/index.css b/document_root/css/requests/index.css
index c6b95771..1d6e62bc 100644
--- a/document_root/css/requests/index.css
+++ b/document_root/css/requests/index.css
@@ -1,6 +1,7 @@
@CHARSET "UTF-8";
#creqMain {width: 720px;}
+#decisionMessage {margin: 1em; padding: 0.5em; text-align: center; color: #060; background-color: #cfc; border: 1px solid #4c4;}
table.course_list {width: 100%;}
table.course_list tr.odd {background-color:#E3E3E3;}
--
GitLab