From 5f8eb76f25579569f83d763144b58788d13cede0 Mon Sep 17 00:00:00 2001 From: Frank Bergkemper Date: Mon, 20 Jan 2014 13:35:38 +0100 Subject: [PATCH] Update --- README.md | 4 +-- composer.phar | Bin 960415 -> 961537 bytes module/Job/src/Job/Model/JobTable.php | 25 ++++++++++++++++++ .../Controller/StatisticsController.php | 2 ++ .../view/statistics/statistics/stored.phtml | 8 +++--- .../Controller/.IndexControllerTest.php.swp | Bin 12288 -> 0 bytes 6 files changed, 33 insertions(+), 6 deletions(-) delete mode 100644 tests/JobTest/Controller/.IndexControllerTest.php.swp diff --git a/README.md b/README.md index 8bda079c..d4827668 100644 --- a/README.md +++ b/README.md @@ -7,5 +7,5 @@ barbossa ## Requirements -* PHP 5.3 or higher -* Zend Framework 2 +* PHP 5.3.3 or later; we recommend using the latest PHP version whenever possible +* Zend Framework 2.x diff --git a/composer.phar b/composer.phar index c8d41a5df0f13d11431d2cd5c48d32198c0a217d..cd379bdb525bc631539e4bc6699e07af7cb506e0 100755 GIT binary patch delta 5160 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 z z3oTRq#jY{p>G#{8fK?Y4&n>E(K%1q35q#IHf)IZ6xR*cQwA)LVFs4`UT(mo3pq~gDoS~Zs%H>XQrjjbf5bvF!a&iM6nMC83n(E;+Jd;dipm(qbGzi ow|-NQS*d9H$MAC1zJ%iPM6>3DM>c=3wSIXi9nefkL1n>z0dE>tzyJUM delta 4596 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'job'); + $select->columns(array('endtime','jobbytes'), true); + $select->where("endtime >= '" . $start . "' AND endtime <= '" . $end . "'"); + $select->order('endtime ASC'); + + $resultSet = $this->tableGateway->selectWith($select); + return $resultSet; + } + + public function getStoredBytes14Days() + { + $select = new Select(); + $select->from('job'); + + + $resultSet = $this->tableGateway->selectWith($select); + return $resultSet; + } + } diff --git a/module/Statistics/src/Statistics/Controller/StatisticsController.php b/module/Statistics/src/Statistics/Controller/StatisticsController.php index a46250ad..9d8b788b 100644 --- a/module/Statistics/src/Statistics/Controller/StatisticsController.php +++ b/module/Statistics/src/Statistics/Controller/StatisticsController.php @@ -67,6 +67,8 @@ public function storedAction() { return new ViewModel( array( + 'stored7days' => $this->getJobTable()->getStoredBytes7Days(), + 'stored14days' => $this->getJobTable()->getStoredBytes14Days(), ) ); } diff --git a/module/Statistics/view/statistics/statistics/stored.phtml b/module/Statistics/view/statistics/statistics/stored.phtml index 26dcd5f7..65b3e3eb 100644 --- a/module/Statistics/view/statistics/statistics/stored.phtml +++ b/module/Statistics/view/statistics/statistics/stored.phtml @@ -10,8 +10,8 @@ function chart1() { - var data = [500,500,500,500,1500,1500,500]; - var ticks = ['1','2','3','4','5','6','7']; + var data = []; + var ticks = []; var plot1 = jQuery.jqplot('chart1', [data], { @@ -40,8 +40,8 @@ function chart2() { - var data = [500,500,500,10000,1500,1500,500,500,500,500,500,1500,1500,500]; - var ticks = ['1','2','3','4','5','6','7','8','9','10','11','12','13','14']; + var data = []; + var ticks = []; var plot1 = jQuery.jqplot('chart2', [data], { diff --git a/tests/JobTest/Controller/.IndexControllerTest.php.swp b/tests/JobTest/Controller/.IndexControllerTest.php.swp deleted file mode 100644 index 1d938e3cfe7fc2b81d061256acbabbcf0a22ca26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 12288 zcmeI2O=}ZD7{{mLWreEfNl;j|u$zO~*rFcl3o!_(5-HIXkz8hXC(YLF%(63UDn$oU0}FQGWKQX zYx`yU82iy=te127#P!CRULSLY{|8YaSS(jSlXr z@F6|~4JA#k(p2QZl8nVh*|x*gte;I=gvQ7K892niEL)hrT(g50FPwKzpXwYEN8MzA z43GgbKnBPF86X2>fDHVL223`?Uf^Iy#)msMe$E_tj+^u#17v^Tbi<_t~;{nbiQZ<~{No153v2eX=5GmP9Rs)`8n2p<+s-rGj zK<+s(yr)+SQ!k@%a^(5UnXnZ^b~3+$C9_-^5g8G?b0+7JxRd89cW<~RFT^5an=G>K zU6?6N+Uj*zY#1S9?bbtW6HU{Y?Dvoc*8-<1aDR-@u1)JMHTDD1