Menu
▾
▴
[Gemstracker-svn] SF.net SVN: gemstracker:[22] trunk/library
|
From: <gem...@li...> - 2011-09-15 14:19:10
|
Revision: 22
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=22&view=rev
Author: matijsdejong
Date: 2011-09-15 14:19:01 +0000 (Thu, 15 Sep 2011)
Log Message:
-----------
- added organization code field without using it
- fixed #413 overzicht weekview
- added extra overview column to patches
Modified Paths:
--------------
trunk/library/classes/Gems/Default/DatabaseAction.php
trunk/library/classes/Gems/Selector/DateSelectorAbstract.php
trunk/library/classes/Gems/Selector/TokenDateSelector.php
trunk/library/configs/db/patches.sql
trunk/library/configs/db/tables/gems__organizations.20.sql
trunk/library/configs/db_multi_layout/tables/gems__organizations.20.sql
Modified: trunk/library/classes/Gems/Default/DatabaseAction.php
===================================================================
--- trunk/library/classes/Gems/Default/DatabaseAction.php 2011-09-15 14:18:48 UTC (rev 21)
+++ trunk/library/classes/Gems/Default/DatabaseAction.php 2011-09-15 14:19:01 UTC (rev 22)
@@ -298,10 +298,11 @@
$patcher = new Gems_Util_DatabasePatcher($this->db, 'patches.sql', $this->escort->getDatabasePaths());
$changed = $patcher->uploadPatches($this->loader->getVersions()->getBuild());
$tableSql = sprintf(
- 'SELECT gpa_level AS `%s`, gpa_location AS `%s`, COUNT(*) AS `%s`, SUM(gpa_executed) AS `%s`, SUM(gpa_completed) AS `%s` FROM gems__patches GROUP BY gpa_level, gpa_location ORDER BY gpa_level DESC, gpa_location',
+ 'SELECT gpa_level AS `%s`, gpa_location AS `%s`, COUNT(*) AS `%s`, COUNT(*) - SUM(gpa_executed) AS `%s`, SUM(gpa_executed) AS `%s`, SUM(gpa_completed) AS `%s` FROM gems__patches GROUP BY gpa_level, gpa_location ORDER BY gpa_level DESC, gpa_location',
$this->_('Level'),
$this->_('Subtype'),
$this->_('Patches'),
+ $this->_('To be executed'),
$this->_('Executed'),
$this->_('Finished'));
Modified: trunk/library/classes/Gems/Selector/DateSelectorAbstract.php
===================================================================
--- trunk/library/classes/Gems/Selector/DateSelectorAbstract.php 2011-09-15 14:18:48 UTC (rev 21)
+++ trunk/library/classes/Gems/Selector/DateSelectorAbstract.php 2011-09-15 14:19:01 UTC (rev 22)
@@ -26,24 +26,24 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * File description of DateSelectorAbstract
*
- * @author Matijs de Jong <mj...@ma...>
- * @since 1.1
- * @version 1.1
+ *
+ *
* @package Gems
* @subpackage Selector
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: OverviewPlanAction.php 430 2011-08-18 10:40:21Z 175780 $
*/
/**
- * Class description of DateSelectorAbstract
*
- * @author Matijs de Jong <mj...@ma...>
* @package Gems
* @subpackage Selector
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.2
*/
abstract class Gems_Selector_DateSelectorAbstract extends Gems_Registry_TargetAbstract
{
@@ -190,7 +190,7 @@
switch ($this->dateType) {
case 'D':
$keyCount = 1;
- $groupby['period_1'] = $this->dateFrom;
+ $groupby['period_1'] = new Zend_Db_Expr("CONVERT($this->dateFrom, DATE)");
$date->setTime(0);
$date->addDay($this->dateFactor - $this->dateRange);
@@ -630,7 +630,7 @@
case 'W':
$header = array($repeater->period_1, MUtil_Html::create()->br(),
- sprintf($this->_('week %s'), $repeater->period_2));
+ MUtil_Lazy::call('sprintf', $this->_('week %s'), $repeater->period_2));
break;
case 'M':
Modified: trunk/library/classes/Gems/Selector/TokenDateSelector.php
===================================================================
--- trunk/library/classes/Gems/Selector/TokenDateSelector.php 2011-09-15 14:18:48 UTC (rev 21)
+++ trunk/library/classes/Gems/Selector/TokenDateSelector.php 2011-09-15 14:19:01 UTC (rev 22)
@@ -4,7 +4,7 @@
/**
* Copyright (c) 2011, Erasmus MC
* All rights reserved.
- *
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
* * Redistributions of source code must retain the above copyright
@@ -15,7 +15,7 @@
* * Neither the name of Erasmus MC nor the
* names of its contributors may be used to endorse or promote products
* derived from this software without specific prior written permission.
- *
+ *
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
@@ -26,24 +26,23 @@
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-/**
- * File description of TokenDateSelector
*
- * @author Matijs de Jong <mj...@ma...>
- * @since 1.1
- * @version 1.1
+ *
* @package Gems
* @subpackage Selector
+ * @author Matijs de Jong <mj...@ma...>
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @version $Id: OverviewPlanAction.php 430 2011-08-18 10:40:21Z 175780 $
*/
/**
- * Class description of TokenDateSelector
*
- * @author Matijs de Jong <mj...@ma...>
* @package Gems
* @subpackage Selector
+ * @copyright Copyright (c) 2011 Erasmus MC
+ * @license New BSD License
+ * @since Class available since version 1.2
*/
class Gems_Selector_TokenDateSelector extends Gems_Selector_DateSelectorAbstract
{
Modified: trunk/library/configs/db/patches.sql
===================================================================
--- trunk/library/configs/db/patches.sql 2011-09-15 14:18:48 UTC (rev 21)
+++ trunk/library/configs/db/patches.sql 2011-09-15 14:19:01 UTC (rev 22)
@@ -185,3 +185,8 @@
-- PATCH: Mail templates per organization
ALTER TABLE `gems__mail_templates` ADD `gmt_organizations` VARCHAR( 250 ) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL AFTER `gmt_body`;
UPDATE gems__mail_templates SET gmt_organizations = (SELECT CONCAT('|', GROUP_CONCAT(gor_id_organization SEPARATOR '|'), '|') FROM gems__organizations);
+
+-- GEMS VERSION: 40
+-- PATCH: Organization codes
+ALTER TABLE `gems__organizations` ADD gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' AFTER gor_name;
+
Modified: trunk/library/configs/db/tables/gems__organizations.20.sql
===================================================================
--- trunk/library/configs/db/tables/gems__organizations.20.sql 2011-09-15 14:18:48 UTC (rev 21)
+++ trunk/library/configs/db/tables/gems__organizations.20.sql 2011-09-15 14:19:01 UTC (rev 22)
@@ -3,6 +3,7 @@
gor_id_organization bigint unsigned not null auto_increment,
gor_name varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+ gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
gor_location varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
gor_url varchar(127) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
gor_task varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
Modified: trunk/library/configs/db_multi_layout/tables/gems__organizations.20.sql
===================================================================
--- trunk/library/configs/db_multi_layout/tables/gems__organizations.20.sql 2011-09-15 14:18:48 UTC (rev 21)
+++ trunk/library/configs/db_multi_layout/tables/gems__organizations.20.sql 2011-09-15 14:19:01 UTC (rev 22)
@@ -4,6 +4,7 @@
gor_id_organization bigint unsigned not null auto_increment,
gor_name varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null,
+ gor_code varchar(20) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
gor_location varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
gor_url varchar(127) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
gor_task varchar(50) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
