Menu
▾
▴
[Dccss-commit] SF.net SVN: dccss: [353] branches/ms4w/apps/dccss
|
From: <sdt...@us...> - 2007-03-14 10:13:07
|
Revision: 353
http://svn.sourceforge.net/dccss/?rev=353&view=rev
Author: sdteffen
Date: 2007-03-14 03:13:00 -0700 (Wed, 14 Mar 2007)
Log Message:
-----------
* include/dataobject/Public_deliverypoint.php: Fixed typo
* dataentry_performance_report.php: Small fixes to work with PHP 5,
PostgreSQL 8.2 and the latest PEAR packages
* conf/dccssconfig.php.default: Updated for MS4W
* images/landmark.png: (added)
* images/water_network.png: (added) error.log revealed that these files
were missing
* about.php: Added DC Water and Environment copyright
Modified Paths:
--------------
branches/ms4w/apps/dccss/about.php
branches/ms4w/apps/dccss/changelog
branches/ms4w/apps/dccss/conf/dccssconfig.php.default
branches/ms4w/apps/dccss/dataentry_performance_report.php
branches/ms4w/apps/dccss/include/dataobject/Public_deliverypoint.php
Added Paths:
-----------
branches/ms4w/apps/dccss/.settings/
branches/ms4w/apps/dccss/.settings/org.eclipse.core.resources.prefs
branches/ms4w/apps/dccss/images/landmark.png
branches/ms4w/apps/dccss/images/water_network.png
Added: branches/ms4w/apps/dccss/.settings/org.eclipse.core.resources.prefs
===================================================================
--- branches/ms4w/apps/dccss/.settings/org.eclipse.core.resources.prefs (rev 0)
+++ branches/ms4w/apps/dccss/.settings/org.eclipse.core.resources.prefs 2007-03-14 10:13:00 UTC (rev 353)
@@ -0,0 +1,3 @@
+#Thu Mar 08 18:22:02 EET 2007
+eclipse.preferences.version=1
+encoding//script/create_views.sql=UTF-8
Modified: branches/ms4w/apps/dccss/about.php
===================================================================
--- branches/ms4w/apps/dccss/about.php 2007-03-13 11:34:32 UTC (rev 352)
+++ branches/ms4w/apps/dccss/about.php 2007-03-14 10:13:00 UTC (rev 353)
@@ -33,6 +33,7 @@
<div dir="ltr">
<p dir="ltr">Copyright (c) 2005 <a href="http://www.dorsch.de">DORSCH
Consult</a></p>
+<p dir="ltr">Copyright (c) 2007 DC Water and Environment</p>
<p dir="ltr">This program is free software; you can redistribute it and/or modify<br />
it under the terms of the GNU General Public License as published by<br />
the Free Software Foundation; either version 2 of the License, or<br />
Modified: branches/ms4w/apps/dccss/changelog
===================================================================
--- branches/ms4w/apps/dccss/changelog 2007-03-13 11:34:32 UTC (rev 352)
+++ branches/ms4w/apps/dccss/changelog 2007-03-14 10:13:00 UTC (rev 353)
@@ -1,3 +1,14 @@
+2007-03-08 Steffen Macke <Ste...@do...>
+
+ * include/dataobject/Public_deliverypoint.php: Fixed typo
+ * dataentry_performance_report.php: Small fixes to work with PHP 5,
+ PostgreSQL 8.2 and the latest PEAR packages
+ * conf/dccssconfig.php.default: Updated for MS4W
+ * images/landmark.png: (added)
+ * images/water_network.png: (added) error.log revealed that these files
+ were missing
+ * about.php: Added DC Water and Environment copyright
+
2007-03-5 Maher Abdel karim <mah...@do...>
* script/drop_views.sql:fix sql errors.
Modified: branches/ms4w/apps/dccss/conf/dccssconfig.php.default
===================================================================
--- branches/ms4w/apps/dccss/conf/dccssconfig.php.default 2007-03-13 11:34:32 UTC (rev 352)
+++ branches/ms4w/apps/dccss/conf/dccssconfig.php.default 2007-03-14 10:13:00 UTC (rev 353)
@@ -4,6 +4,7 @@
* dccssconfig.php - Organization specific configuration of DCCSS
*
* Copyright (C) 2005, 2006 DORSCH Consult
+ * Copyright (C) 2007 DC Water and Environment
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -97,7 +98,7 @@
/**
* The path for temporary files.
*/
-$_SESSION["strMsTmpDirectory"] = "c:\\tmp\\ms_tmp\\";
+$_SESSION["strMsTmpDirectory"] = "c:\\ms4w\\tmp\\ms_tmp\\";
/**
* Where the HTML_QuickForm validation should take place.
Modified: branches/ms4w/apps/dccss/dataentry_performance_report.php
===================================================================
--- branches/ms4w/apps/dccss/dataentry_performance_report.php 2007-03-13 11:34:32 UTC (rev 352)
+++ branches/ms4w/apps/dccss/dataentry_performance_report.php 2007-03-14 10:13:00 UTC (rev 353)
@@ -4,6 +4,7 @@
* dataentry_report.php - Data Entry performance report.
*
* Copyright (C) 2006 DORSCH Consult
+ * Copyright (C) 2007 DC Water and Environment
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -19,6 +20,20 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+
+/**
+ * \todo Refactor the GD extension loading in DccssPage subclass.
+ */
+$arrExtensions = array (
+ 'gd' => 'gd2'
+);
+$strExtensionPrefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
+foreach ($arrExtensions as $strExtension => $strLibrary) {
+ if (!extension_loaded($strExtension)&&(!dl($strExtensionPrefix.$strLibrary.'.'.PHP_SHLIB_SUFFIX ))) {
+ die(sprintf(_("FATAL ERROR: PHP extension '%s' is not loaded."), $strExtension));
+ }
+}
+
require_once("include/dccsspage.php");
require_once("include/dcmmspear.php");
/**
@@ -59,7 +74,7 @@
$strQuery = "select username,SurveyedDelivery,surveyedSubscriber from
(select deliverypoint.username ,count(deliverypoint) as SurveyedDelivery
- from deliverypoint
+ from deliverypoint,subscriber
where deliverypoint.username is not null
".$strWhere." group by deliverypoint.username) as d
join
@@ -76,7 +91,7 @@
$strQuery = "select username,SurveyedDelivery,surveyedSubscriber from
(select deliverypoint.username ,count(deliverypoint) as SurveyedDelivery
- from deliverypoint
+ from deliverypoint,subscriber
where deliverypoint.username is not null
".$strWhere." group by deliverypoint.username) as d
join
@@ -106,8 +121,7 @@
$Graph =& Image_Graph::factory('graph', array(600, 500));
// add a TrueType font
-$Arial_v =& $Graph->addNew("Image_Graph_Font_TTF",
- "c:\\windows\\fonts\\ARIAL.TTF");
+$Arial_v =& $Graph->addNew('font', 'Arial');
$Graph->setFont($Arial_v);
$Matrix =& $Graph->addNew('Image_Graph_Layout_Matrix', array(2, 2));
@@ -162,7 +176,7 @@
$dataset=& $Plotarea->dataset;
print_r($dataset);
// output the Graph
- $strTmpPath = tempnam("c:\\tmp\\ms_tmp", "graph").".png";
+ $strTmpPath = tempnam($_SESSION["strMsTmpDirectory"], "graph").".png";
$Graph->done(array('filename' => $strTmpPath));
$DccssPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />");;
echo $DccssPage->toHTML();
Added: branches/ms4w/apps/dccss/images/landmark.png
===================================================================
(Binary files differ)
Property changes on: branches/ms4w/apps/dccss/images/landmark.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/ms4w/apps/dccss/images/water_network.png
===================================================================
(Binary files differ)
Property changes on: branches/ms4w/apps/dccss/images/water_network.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/ms4w/apps/dccss/include/dataobject/Public_deliverypoint.php
===================================================================
--- branches/ms4w/apps/dccss/include/dataobject/Public_deliverypoint.php 2007-03-13 11:34:32 UTC (rev 352)
+++ branches/ms4w/apps/dccss/include/dataobject/Public_deliverypoint.php 2007-03-14 10:13:00 UTC (rev 353)
@@ -75,12 +75,11 @@
var $fb_enumFields = array('hassewer', 'hasmanhole', 'supplyfromneighbour');
- var $fb_enumOptions = array(
- 'hassewer' => array('1' => 'Yes', '2' => 'No', '0' => 'Unknown'),
- 'hasmanhole' => array('1' => 'Yes', '2' => 'No', '0' => 'Unknown'),
- 'supplyfromneighbour' => array('1' => 'Yes', '2' => 'No', '0' => 'Unknown'));
+ var $fb_enumOptions = NULL;
var $fb_hidePrimaryKey = FALSE;
+
+ var $fb_ruleViolationMessage = '';
function postGenerateForm(&$form) {
/**
@@ -156,7 +155,7 @@
$this->fb_ruleViolationMessage =
_('%s: The value you have entered is not valid.');
$this->fb_requiredRuleMessage = _('%s: This field is required.');
- $this->$fb_enumOptions = array(
+ $this->fb_enumOptions = array(
'hassewer' => array('1' => 'Yes', '2' => 'No', '0' => 'Unknown'),
'hasmanhole' => array('1' => 'Yes', '2' => 'No', '0' => 'Unknown'),
'supplyfromneighbour' => array('1' => 'Yes', '2' => 'No',
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
