summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Geiger2011-09-14 14:07:48 +0200
committerBjörn Geiger2011-09-14 14:07:48 +0200
commit1d9d98fcda8fb525a816a057be4ee8ea6db0b81f (patch)
tree3c6fdc1456f4caec80c96b1f568140a4b7678f8a
parentkleine Korrektur (diff)
downloadpoolctrl-1d9d98fcda8fb525a816a057be4ee8ea6db0b81f.tar.gz
poolctrl-1d9d98fcda8fb525a816a057be4ee8ea6db0b81f.tar.xz
poolctrl-1d9d98fcda8fb525a816a057be4ee8ea6db0b81f.zip
verschiedenes
-rwxr-xr-xapplication/controllers/EventController.php21
-rwxr-xr-xapplication/views/scripts/event/showreports.phtml30
-rwxr-xr-xgearman/controllerWorker/ControllerWorker/StatusWorker.java4
-rwxr-xr-xsetup/poolctrl.sql2
-rwxr-xr-xsetup/poolctrl_data.sql9
5 files changed, 43 insertions, 23 deletions
diff --git a/application/controllers/EventController.php b/application/controllers/EventController.php
index b856d94..6c51789 100755
--- a/application/controllers/EventController.php
+++ b/application/controllers/EventController.php
@@ -304,6 +304,12 @@ class EventController extends Zend_Controller_Action
$this->_helper->redirector('add', 'event');
return;
} else {
+ $event = new Application_Model_Event();
+ $this->eventMapper->find($eventID, $event);
+ if($event->getImmediate()) {
+ $this->_redirect('/event/');
+ exit;
+ }
$eventcategorylist = $this->eventcategoryMapper->fetchAll();
$bootOsApiResult = PostToHost($this->pbs2host, $this->config['pbs2']['getbootoss'] . $this->userIDsNamespace['apikey'], 'http://' . $_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI'], 'poolctrl', '');
$bootOsXMLString = $bootOsApiResult['http-body'];
@@ -342,8 +348,6 @@ class EventController extends Zend_Controller_Action
$poollist[$poolobj->getID()] = $poolobj;
}
}
- $event = new Application_Model_Event();
- $this->eventMapper->find($eventID, $event);
if($event->getPbs_membershipID() != $this->userIDsNamespace['membershipID']) {
if(!$this->acl->checkRight('eeo')) {
$this->_redirect('/');
@@ -954,7 +958,7 @@ class EventController extends Zend_Controller_Action
$event = new Application_Model_Event();
$this->eventMapper->find($eventID, $event);
$eventreportMapper = new Application_Model_EventreportMapper();
- $reportlist = $eventreportMapper->findBy(array("eventID" => $eventID));
+ $reportlist = $eventreportMapper->findBy(array("eventID" => $eventID), false, array('created' => 'ASC'));
$eventtypeMapper = new Application_Model_EventtypeMapper();
$eventtypes = array();
$result = $eventtypeMapper->fetchAll();
@@ -967,8 +971,19 @@ class EventController extends Zend_Controller_Action
$reportType = $eventtypes[$reportlist[$i]->getType()];
$reportlist[$i]->setType($reportType);
}
+
$this->view->eventTitle = $event->getTitle();
$this->view->reportlist = $reportlist;
+
+ // Pagination
+ $pagination = new Poolctrl_Pagination();
+ $pagination->setPerPage(5);
+ $pagination->setElement($this->view->reportlist);
+ $pagination->setRequestPage($this->_request->getParam('page'));
+ $pagination->setPageUrl('/event/showreports/eventID/' . $eventID);
+
+ $this->view->reportlist = $pagination->getElements();
+ $this->view->pagination = $pagination->pagination();
} else {
$this->_redirect('/event/');
exit;
diff --git a/application/views/scripts/event/showreports.phtml b/application/views/scripts/event/showreports.phtml
index 2c1c400..7f5065a 100755
--- a/application/views/scripts/event/showreports.phtml
+++ b/application/views/scripts/event/showreports.phtml
@@ -1,16 +1,15 @@
<h1>Reports <?php echo $this->eventTitle; ?></h1>
+<div class='listelement'>
<?php
if(count($this->reportlist) > 0) {
- foreach($this->reportlist as $report) {
+ foreach($this->reportlist as $k => $report) {
?>
-<style type="text/css">
-label {
- width: 150px !important;
-}
-</style>
-<div class='listelement'>
<div class='element'>
- <div class='content'>
+ <div class='number'>
+ <div class='smallnumber'>Report</div>
+ <?php echo $k+1 ?>
+ </div>
+ <div class='content'>
<div class='actions'>
<a href="<?php echo $this->url(
array(
@@ -22,11 +21,11 @@ label {
true) ?>"> <img src='/media/img/delete.png' alt='Delete Group' />
</a>
</div>
- <div class='title'>Run event <?php echo $report->getResult();?>.</div>
- <div class='subtitle'><?php echo date("m/d/Y H:i", $report->getCreated());?>&nbsp;</div>
- <div class='details'>
- <label>Type:</label>
- <div class='item'><?php echo $report->getType(); ?></div>
+ <div class='title'><?php echo $report->getResult();?></div>
+ <div class='subtitle'><?php echo $report->getType(); ?>&nbsp;</div>
+ <div class='details dispnone'>
+ <label>Finished:</label>
+ <div class='item'><?php echo date("m/d/Y H:i", $report->getCreated());?>&nbsp;</div>
<?php if($report->getErrors()) { ?>
<label>Errors:</label>
<div class='item'><?php echo $report->getErrors(); ?>&nbsp;</div>
@@ -35,9 +34,12 @@ label {
</div>
<div class='clear'></div>
</div>
-</div>
<?php
}
+?>
+</div>
+<?php
+ echo $this->pagination;
} else {
?>
<br />
diff --git a/gearman/controllerWorker/ControllerWorker/StatusWorker.java b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
index a619481..1743a2d 100755
--- a/gearman/controllerWorker/ControllerWorker/StatusWorker.java
+++ b/gearman/controllerWorker/ControllerWorker/StatusWorker.java
@@ -15,7 +15,7 @@ import org.json.simple.JSONValue;
//import org.apache.log4j.Logger;
public class StatusWorker extends AbstractGearmanFunction {
- //private static final Logger logger = ControllerWorkerMain.getLogger();
+ // private static final Logger logger = ControllerWorkerMain.getLogger();
static HashMap<String, Boot> BOOTTHREADS = new HashMap<String, Boot>();
static HashMap<String, Shutdown> SHUTDOWNTHREADS = new HashMap<String, Shutdown>();
@@ -44,7 +44,7 @@ public class StatusWorker extends AbstractGearmanFunction {
if (BOOTTHREADS.containsKey(event)) {
Vector<Client> clients = boot.getClients();
if (boot.isFinished()) {
- content.put("result shortcut", "succeeded");
+ content.put("result shortcut", "successful");
content.put("result text", "Booting of " + event
+ " has been finished!");
res.put(event, content);
diff --git a/setup/poolctrl.sql b/setup/poolctrl.sql
index 9e6d2ff..c50d266 100755
--- a/setup/poolctrl.sql
+++ b/setup/poolctrl.sql
@@ -47,7 +47,7 @@ CREATE TABLE IF NOT EXISTS `poolctrl_eventcategory` (
CREATE TABLE IF NOT EXISTS `poolctrl_eventreport` (
`reportID` int(11) NOT NULL AUTO_INCREMENT,
- `result` varchar(140) COLLATE utf8_unicode_ci DEFAULT 'succeeded',
+ `result` varchar(140) COLLATE utf8_unicode_ci DEFAULT 'successful',
`errors` varchar(140) COLLATE utf8_unicode_ci,
`type` int(11) NOT NULL,
`eventID` int(11) NOT NULL,
diff --git a/setup/poolctrl_data.sql b/setup/poolctrl_data.sql
index d866bd6..5715ec9 100755
--- a/setup/poolctrl_data.sql
+++ b/setup/poolctrl_data.sql
@@ -76,6 +76,9 @@ INSERT INTO `poolctrl_event` (`eventID`, `title`, `start`, `end`, `category`, `p
-- Adding eventreports
INSERT INTO `poolctrl_eventreport` (`reportID`, `result`, `errors`, `type`, `eventID`, `created`) VALUES
-(1, DEFAULT, null, 1, 1, 1308917400),
-(2, DEFAULT, null, 1, 2, 1308917400),
-(3, 'failed', 'wake-on-lan failed', 1, 3, 1308931800);
+(1, DEFAULT, null, 1, 1, 1308910200),
+(2, DEFAULT, null, 2, 1, 1308916800),
+(3, DEFAULT, null, 1, 2, 1308917400),
+(4, DEFAULT, null, 2, 2, 1308924000),
+(5, 'failed', 'wake-on-lan failed', 1, 3, 1308931800),
+(6, DEFAULT, null, 2, 3, 1308931200);