Thread: [Dcmms-devel] SF.net SVN: dcmms: [1095] branches/ms4w/dcmms
Brought to you by:
maher_karim,
sdteffen
From: <sdt...@us...> - 2006-08-09 05:13:19
|
Revision: 1095 Author: sdteffen Date: 2006-08-08 22:12:56 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1095&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/about.php Removed Paths: ------------- branches/ms4w/dcmms/about.php Deleted: branches/ms4w/dcmms/about.php =================================================================== --- branches/ms4w/dcmms/about.php 2006-08-09 05:10:43 UTC (rev 1094) +++ branches/ms4w/dcmms/about.php 2006-08-09 05:12:56 UTC (rev 1095) @@ -1,100 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * about.php - Information about the DCMMS application - * - * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA - * Copyright (C) 2006 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); - -$dcmPage = new DcmmsPage(_('About the DC Maintenance Management System')); -$dcmPage->setIconImage('about.png'); -$dcmPage->setPageName(basename(__FILE__)); - -$dcmPage->add('<p>'.sprintf( - _("Please visit %shttp://dcmms.sourceforge.net%s for the latest news and updates."), - "<a href=\"http://dcmms.sourceforge.net\">","</a>").'</p> -<br /> -<div dir="ltr"> -<p dir="ltr">Copyright (c) 2003 - 2006 <a href="http://www.dorsch.de">DORSCH - Consult</a></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 /> - (at your option) any later version.</p> -<br /> -<p dir="ltr">This program is distributed in the hope that it will be useful,<br /> - but WITHOUT ANY WARRANTY; without even the implied warranty of<br /> - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br /> - GNU General Public License for more details.</p> -<br /> - -<p dir="ltr">Portions of this software Copyright (c) 2003 - 2005 - <a href="http://www.ngwa.gov.jo">NGWA</a>.</p> -<br /> - -<p>Portions of this software Copyright (c) 1999, 2000 <a href= - "http://www.dmsolutions.ca">DM Solutions Goup Inc.</a> -<br />Permission is hereby granted, free of charge, to any person obtaining a<br /> -copy of this software and associated documentation files (the "Software"), to<br /> -deal in the Software without restriction, including without limitation the<br /> -rights to use, copy, modify, merge, publish, distribute, sublicense, and/or<br /> -sell copies of the Software, and to permit persons to whom the Software is<br /> -furnished to do so, subject to the following conditions:<br /> -The above copyright notice and this permission notice shall be included in all<br /> -copies or substantial portions of the Software.</p> -<br /> -</div> -<p>'.sprintf(_("DCMMS uses icons of the %sGNOME%s project."), - "<a href=\"http://www.gnome.org\">","</a>").'</p> -<br /> -<p>'.sprintf(_("DCMMS uses %sPostGIS%s."), - "<a href=\"http://postgis.refractions.net\">","</a>").' Copyright (c) - 2002-2004 <a href="www.refractions.net">Refractions Research Inc.</a></p> -<p>PostGIS 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 /> - (at your option) any later version.</p> -<br /> -<p>'.sprintf(_("DCMMS uses the %sPostgreSQL%s data base management system."), - "<a href=\"http://www.postgresql.org\">", "</a>").'</p> -<p>Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group<br /> -This software is based on Postgres95, formerly known as Postgres, which<br /> -contains the following notice:<br /> -Portions Copyright(c) 1994, Regents of the University of California<br /> -Permission to use, copy, modify, and distribute this software and its<br /> -documentation for any purpose, without fee, and without a written agreement<br /> -is hereby granted, provided that the above copyright notice and this paragraph<br /> -and the following two paragraphs appear in all copies.<br /> -IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR<br /> -DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST<br /> -PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF<br /> -THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH<br /> -DAMAGE.<br /> -THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,<br /> -BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A<br /> -PARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,<br /> -AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,<br /> -SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</p>'); -$dcmPage->add('<h3>'._("Authors").'</h3>'); -$dcmPage->add('<iframe src="AUTHORS" style="width: 60em; height: 15em;" />'); -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> - Copied: branches/ms4w/dcmms/htdocs/about.php (from rev 1094, branches/ms4w/dcmms/about.php) =================================================================== --- branches/ms4w/dcmms/htdocs/about.php (rev 0) +++ branches/ms4w/dcmms/htdocs/about.php 2006-08-09 05:12:56 UTC (rev 1095) @@ -0,0 +1,100 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * about.php - Information about the DCMMS application + * + * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA + * Copyright (C) 2006 DORSCH Consult + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +require_once("include/dcmmspage.php"); + +$dcmPage = new DcmmsPage(_('About the DC Maintenance Management System')); +$dcmPage->setIconImage('about.png'); +$dcmPage->setPageName(basename(__FILE__)); + +$dcmPage->add('<p>'.sprintf( + _("Please visit %shttp://dcmms.sourceforge.net%s for the latest news and updates."), + "<a href=\"http://dcmms.sourceforge.net\">","</a>").'</p> +<br /> +<div dir="ltr"> +<p dir="ltr">Copyright (c) 2003 - 2006 <a href="http://www.dorsch.de">DORSCH + Consult</a></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 /> + (at your option) any later version.</p> +<br /> +<p dir="ltr">This program is distributed in the hope that it will be useful,<br /> + but WITHOUT ANY WARRANTY; without even the implied warranty of<br /> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br /> + GNU General Public License for more details.</p> +<br /> + +<p dir="ltr">Portions of this software Copyright (c) 2003 - 2005 + <a href="http://www.ngwa.gov.jo">NGWA</a>.</p> +<br /> + +<p>Portions of this software Copyright (c) 1999, 2000 <a href= + "http://www.dmsolutions.ca">DM Solutions Goup Inc.</a> +<br />Permission is hereby granted, free of charge, to any person obtaining a<br /> +copy of this software and associated documentation files (the "Software"), to<br /> +deal in the Software without restriction, including without limitation the<br /> +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or<br /> +sell copies of the Software, and to permit persons to whom the Software is<br /> +furnished to do so, subject to the following conditions:<br /> +The above copyright notice and this permission notice shall be included in all<br /> +copies or substantial portions of the Software.</p> +<br /> +</div> +<p>'.sprintf(_("DCMMS uses icons of the %sGNOME%s project."), + "<a href=\"http://www.gnome.org\">","</a>").'</p> +<br /> +<p>'.sprintf(_("DCMMS uses %sPostGIS%s."), + "<a href=\"http://postgis.refractions.net\">","</a>").' Copyright (c) + 2002-2004 <a href="www.refractions.net">Refractions Research Inc.</a></p> +<p>PostGIS 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 /> + (at your option) any later version.</p> +<br /> +<p>'.sprintf(_("DCMMS uses the %sPostgreSQL%s data base management system."), + "<a href=\"http://www.postgresql.org\">", "</a>").'</p> +<p>Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group<br /> +This software is based on Postgres95, formerly known as Postgres, which<br /> +contains the following notice:<br /> +Portions Copyright(c) 1994, Regents of the University of California<br /> +Permission to use, copy, modify, and distribute this software and its<br /> +documentation for any purpose, without fee, and without a written agreement<br /> +is hereby granted, provided that the above copyright notice and this paragraph<br /> +and the following two paragraphs appear in all copies.<br /> +IN NO EVENT SHALL THE UNIVERSITY OF CALIFORNIA BE LIABLE TO ANY PARTY FOR<br /> +DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, INCLUDING LOST<br /> +PROFITS, ARISING OUT OF THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF<br /> +THE UNIVERSITY OF CALIFORNIA HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH<br /> +DAMAGE.<br /> +THE UNIVERSITY OF CALIFORNIA SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING,<br /> +BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A<br /> +PARTICULAR PURPOSE.THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS,<br /> +AND THE UNIVERSITY OF CALIFORNIA HAS NO OBLIGATIONS TO PROVIDE MAINTENANCE,<br /> +SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.</p>'); +$dcmPage->add('<h3>'._("Authors").'</h3>'); +$dcmPage->add('<iframe src="AUTHORS" style="width: 60em; height: 15em;" />'); +$dcmPage->setCvsDate("$Date$Empty"); +echo($dcmPage->toHtml()); +?> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-09 05:15:37
|
Revision: 1096 Author: sdteffen Date: 2006-08-08 22:15:19 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1096&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/aging_report.php Removed Paths: ------------- branches/ms4w/dcmms/aging_report.php Deleted: branches/ms4w/dcmms/aging_report.php =================================================================== --- branches/ms4w/dcmms/aging_report.php 2006-08-09 05:12:56 UTC (rev 1095) +++ branches/ms4w/dcmms/aging_report.php 2006-08-09 05:15:19 UTC (rev 1096) @@ -1,290 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * aging_report.php - Workorder aging report - * - * Copyright (C) 2004 - 2006 DORSCH Consult - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); -/** - * \todo Use PEAR DB. - * \todo Refactor Graphing code. - */ -require_once("include/dcmpostgis.php"); -require_once("include/dcmmspear.php"); -require_once("HTML/QuickForm.php"); -require_once("HTML/QuickForm/select.php"); -require_once("Image/Graph.php"); - -$dcmPage = new DcmmsPage(_("Aging Report")); -$dcmPage->setIconImage("documents.png"); -$dcmPage->setPageName(basename(__FILE__)); - -$arrInterval = array( - "hour" => _("hour(s)"), - "day" => _("day(s)"), - "month" => _("month(s)"), - "year" => _("year(s)")); - -$arrIntervalSeconds = array( - "hour" => 3600.0, - "day" => 86400.0, - "month" => 2592000.0, - "year" => 31536000.0); - -$arrCount = array( - "1" => "1", - "4" => "4", - "7" => "7", - "12" => "12", - "14" => "14", - "30" => "30", - "52" => "52"); - -$form = new HTML_QuickForm("AgingForm"); -$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). - ">*</span><span style=".quote("font-size:80%;")."> ". - _("denotes required field")."</span>"); -$form->setDefaults(array("interval" => "day", - "end_timestamp" => $dcmPage->getTimestamp(0,0), "count" => "7", - "administrativearea" => "0")); - -$dcmPage->add("<p>".sprintf( - _("A DCMMS %sReport%s on workorder aging for a period of time."), - "<a href=\"reports.php\">", "</a>")."</p>"); - -$selCount = new HTML_QuickForm_select("count", _("Count:"), $arrCount); -$form->addElement($selCount); -$selInterval = new HTML_QuickForm_select("interval", _("Interval:"), - $arrInterval); -$form->addElement($selInterval); -$form->addElement("text", "end_timestamp", _("End Date:"), - array("maxlength" => 16)); -$selAdministrativeArea = new HTML_QuickForm_select("administrativearea", - _("Administrative Area:")); -$strQuery = "select dcmmstranslation('".$_SESSION["language"]. - "', name), CodedValue from AdministrativeArea"; -$selAdministrativeArea->addOption(_("[Select One]"), 0); -$selAdministrativeArea->loadQuery($dcmPage->postgis->db, $strQuery); -$form->addElement($selAdministrativeArea); -$selSubtype = new HTML_QuickForm_select('subtype', _('Type:')); -$strQuery = 'select dcmmstranslation(\''.$_SESSION['language']. - '\', description) as description, Subtype from WorkorderSubtype'; -$selSubtype->addOption(_('[Select One]'), 0); -$selSubtype->loadQuery($dcmPage->postgis->db, $strQuery); -$form->addElement($selSubtype); -$form->addElement("submit", null, _("Create Report")); - -/** - * Validate input. - */ -$form->applyFilter("end_timestamp", "trim"); -$form->addRule("interval", _("Please select the interval."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("count", - _("Please provide the number of interval repetitions."), "required", null, - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("end_timestamp", - _("Please provide the end date."), "required", null, - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("end_timestamp", - _("End date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("administrativearea", - _("Administrative Area has to be a coded value."), "regex", "/[0-9]*/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule('subtype', - _('Type has to be a coded value.'), 'regex', '/[0-9]*/', - $_SESSION['strHtmlQuickFormValidation']); -$dcmPage->add($form->toHtml()); - -/** - * Handle request - */ -if($form->validate()) { - /** - * \todo Mention Administrative Area and Subtype where necessary. - */ - $dcmPage->add("<h2>".sprintf(_("Workorder aging report for %s %s(s) before %s"), - $form->exportValue("count"), _($form->exportValue("interval")), - $form->exportValue("end_timestamp"))."</h2>"); - /** - * Add where clause if necessary. - */ - $numAdministrativeArea = $form->exportValue("administrativearea"); - $strWhere = ""; - if($numAdministrativeArea != 0) { - $strWhere = " and Workorder.AdministrativeArea = $numAdministrativeArea"; - } - $numSubtype = $form->exportValue('subtype'); - if($numSubtype != 0) { - $strWhere = ' and Workorder.Subtype = '.$numSubtype; - } - /** - * Create the aging table. - */ - $strQuery = "select date_trunc('". - $form->exportValue("interval")."', age(Maintenance.CompletionDate, ". - "Workorder.ReceivedDate)) as Age, count(*) from Maintenance, Workorder where ". - "Maintenance.ID = Workorder.ID and (Maintenance.CompletionDate, interval '1 second')". - " overlaps (timestamp '".$form->exportValue("end_timestamp"). - "', interval '- ".$form->exportValue("count")." ". - $form->exportValue("interval")."') $strWhere group by Age ". - "order by Age desc"; - //echo($strQuery); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $numRowCount = $objTable->getRowCount(); - if(($numRowCount > 0) && - ($objTable->getCellContents($numRowCount-1, 0) == "00:00:00")) { - $objTable->setCellContents($numRowCount-1, 0, "< 1 ". - $form->exportValue("interval")); - } - /** - * Localize text string parts. - */ - for($numI = 1; $numI < $numRowCount; $numI++) { - $arrTokens = explode(' ', $objTable->getCellContents($numI, 0)); - $strCell = ''; - foreach($arrTokens as $strToken) { - if(is_numeric($strToken)) { - $strCell .= ($strToken.' '); - } else { - $strCell .= (_($strToken).' '); - } - } - $objTable->setCellContents($numI, 0, $strCell); - } - $dcmPage->add($objTable->toHtml()); - /** - * Create turnaround time graph. - */ - $dcmPage->add('<div class="page"> - <h3>'. - sprintf(_("Average Turnaround Time For Closed Items (%ss)"), - _($form->exportValue("interval")))."</h3>"); - $Graph =& Image_Graph::factory("Image_Graph", array(800, 600)); - $Arial_v =& $Graph->addNew('font', 'Arial'); - $Arial_v->setSize(9); - $Arial_v->setAngle(90); - $Plotarea =& $Graph->add(Image_Graph::factory("Image_Graph_Plotarea")); - $Dataset =& Image_Graph::factory("Image_Graph_Dataset_Trivial"); - $numCount = $form->exportValue("count"); - $strEndTimestamp = $form->exportValue("end_timestamp"); - $strInterval = $form->exportValue("interval"); - $numIntervalSeconds = $arrIntervalSeconds[$strInterval]; - for($numI = $numCount; $numI >0; $numI--) { - $strQuery = "select intervalseconds(avg(Maintenance.CompletionDate - ". - "Workorder.ReceivedDate))". - ", (timestamp '$strEndTimestamp' - interval '".($numI-1)." $strInterval')". - " as Start, (timestamp '$strEndTimestamp' - interval '$numI $strInterval')". - " as End from Maintenance, Workorder where ". - "Maintenance.ID = Workorder.ID and Maintenance.CompletionDate < ". - "(timestamp '$strEndTimestamp' - interval '".($numI-1)." $strInterval') ". - "and Maintenance.CompletionDate > (timestamp '$strEndTimestamp' - ". - "interval '$numI $strInterval') $strWhere"; - //echo($strQuery); - $objResult = pg_query($strQuery); - $arrRow = pg_fetch_row($objResult); - $Dataset->addPoint($arrRow[1], $arrRow[0]/$numIntervalSeconds); - } - $Bar =& Image_Graph::factory("Image_Graph_Plot_Bar", &$Dataset); - $Plot =& $Plotarea->add(&$Bar); - $AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $AxisX->setFont($Arial_v); - $Bar->setFillColor("#9db8d2"); - $strTmpPath = tempnam($_SESSION['strMsTmpDirectory'], "graph").".png"; - $Graph->done(array('filename' => $strTmpPath)); - $dcmPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />"); - - /** - * Create Number of Items Submitted graph. - */ - $dcmPage->add('</div> - <div class="page"> - <h3>'. - _("Number of Items Submitted")."</h3>"); - $Graph =& Image_Graph::factory("Image_Graph", array(800, 600)); - $Arial_v =& $Graph->addNew('font', 'Arial'); - $Arial_v->setSize(9); - $Arial_v->setAngle(90); - $Plotarea =& $Graph->add(Image_Graph::factory("Image_Graph_Plotarea")); - $Dataset =& Image_Graph::factory("Image_Graph_Dataset_Trivial"); - for($numI = $numCount; $numI >0; $numI--) { - $strQuery = "select count(Workorder.*), (timestamp '$strEndTimestamp' - ". - "interval '".($numI-1)." $strInterval')". - " as Start from Workorder left outer join Maintenance on Workorder.ID = ". - "Maintenance.ID where Workorder.subtype<>0 and Workorder.ReceivedDate > ". - "(timestamp '$strEndTimestamp' - interval '".($numI)." $strInterval') and ". - "Workorder.ReceivedDate < (timestamp '$strEndTimestamp' - interval '". - ($numI-1)." $strInterval') $strWhere"; - //echo($strQuery); - $objResult = pg_query($strQuery); - $arrRow = pg_fetch_row($objResult); - $Dataset->addPoint($arrRow[1], $arrRow[0]); - } - $Bar =& Image_Graph::factory("Image_Graph_Plot_Bar", &$Dataset); - $Plot =& $Plotarea->add(&$Bar); - $AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $AxisX->setFont($Arial_v); - $Bar->setFillColor("#9db8d2"); - $strTmpPath = tempnam($_SESSION['strMsTmpDirectory'], "graph").".png"; - $Graph->done(array('filename' => $strTmpPath)); - $dcmPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />"); - - /** - * Create Number of Items Still Open graph. - */ - $dcmPage->add('</div> - <div class="page"> - <h3>'._("Number of Items Still Open")."</h3>"); - $Graph =& Image_Graph::factory("Image_Graph", array(800, 600)); - $Arial_v =& $Graph->addNew('font', 'Arial'); - $Arial_v->setSize(9); - $Arial_v->setAngle(90); - $Plotarea =& $Graph->add(Image_Graph::factory("Image_Graph_Plotarea")); - $Dataset =& Image_Graph::factory("Image_Graph_Dataset_Trivial"); - for($numI = $numCount; $numI >0; $numI--) { - $strQuery = "select count(Workorder.*), (timestamp '$strEndTimestamp' - ". - "interval '".($numI-1)." $strInterval')". - " as Start from Workorder left outer join Maintenance on Workorder.ID = ". - "Maintenance.ID". - " where Workorder.subtype<>0 and Workorder.Subtype is not null and - Workorder.ReceivedDate < ". - "(timestamp '$strEndTimestamp' - interval '".($numI)." $strInterval') and ". - "(Maintenance.CompletionDate > (timestamp '$strEndTimestamp' - interval '". - ($numI-1)." $strInterval') or Maintenance.Status = 1) $strWhere"; - //echo($strQuery); - $objResult = pg_query($strQuery); - $arrRow = pg_fetch_row($objResult); - $Dataset->addPoint($arrRow[1], $arrRow[0]); - } - $Bar =& Image_Graph::factory("Image_Graph_Plot_Bar", &$Dataset); - $Plot =& $Plotarea->add(&$Bar); - $AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X); - $AxisX->setFont($Arial_v); - $Bar->setFillColor("#9db8d2"); - $strTmpPath = tempnam($_SESSION['strMsTmpDirectory'], "graph").".png"; - $Graph->done(array('filename' => $strTmpPath)); - $dcmPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />"); - -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); ?> Copied: branches/ms4w/dcmms/htdocs/aging_report.php (from rev 1095, branches/ms4w/dcmms/aging_report.php) =================================================================== --- branches/ms4w/dcmms/htdocs/aging_report.php (rev 0) +++ branches/ms4w/dcmms/htdocs/aging_report.php 2006-08-09 05:15:19 UTC (rev 1096) @@ -0,0 +1,290 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * aging_report.php - Workorder aging report + * + * Copyright (C) 2004 - 2006 DORSCH Consult + * Copyright (C) 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +require_once("include/dcmmspage.php"); +/** + * \todo Use PEAR DB. + * \todo Refactor Graphing code. + */ +require_once("include/dcmpostgis.php"); +require_once("include/dcmmspear.php"); +require_once("HTML/QuickForm.php"); +require_once("HTML/QuickForm/select.php"); +require_once("Image/Graph.php"); + +$dcmPage = new DcmmsPage(_("Aging Report")); +$dcmPage->setIconImage("documents.png"); +$dcmPage->setPageName(basename(__FILE__)); + +$arrInterval = array( + "hour" => _("hour(s)"), + "day" => _("day(s)"), + "month" => _("month(s)"), + "year" => _("year(s)")); + +$arrIntervalSeconds = array( + "hour" => 3600.0, + "day" => 86400.0, + "month" => 2592000.0, + "year" => 31536000.0); + +$arrCount = array( + "1" => "1", + "4" => "4", + "7" => "7", + "12" => "12", + "14" => "14", + "30" => "30", + "52" => "52"); + +$form = new HTML_QuickForm("AgingForm"); +$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). + ">*</span><span style=".quote("font-size:80%;")."> ". + _("denotes required field")."</span>"); +$form->setDefaults(array("interval" => "day", + "end_timestamp" => $dcmPage->getTimestamp(0,0), "count" => "7", + "administrativearea" => "0")); + +$dcmPage->add("<p>".sprintf( + _("A DCMMS %sReport%s on workorder aging for a period of time."), + "<a href=\"reports.php\">", "</a>")."</p>"); + +$selCount = new HTML_QuickForm_select("count", _("Count:"), $arrCount); +$form->addElement($selCount); +$selInterval = new HTML_QuickForm_select("interval", _("Interval:"), + $arrInterval); +$form->addElement($selInterval); +$form->addElement("text", "end_timestamp", _("End Date:"), + array("maxlength" => 16)); +$selAdministrativeArea = new HTML_QuickForm_select("administrativearea", + _("Administrative Area:")); +$strQuery = "select dcmmstranslation('".$_SESSION["language"]. + "', name), CodedValue from AdministrativeArea"; +$selAdministrativeArea->addOption(_("[Select One]"), 0); +$selAdministrativeArea->loadQuery($dcmPage->postgis->db, $strQuery); +$form->addElement($selAdministrativeArea); +$selSubtype = new HTML_QuickForm_select('subtype', _('Type:')); +$strQuery = 'select dcmmstranslation(\''.$_SESSION['language']. + '\', description) as description, Subtype from WorkorderSubtype'; +$selSubtype->addOption(_('[Select One]'), 0); +$selSubtype->loadQuery($dcmPage->postgis->db, $strQuery); +$form->addElement($selSubtype); +$form->addElement("submit", null, _("Create Report")); + +/** + * Validate input. + */ +$form->applyFilter("end_timestamp", "trim"); +$form->addRule("interval", _("Please select the interval."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("count", + _("Please provide the number of interval repetitions."), "required", null, + $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("end_timestamp", + _("Please provide the end date."), "required", null, + $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("end_timestamp", + _("End date has to be entered in the following format: 2004-08-21 21:30."), + "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", + $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("administrativearea", + _("Administrative Area has to be a coded value."), "regex", "/[0-9]*/", + $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule('subtype', + _('Type has to be a coded value.'), 'regex', '/[0-9]*/', + $_SESSION['strHtmlQuickFormValidation']); +$dcmPage->add($form->toHtml()); + +/** + * Handle request + */ +if($form->validate()) { + /** + * \todo Mention Administrative Area and Subtype where necessary. + */ + $dcmPage->add("<h2>".sprintf(_("Workorder aging report for %s %s(s) before %s"), + $form->exportValue("count"), _($form->exportValue("interval")), + $form->exportValue("end_timestamp"))."</h2>"); + /** + * Add where clause if necessary. + */ + $numAdministrativeArea = $form->exportValue("administrativearea"); + $strWhere = ""; + if($numAdministrativeArea != 0) { + $strWhere = " and Workorder.AdministrativeArea = $numAdministrativeArea"; + } + $numSubtype = $form->exportValue('subtype'); + if($numSubtype != 0) { + $strWhere = ' and Workorder.Subtype = '.$numSubtype; + } + /** + * Create the aging table. + */ + $strQuery = "select date_trunc('". + $form->exportValue("interval")."', age(Maintenance.CompletionDate, ". + "Workorder.ReceivedDate)) as Age, count(*) from Maintenance, Workorder where ". + "Maintenance.ID = Workorder.ID and (Maintenance.CompletionDate, interval '1 second')". + " overlaps (timestamp '".$form->exportValue("end_timestamp"). + "', interval '- ".$form->exportValue("count")." ". + $form->exportValue("interval")."') $strWhere group by Age ". + "order by Age desc"; + //echo($strQuery); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $numRowCount = $objTable->getRowCount(); + if(($numRowCount > 0) && + ($objTable->getCellContents($numRowCount-1, 0) == "00:00:00")) { + $objTable->setCellContents($numRowCount-1, 0, "< 1 ". + $form->exportValue("interval")); + } + /** + * Localize text string parts. + */ + for($numI = 1; $numI < $numRowCount; $numI++) { + $arrTokens = explode(' ', $objTable->getCellContents($numI, 0)); + $strCell = ''; + foreach($arrTokens as $strToken) { + if(is_numeric($strToken)) { + $strCell .= ($strToken.' '); + } else { + $strCell .= (_($strToken).' '); + } + } + $objTable->setCellContents($numI, 0, $strCell); + } + $dcmPage->add($objTable->toHtml()); + /** + * Create turnaround time graph. + */ + $dcmPage->add('<div class="page"> + <h3>'. + sprintf(_("Average Turnaround Time For Closed Items (%ss)"), + _($form->exportValue("interval")))."</h3>"); + $Graph =& Image_Graph::factory("Image_Graph", array(800, 600)); + $Arial_v =& $Graph->addNew('font', 'Arial'); + $Arial_v->setSize(9); + $Arial_v->setAngle(90); + $Plotarea =& $Graph->add(Image_Graph::factory("Image_Graph_Plotarea")); + $Dataset =& Image_Graph::factory("Image_Graph_Dataset_Trivial"); + $numCount = $form->exportValue("count"); + $strEndTimestamp = $form->exportValue("end_timestamp"); + $strInterval = $form->exportValue("interval"); + $numIntervalSeconds = $arrIntervalSeconds[$strInterval]; + for($numI = $numCount; $numI >0; $numI--) { + $strQuery = "select intervalseconds(avg(Maintenance.CompletionDate - ". + "Workorder.ReceivedDate))". + ", (timestamp '$strEndTimestamp' - interval '".($numI-1)." $strInterval')". + " as Start, (timestamp '$strEndTimestamp' - interval '$numI $strInterval')". + " as End from Maintenance, Workorder where ". + "Maintenance.ID = Workorder.ID and Maintenance.CompletionDate < ". + "(timestamp '$strEndTimestamp' - interval '".($numI-1)." $strInterval') ". + "and Maintenance.CompletionDate > (timestamp '$strEndTimestamp' - ". + "interval '$numI $strInterval') $strWhere"; + //echo($strQuery); + $objResult = pg_query($strQuery); + $arrRow = pg_fetch_row($objResult); + $Dataset->addPoint($arrRow[1], $arrRow[0]/$numIntervalSeconds); + } + $Bar =& Image_Graph::factory("Image_Graph_Plot_Bar", &$Dataset); + $Plot =& $Plotarea->add(&$Bar); + $AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $AxisX->setFont($Arial_v); + $Bar->setFillColor("#9db8d2"); + $strTmpPath = tempnam($_SESSION['strMsTmpDirectory'], "graph").".png"; + $Graph->done(array('filename' => $strTmpPath)); + $dcmPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />"); + + /** + * Create Number of Items Submitted graph. + */ + $dcmPage->add('</div> + <div class="page"> + <h3>'. + _("Number of Items Submitted")."</h3>"); + $Graph =& Image_Graph::factory("Image_Graph", array(800, 600)); + $Arial_v =& $Graph->addNew('font', 'Arial'); + $Arial_v->setSize(9); + $Arial_v->setAngle(90); + $Plotarea =& $Graph->add(Image_Graph::factory("Image_Graph_Plotarea")); + $Dataset =& Image_Graph::factory("Image_Graph_Dataset_Trivial"); + for($numI = $numCount; $numI >0; $numI--) { + $strQuery = "select count(Workorder.*), (timestamp '$strEndTimestamp' - ". + "interval '".($numI-1)." $strInterval')". + " as Start from Workorder left outer join Maintenance on Workorder.ID = ". + "Maintenance.ID where Workorder.subtype<>0 and Workorder.ReceivedDate > ". + "(timestamp '$strEndTimestamp' - interval '".($numI)." $strInterval') and ". + "Workorder.ReceivedDate < (timestamp '$strEndTimestamp' - interval '". + ($numI-1)." $strInterval') $strWhere"; + //echo($strQuery); + $objResult = pg_query($strQuery); + $arrRow = pg_fetch_row($objResult); + $Dataset->addPoint($arrRow[1], $arrRow[0]); + } + $Bar =& Image_Graph::factory("Image_Graph_Plot_Bar", &$Dataset); + $Plot =& $Plotarea->add(&$Bar); + $AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $AxisX->setFont($Arial_v); + $Bar->setFillColor("#9db8d2"); + $strTmpPath = tempnam($_SESSION['strMsTmpDirectory'], "graph").".png"; + $Graph->done(array('filename' => $strTmpPath)); + $dcmPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />"); + + /** + * Create Number of Items Still Open graph. + */ + $dcmPage->add('</div> + <div class="page"> + <h3>'._("Number of Items Still Open")."</h3>"); + $Graph =& Image_Graph::factory("Image_Graph", array(800, 600)); + $Arial_v =& $Graph->addNew('font', 'Arial'); + $Arial_v->setSize(9); + $Arial_v->setAngle(90); + $Plotarea =& $Graph->add(Image_Graph::factory("Image_Graph_Plotarea")); + $Dataset =& Image_Graph::factory("Image_Graph_Dataset_Trivial"); + for($numI = $numCount; $numI >0; $numI--) { + $strQuery = "select count(Workorder.*), (timestamp '$strEndTimestamp' - ". + "interval '".($numI-1)." $strInterval')". + " as Start from Workorder left outer join Maintenance on Workorder.ID = ". + "Maintenance.ID". + " where Workorder.subtype<>0 and Workorder.Subtype is not null and + Workorder.ReceivedDate < ". + "(timestamp '$strEndTimestamp' - interval '".($numI)." $strInterval') and ". + "(Maintenance.CompletionDate > (timestamp '$strEndTimestamp' - interval '". + ($numI-1)." $strInterval') or Maintenance.Status = 1) $strWhere"; + //echo($strQuery); + $objResult = pg_query($strQuery); + $arrRow = pg_fetch_row($objResult); + $Dataset->addPoint($arrRow[1], $arrRow[0]); + } + $Bar =& Image_Graph::factory("Image_Graph_Plot_Bar", &$Dataset); + $Plot =& $Plotarea->add(&$Bar); + $AxisX =& $Plotarea->getAxis(IMAGE_GRAPH_AXIS_X); + $AxisX->setFont($Arial_v); + $Bar->setFillColor("#9db8d2"); + $strTmpPath = tempnam($_SESSION['strMsTmpDirectory'], "graph").".png"; + $Graph->done(array('filename' => $strTmpPath)); + $dcmPage->add("<img src=\"/ms_tmp/".basename($strTmpPath)."\" />"); + +} +$dcmPage->setCvsDate("$Date$Empty"); +echo($dcmPage->toHtml()); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-09 05:16:27
|
Revision: 1097 Author: sdteffen Date: 2006-08-08 22:16:12 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1097&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/broken_seals_report.php Removed Paths: ------------- branches/ms4w/dcmms/broken_seals_report.php Deleted: branches/ms4w/dcmms/broken_seals_report.php =================================================================== --- branches/ms4w/dcmms/broken_seals_report.php 2006-08-09 05:15:19 UTC (rev 1096) +++ branches/ms4w/dcmms/broken_seals_report.php 2006-08-09 05:16:12 UTC (rev 1097) @@ -1,125 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * broken_seals_report.php - Report on seals that were broken by repair - * activities - * - * Copyright (C) 2003,2004 DORSCH Consult, NGWA - * Copyright (C) 2005 DORSCH Consult - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); -require_once("include/dcmmspostgis.php"); -require_once("HTML/QuickForm.php"); -require_once("HTML/QuickForm/select.php"); -require_once("HTML/QuickForm/text.php"); -require_once("HTML/Common.php"); -require_once("HTML/Table.php"); -require_once("include/dcmmspear.php"); - -$dcmPage = new DcmmsPage(_("Broken Seals Report")); -$dcmPage->setIconImage("documents.png"); -$dcmPage->setPageName(basename(__FILE__)); - -/** - * \todo subtype HTML_QuickForm - */ -$form = new HTML_QuickForm("BrokenSealsForm"); -$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). - ">*</span><span style=".quote("font-size:80%;")."> ". - _("denotes required field")."</span>"); -$dcmPage->add("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. - "\" border=\"0\" alt=\"Organization Logo\" />"); -$dcmPage->add("<p>".sprintf( - _("A DCMMS %sReport%s on seals that were broken by maintenance activities.") - ,"<a href=\"reports.php\">","</a>")."</p>"); - -$strQuery = "select CodedValue,". - $dcmPage->postgis->localize('Name', 'AdministrativeArea'). - " from AdministrativeArea"; -$arrArea = $dcmPage->postgis->db->getAssoc($strQuery); -$selArea = new HTML_QuickForm_select("AdministrativeArea", - _("Administrative Area:"), $arrArea); -$form->addElement($selArea); -$form->addElement(new HTML_QuickForm_text("StartDate", _("Start Date:")), - array("maxlength" => 16)); -$form->addElement(new HTML_QuickForm_text("EndDate", _("End Date:")), - array("maxlength" => 16)); -$form->addElement("submit", null, _("Create Report")); -/** - * Default values - */ -$form->setDefaults(array("StartDate" => $dcmPage->getTimestamp(0,1), - "EndDate" => $dcmPage->getTimestamp())); -/** - * Validate input. - */ -$form->applyFilter("StartDate", "trim"); -$form->applyFilter("EndDate", "trim"); -$form->addRule("AdministrativeArea", - _("Please select the administrative area."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Please enter the start date."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("Please enter the end date."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Start date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("End date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -/** - * \todo date validation - */ -$dcmPage->add($form->toHtml()); - -/** - * Handle request - */ -if($form->validate()) { - $strQuery = "select Workorder.ID as WorkorderID, Workorder.Complainant,". - 'dcmmstranslation(\''.$_SESSION['language'].'\', - WorkorderSubtype.Description), Workorder.Telephone,'. - "Workorder.LocationDescription, ". - $dcmPage->postgis->formatTimestamp("Workorder.ReceivedDate"). - " as ReceivedDate,". - "Workorder.Note, Seal.SubscriberOID, Seal.SerialNumber, Seal.Reason, ". - "Seal.Responsible from ". - "Workorder, WorkorderSubtype, Seal, Maintenance where Workorder.Subtype = ". - "WorkorderSubtype.Subtype and Workorder.ID = Maintenance.ID and ". - "Maintenance.Status=2 and ". - "Seal.MaintenanceOID=Workorder.ID and ". - "Workorder.AdministrativeArea=".$form->exportValue("AdministrativeArea"). - " and Workorder.ReceivedDate > '".$form->exportValue("StartDate"). - "' and Workorder.ReceivedDate < '". - $form->exportValue("EndDate"). - "' order by workorder.id, dcmmstranslation('".$_SESSION['language']. - "', WorkorderSubtype.Description)"; - //echo($strQuery); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $dcmPage->add($objTable->toHtml()); -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> Copied: branches/ms4w/dcmms/htdocs/broken_seals_report.php (from rev 1096, branches/ms4w/dcmms/broken_seals_report.php) =================================================================== --- branches/ms4w/dcmms/htdocs/broken_seals_report.php (rev 0) +++ branches/ms4w/dcmms/htdocs/broken_seals_report.php 2006-08-09 05:16:12 UTC (rev 1097) @@ -0,0 +1,125 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * broken_seals_report.php - Report on seals that were broken by repair + * activities + * + * Copyright (C) 2003,2004 DORSCH Consult, NGWA + * Copyright (C) 2005 DORSCH Consult + * Copyright (C) 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +require_once("include/dcmmspage.php"); +require_once("include/dcmmspostgis.php"); +require_once("HTML/QuickForm.php"); +require_once("HTML/QuickForm/select.php"); +require_once("HTML/QuickForm/text.php"); +require_once("HTML/Common.php"); +require_once("HTML/Table.php"); +require_once("include/dcmmspear.php"); + +$dcmPage = new DcmmsPage(_("Broken Seals Report")); +$dcmPage->setIconImage("documents.png"); +$dcmPage->setPageName(basename(__FILE__)); + +/** + * \todo subtype HTML_QuickForm + */ +$form = new HTML_QuickForm("BrokenSealsForm"); +$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). + ">*</span><span style=".quote("font-size:80%;")."> ". + _("denotes required field")."</span>"); +$dcmPage->add("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. + "\" border=\"0\" alt=\"Organization Logo\" />"); +$dcmPage->add("<p>".sprintf( + _("A DCMMS %sReport%s on seals that were broken by maintenance activities.") + ,"<a href=\"reports.php\">","</a>")."</p>"); + +$strQuery = "select CodedValue,". + $dcmPage->postgis->localize('Name', 'AdministrativeArea'). + " from AdministrativeArea"; +$arrArea = $dcmPage->postgis->db->getAssoc($strQuery); +$selArea = new HTML_QuickForm_select("AdministrativeArea", + _("Administrative Area:"), $arrArea); +$form->addElement($selArea); +$form->addElement(new HTML_QuickForm_text("StartDate", _("Start Date:")), + array("maxlength" => 16)); +$form->addElement(new HTML_QuickForm_text("EndDate", _("End Date:")), + array("maxlength" => 16)); +$form->addElement("submit", null, _("Create Report")); +/** + * Default values + */ +$form->setDefaults(array("StartDate" => $dcmPage->getTimestamp(0,1), + "EndDate" => $dcmPage->getTimestamp())); +/** + * Validate input. + */ +$form->applyFilter("StartDate", "trim"); +$form->applyFilter("EndDate", "trim"); +$form->addRule("AdministrativeArea", + _("Please select the administrative area."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("StartDate", + _("Please enter the start date."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("EndDate", + _("Please enter the end date."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("StartDate", + _("Start date has to be entered in the following format: 2004-08-21 21:30."), + "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", + $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("EndDate", + _("End date has to be entered in the following format: 2004-08-21 21:30."), + "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", + $_SESSION["strHtmlQuickFormValidation"]); +/** + * \todo date validation + */ +$dcmPage->add($form->toHtml()); + +/** + * Handle request + */ +if($form->validate()) { + $strQuery = "select Workorder.ID as WorkorderID, Workorder.Complainant,". + 'dcmmstranslation(\''.$_SESSION['language'].'\', + WorkorderSubtype.Description), Workorder.Telephone,'. + "Workorder.LocationDescription, ". + $dcmPage->postgis->formatTimestamp("Workorder.ReceivedDate"). + " as ReceivedDate,". + "Workorder.Note, Seal.SubscriberOID, Seal.SerialNumber, Seal.Reason, ". + "Seal.Responsible from ". + "Workorder, WorkorderSubtype, Seal, Maintenance where Workorder.Subtype = ". + "WorkorderSubtype.Subtype and Workorder.ID = Maintenance.ID and ". + "Maintenance.Status=2 and ". + "Seal.MaintenanceOID=Workorder.ID and ". + "Workorder.AdministrativeArea=".$form->exportValue("AdministrativeArea"). + " and Workorder.ReceivedDate > '".$form->exportValue("StartDate"). + "' and Workorder.ReceivedDate < '". + $form->exportValue("EndDate"). + "' order by workorder.id, dcmmstranslation('".$_SESSION['language']. + "', WorkorderSubtype.Description)"; + //echo($strQuery); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $dcmPage->add($objTable->toHtml()); +} +$dcmPage->setCvsDate("$Date$Empty"); +echo($dcmPage->toHtml()); +?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-09 05:34:23
|
Revision: 1115 Author: sdteffen Date: 2006-08-08 22:34:09 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1115&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/complaint_pending_report.php Removed Paths: ------------- branches/ms4w/dcmms/complaint_pending_report.php Deleted: branches/ms4w/dcmms/complaint_pending_report.php =================================================================== --- branches/ms4w/dcmms/complaint_pending_report.php 2006-08-09 05:31:35 UTC (rev 1114) +++ branches/ms4w/dcmms/complaint_pending_report.php 2006-08-09 05:34:09 UTC (rev 1115) @@ -1,88 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * complaints_pending_report.php - Report on pending complaints - * - * Copyright (C) 2003,2004 DORSCH Consult, NGWA - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -@include("include/header.php"); -include("include/dcmpostgis.php"); - -$dcmPage = new DcmPage(basename(__FILE__)); - -$dcmPage->header(_("Pending Complaints"), TRUE, "", "documents.png"); -echo("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. - "\" border=\"0\" alt=\"Organization Logo\" />"); -echo("<p>".sprintf( - _("A DCMMS %sReport%s listing workorder that are still pending.") - ,"<a href=\"reports.php\">","</a>")."</p>"); - -$query="select workorder.id as workorderID,workorder.complainant,". - 'dcmmstranslation(\''.$_SESSION['language']. - '\', workordersubtype.description) as Description, workorder.telephone,'. - "workorder.locationdescription, ".formatTimestamp("Workorder.ReceivedDate"). - " as ReceivedDate, workorder.note from ". - "workorder, workordersubtype, Maintenance where workorder.subtype = ". - "workordersubtype.subtype and Workorder.ID = Maintenance.ID ". - 'and Maintenance.Status=1'; -// Add the ROU selection option. -$strAdministra = ""; -if ((array_key_exists("AdministrativeArea",$_POST)) && ($_POST["AdministrativeArea"] !=0)){ - $strAdministra = " and administrativearea = ".$_POST["AdministrativeArea"]; -} - $query = $query.$strAdministra.' order by workorder.id, - dcmmstranslation(\''.$_SESSION['language'].'\', workordersubtype.description)'; - -$result = pg_exec($query); - $arrResult = array(); - while($arrRow = pg_fetch_row($result)) { - array_push($arrResult, $arrRow); - } - -?> -<form name="workorderstatus" action="complaint_pending_report.php?PHPSESSID="<?= - session_id() ?>" method="POST"> -<table summary="workorderstatus"> <?php - -$strAdministra = ""; - -// AdministrativeArea -$Adminquery = "select distinct Landmark.Administra, ". - pg_localize('Name', 'AdministrativeArea'). - " from AdministrativeArea, Landmark where Landmark.Administra = ". - "AdministrativeArea.CodedValue".$strAdministra; -//echo($query); -$result = pg_exec($Adminquery); -$arrResult = array(); -while($arrRow = pg_fetch_row($result)) { - array_push($arrResult, $arrRow); -} - -$dcmPage->printSelect("AdministrativeArea", $arrResult, $_POST, - _("Query for landmarks in this region.")); - - ?> - -</table> - <input type="submit" name="submit" value="<?=_("Create Report")?>" - title="<?= _('Click this button to create the report.') ?>"/> -</form><?php - -$dcmPage->printTable("pendingcomplaints", $query,array()); -$dcmPage->footer("$Date$Empty"); ?> Copied: branches/ms4w/dcmms/htdocs/complaint_pending_report.php (from rev 1114, branches/ms4w/dcmms/complaint_pending_report.php) =================================================================== --- branches/ms4w/dcmms/htdocs/complaint_pending_report.php (rev 0) +++ branches/ms4w/dcmms/htdocs/complaint_pending_report.php 2006-08-09 05:34:09 UTC (rev 1115) @@ -0,0 +1,88 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * complaints_pending_report.php - Report on pending complaints + * + * Copyright (C) 2003,2004 DORSCH Consult, NGWA + * Copyright (C) 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +@include("include/header.php"); +include("include/dcmpostgis.php"); + +$dcmPage = new DcmPage(basename(__FILE__)); + +$dcmPage->header(_("Pending Complaints"), TRUE, "", "documents.png"); +echo("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. + "\" border=\"0\" alt=\"Organization Logo\" />"); +echo("<p>".sprintf( + _("A DCMMS %sReport%s listing workorder that are still pending.") + ,"<a href=\"reports.php\">","</a>")."</p>"); + +$query="select workorder.id as workorderID,workorder.complainant,". + 'dcmmstranslation(\''.$_SESSION['language']. + '\', workordersubtype.description) as Description, workorder.telephone,'. + "workorder.locationdescription, ".formatTimestamp("Workorder.ReceivedDate"). + " as ReceivedDate, workorder.note from ". + "workorder, workordersubtype, Maintenance where workorder.subtype = ". + "workordersubtype.subtype and Workorder.ID = Maintenance.ID ". + 'and Maintenance.Status=1'; +// Add the ROU selection option. +$strAdministra = ""; +if ((array_key_exists("AdministrativeArea",$_POST)) && ($_POST["AdministrativeArea"] !=0)){ + $strAdministra = " and administrativearea = ".$_POST["AdministrativeArea"]; +} + $query = $query.$strAdministra.' order by workorder.id, + dcmmstranslation(\''.$_SESSION['language'].'\', workordersubtype.description)'; + +$result = pg_exec($query); + $arrResult = array(); + while($arrRow = pg_fetch_row($result)) { + array_push($arrResult, $arrRow); + } + +?> +<form name="workorderstatus" action="complaint_pending_report.php?PHPSESSID="<?= + session_id() ?>" method="POST"> +<table summary="workorderstatus"> <?php + +$strAdministra = ""; + +// AdministrativeArea +$Adminquery = "select distinct Landmark.Administra, ". + pg_localize('Name', 'AdministrativeArea'). + " from AdministrativeArea, Landmark where Landmark.Administra = ". + "AdministrativeArea.CodedValue".$strAdministra; +//echo($query); +$result = pg_exec($Adminquery); +$arrResult = array(); +while($arrRow = pg_fetch_row($result)) { + array_push($arrResult, $arrRow); +} + +$dcmPage->printSelect("AdministrativeArea", $arrResult, $_POST, + _("Query for landmarks in this region.")); + + ?> + +</table> + <input type="submit" name="submit" value="<?=_("Create Report")?>" + title="<?= _('Click this button to create the report.') ?>"/> +</form><?php + +$dcmPage->printTable("pendingcomplaints", $query,array()); +$dcmPage->footer("$Date$Empty"); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 16:07:45
|
Revision: 1118 Author: sdteffen Date: 2006-08-11 09:06:53 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1118&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/resource.php Removed Paths: ------------- branches/ms4w/dcmms/resource.php Copied: branches/ms4w/dcmms/htdocs/resource.php (from rev 1117, branches/ms4w/dcmms/resource.php) =================================================================== --- branches/ms4w/dcmms/htdocs/resource.php (rev 0) +++ branches/ms4w/dcmms/htdocs/resource.php 2006-08-11 16:06:53 UTC (rev 1118) @@ -0,0 +1,316 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * resource.php - insert resources information + * + * Copyright (C) 2003,2005 DORSCH Consult, NGWA + * Copyright (C) 2006 DORSCH Consult + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +@include("include/header.php"); +include("include/dcmpostgis.php"); +include("Pager/Pager.php"); +$dcmPage = new DcmPage(basename(__FILE__)); + +$strQuery = "select Subtype, Unit from MaterialSubtype"; +$result = pg_query($strQuery); + +$strScript = "<script type=\"text/javascript\">\n". + "function setUnit(material) {\n". + " var codelst=new Array("; +while($row = pg_fetch_row($result)) { + $strScript = $strScript."\"".$row[0]."\","; +} +$strScript = substr($strScript, 0, strlen($strScript)-1). + ");\nvar unitlst=new Array ("; +$result = pg_query($strQuery); +while($row = pg_fetch_row($result)) { + $strScript = $strScript."\""._($row[1])."\","; +} +$strScript = substr($strScript, 0, strlen($strScript)-1).");\n". + " for (i=0;i<codelst.length;i++){\n". + " if (codelst[i]==material){\n". + " var unit = unitlst[i];\n". + " }\n". + " }\n". + " if(document.forms[".quote("resourceupdate")."].unit) {\n". + " document.forms[".quote("resourceupdate")."].unit.value = unit;\n". + " }\n". + "}\n". + "</script>\n"; + +$dcmPage->header(_("Resource"), TRUE, $strScript); +if(array_key_exists("WorkorderID", $_REQUEST)) { + printf(_("Resource information for maintenance record %s."), + sprintf("<a href=\"maintenance.php?page=resource&id=%s&action=". + "viewworkorder&PHPSESSID=%s\">%s</a>", + $_REQUEST["WorkorderID"],session_id(), $_REQUEST["WorkorderID"])); +} +if(!array_key_exists("action", $_REQUEST)) { + $_REQUEST["action"] = "NULL"; +} + +if(!array_key_exists("id", $_REQUEST)) { + $_REQUEST["id"] = ""; +} + +if(($_REQUEST["action"] == "insert") || ($_REQUEST["action"] == "update")) { + $arrFields = array("quantity", "costcenter", "subtype"); + $boolDataCorrect = TRUE; + foreach($arrFields as $strField) { + if(($_POST[$strField] == 0)||($_POST[$strField] == "")) { + $boolDataCorrect = FALSE; + } + } + + if($boolDataCorrect) { + if($_REQUEST["action"] == "insert"){ + if (($_REQUEST["table"]=="Material")&&($_POST["subtype"]>100)){ + $insert = "insert into ".$_REQUEST["table"]. + " (maintenanceoid,unit,subtype,costcenter)". + " values (".$_REQUEST["WorkorderID"].",".$_POST["quantity"].",". + $_POST["subtype"].",".$_POST["costcenter"].")"; + } elseif (($_REQUEST["table"]=="Material")&&($_POST["subtype"]< 100)){ + $insert = "insert into ".$_REQUEST["table"]. + " (maintenanceoid,unit,subtype,costcenter,diameter)". + " values (".$_REQUEST["WorkorderID"].",".$_POST["quantity"].",". + $_POST["subtype"].",".$_POST["costcenter"]. + ",".$_POST["Diameter"].")"; + } else { + $insert = "insert into ".$_REQUEST["table"]. + " (maintenanceoid,unit,subtype,costcenter)". + " values (".$_REQUEST["WorkorderID"].",".$_POST["quantity"].",". + $_POST["subtype"].",".$_POST["costcenter"].")"; + } + //print_r($insert); + $result = pg_exec($insert); + if ($result){ + $dcmPage->writelog($insert); + } else { + echo("<p class=\"important\">". + _("Failed to update the resource information.")."</p>"); + } + + } elseif($_REQUEST["action"] == "update") { + if (($_REQUEST["table"]=="Material")&&($_POST["subtype"]>100)|| + ($_REQUEST["table"]=="Staff")||($_REQUEST["table"]=="Equipment")){ + $update = "update ".$_REQUEST["table"]." set maintenanceoid = ". + $_REQUEST["WorkorderID"].",costcenter=".$_POST["costcenter"]. + ",unit = ".$_POST["quantity"].",subtype =". $_POST["subtype"]. + " where id = ".$_REQUEST["id"]; + } else { + $update = "update ".$_REQUEST["table"]." set maintenanceoid = ". + $_REQUEST["WorkorderID"].",costcenter=".$_POST["costcenter"]. + ",unit = ".$_POST["quantity"].",subtype =". $_POST["subtype"]. + ",diameter =". $_POST["Diameter"]. + " where id = ".$_REQUEST["id"]; + } + // TODO: check result + $result = pg_exec($update); + if ($result){ + $dcmPage->writelog($update); + } else { + echo("<p class=\"important\">". + _("Failed to update the resource information.")."</p>"); + } + } + } else { ?> + <p class="important"><?= _("Incorrect data entry.") ?></p><?php + + } + +} elseif (($_REQUEST["action"]=="delete")) { + + $delete = "delete from ".$_REQUEST["table"]." where maintenanceoid = ". + $_REQUEST["WorkorderID"]. + "and id = ".$_REQUEST["id"]; + + //TODO: check result + $result = pg_exec($delete); + if ($result){ + $dcmPage->writelog($delete); + } else { + echo("<p class=\"important\">". + _("Failed to delete the resource information.")."</p>"); + } +} + +if(array_key_exists("table", $_REQUEST)) { ?> + <h2><?= _($_REQUEST["table"]) ?></h2> + <p><?php + $arrTables = array("Staff", "Equipment", "Material", "Seal"); + foreach($arrTables as $strTable) { + if($_REQUEST["table"] != $strTable) { ?><a href="<?php + if ($strTable =="Seal"){ + echo ("seal.php"); + } else { + echo ("resource.php"); + } + ?>?<?php + if($strTable=="Seal") { + echo ("action=queryrecord&"); + } ?>table=<?= $strTable ?>&PHPSESSID=<?= session_id() + ?>&WorkorderID=<?php + if((array_key_exists("WorkorderID", $_REQUEST)&& + ($_REQUEST["WorkorderID"]!=""))) { + echo ($_REQUEST["WorkorderID"]); + } else{ + echo ($_POST["WorkorderID"]); + } + ?>"><?php + } + echo(_($strTable)); + $_SESSION["table"]=$_REQUEST["table"]; + if($_REQUEST["table"] != $strTable) { + echo("</a>"); + } + echo(" "); + } + echo("</p>"); + if (array_key_exists("WorkorderID", $_REQUEST)) { + $strAction="insert"; + switch ($_REQUEST["action"]){ + case "confirmdelete": + $strAction="delete"; + break; + case "query": + $strAction="update"; + break; + } + echo("<form name=\"resourceupdate\" action=\"resource.php?table=". + $_REQUEST["table"]. + "&action=".$strAction."&WorkorderID=".$_REQUEST["WorkorderID"]. + "&id=".$_REQUEST["id"]."&PHPSESSID=".session_id()."\" method=\"POST\">"); + echo("<table summary=\"Staff information\">"); + $query = "select subtype, description from ".$_REQUEST["table"]."subtype"; + $result = pg_exec($query); + $arrSubtype = array(); + while($arrRow = pg_fetch_row($result)) { + array_push($arrSubtype, $arrRow); + } + $arrQuery = array(); + + if(($_REQUEST["action"] == "query")|| + ($_REQUEST["action"] == "confirmdelete")) { + $query = "select * from ".$_REQUEST["table"]." where ID=".$_REQUEST["id"]; + $result = pg_exec($query); + $arrQuery = pg_fetch_array($result); + } + $dcmPage->printSelect("subtype", $arrSubtype, $arrQuery, + _("Select the type of")." "._($_REQUEST["table"]), "", + "setUnit(this.value)"); + if(($_REQUEST["table"]=="Staff")||($_REQUEST["table"]=="Equipment")) { + $dcmPage->printTextInput("quantity", $arrQuery, 0, + _("Insert the quantity used."), "Working hours"); + } else { + if($_REQUEST["table"] == "Material") { + $dcmPage->printTextInput("unit", $arrQuery, "undefined", + _("The material unit."), "","", true, true); + } + $dcmPage->printTextInput("quantity", $arrQuery, 0, + _("Insert the quantity used.")); + } + if ($_REQUEST["table"]=="Material"){ + $query = "select codedvalue,description from DiameterDomain"; + $result = pg_exec($query); + $arrResult = array(); + while($arrRow = pg_fetch_row($result)) { + array_push($arrResult, $arrRow); + } + $dcmPage->printSelect("Diameter", $arrResult, $arrQuery, + _("Select the pipe diameter.")); + } + $query = "select CostCenter, ".substr($_SESSION["language"],0,2). + "Description from CostCenter"; + + $result = pg_exec($query); + $arrCostCenter = array(); + while($arrRow = pg_fetch_row($result)) { + array_push($arrCostCenter, $arrRow); + } + $dcmPage->printSelect("costcenter", $arrCostCenter, $arrQuery, + _("Select the costcenter.")); + ?><input type="hidden" name="WorkorderID" value="<?= + $_REQUEST["WorkorderID"] ?>" /> + <?php + echo("</table></table>");?> + <button type="submit" name="submit"><?php + switch ($_REQUEST["action"]){ + case "query": + echo(_("Update")); + break; + case "confirmdelete": + echo (_("Delete")); + break; + default: + echo (_("Save")); + break; + } + ?></button></form><?php + + $strWhere = $_REQUEST["table"].".maintenanceoid = ". + $_REQUEST["WorkorderID"]." "; + + $strFrom = $_REQUEST["table"].' left outer join '.$_REQUEST['table']. + 'Subtype on '.$_REQUEST['table'].'.Subtype = '.$_REQUEST['table']. + 'Subtype.Subtype '; + if('Material' == $_REQUEST['table']) { + $strFrom = $strFrom." left outer join DiameterDomain on ". + "DiameterDomain.CodedValue = Material.Diameter"; + } + $query = 'select count('.$_REQUEST['table'].'.*) from '.$strFrom." where ". + $strWhere; + //echo($query); + $result = pg_exec($query); + $arrRow = pg_fetch_array($result, 0); + $params['totalItems'] = $arrRow[0]; + $params['perPage'] = 10; + $params['nextImg'] = _('Next >>'); + $params['prevImg'] = _('<< Back'); + $pager =& Pager::factory($params); + $data = $pager->getPageData(); + $links = $pager->getLinks(); + list($from, $to) = $pager->getOffsetByPageId(); + + $query = "select ".$_REQUEST["table"].".id, ".$_REQUEST["table"].".id, ". + $_REQUEST["table"].".id, ". + $_REQUEST["table"]."subtype.description as Description,"; + + if ($_REQUEST["table"] == "Material"){ + $query = $query." coalesce(DiameterDomain.Description, '') as diameter, "; + } + $query = $query.$_REQUEST["table"].".unit as quantity, ". + $_REQUEST["table"]."subtype.unit , ". + $_REQUEST["table"].".costcenter from "; + $query = $query.$strFrom. + " where ". + $strWhere. " limit ".$params['perPage']. " offset ".($from-1) ; + //echo($query); + if($_REQUEST["action"] != "confirmdelete") { + $dcmPage->printTable($_REQUEST["table"], $query, array("Edit" => "resource.php?WorkorderID=". + $_REQUEST["WorkorderID"]."&PHPSESSID=".session_id()."&table=".$_REQUEST["table"]. + "&action=query&id=","Delete" => "resource.php?WorkorderID=". + $_REQUEST["WorkorderID"]."&PHPSESSID=".session_id()."&table=".$_REQUEST["table"]. + "&action=confirmdelete&id=")); ?> + <p><?= sprintf(_("Displaying [%s - %s] of %s"), $from, $to, + $pager->_totalItems) ?> </p> + <p><?= $links["back"]." ".$links["pages"]." ".$links["next"] ?></p> <?php + } + } +} + +$dcmPage->footer("$Date$Empty"); ?> Deleted: branches/ms4w/dcmms/resource.php =================================================================== --- branches/ms4w/dcmms/resource.php 2006-08-11 16:02:16 UTC (rev 1117) +++ branches/ms4w/dcmms/resource.php 2006-08-11 16:06:53 UTC (rev 1118) @@ -1,316 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * resource.php - insert resources information - * - * Copyright (C) 2003,2005 DORSCH Consult, NGWA - * Copyright (C) 2006 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -@include("include/header.php"); -include("include/dcmpostgis.php"); -include("Pager/Pager.php"); -$dcmPage = new DcmPage(basename(__FILE__)); - -$strQuery = "select Subtype, Unit from MaterialSubtype"; -$result = pg_query($strQuery); - -$strScript = "<script type=\"text/javascript\">\n". - "function setUnit(material) {\n". - " var codelst=new Array("; -while($row = pg_fetch_row($result)) { - $strScript = $strScript."\"".$row[0]."\","; -} -$strScript = substr($strScript, 0, strlen($strScript)-1). - ");\nvar unitlst=new Array ("; -$result = pg_query($strQuery); -while($row = pg_fetch_row($result)) { - $strScript = $strScript."\""._($row[1])."\","; -} -$strScript = substr($strScript, 0, strlen($strScript)-1).");\n". - " for (i=0;i<codelst.length;i++){\n". - " if (codelst[i]==material){\n". - " var unit = unitlst[i];\n". - " }\n". - " }\n". - " if(document.forms[".quote("resourceupdate")."].unit) {\n". - " document.forms[".quote("resourceupdate")."].unit.value = unit;\n". - " }\n". - "}\n". - "</script>\n"; - -$dcmPage->header(_("Resource"), TRUE, $strScript); -if(array_key_exists("WorkorderID", $_REQUEST)) { - printf(_("Resource information for maintenance record %s."), - sprintf("<a href=\"maintenance.php?page=resource&id=%s&action=". - "viewworkorder&PHPSESSID=%s\">%s</a>", - $_REQUEST["WorkorderID"],session_id(), $_REQUEST["WorkorderID"])); -} -if(!array_key_exists("action", $_REQUEST)) { - $_REQUEST["action"] = "NULL"; -} - -if(!array_key_exists("id", $_REQUEST)) { - $_REQUEST["id"] = ""; -} - -if(($_REQUEST["action"] == "insert") || ($_REQUEST["action"] == "update")) { - $arrFields = array("quantity", "costcenter", "subtype"); - $boolDataCorrect = TRUE; - foreach($arrFields as $strField) { - if(($_POST[$strField] == 0)||($_POST[$strField] == "")) { - $boolDataCorrect = FALSE; - } - } - - if($boolDataCorrect) { - if($_REQUEST["action"] == "insert"){ - if (($_REQUEST["table"]=="Material")&&($_POST["subtype"]>100)){ - $insert = "insert into ".$_REQUEST["table"]. - " (maintenanceoid,unit,subtype,costcenter)". - " values (".$_REQUEST["WorkorderID"].",".$_POST["quantity"].",". - $_POST["subtype"].",".$_POST["costcenter"].")"; - } elseif (($_REQUEST["table"]=="Material")&&($_POST["subtype"]< 100)){ - $insert = "insert into ".$_REQUEST["table"]. - " (maintenanceoid,unit,subtype,costcenter,diameter)". - " values (".$_REQUEST["WorkorderID"].",".$_POST["quantity"].",". - $_POST["subtype"].",".$_POST["costcenter"]. - ",".$_POST["Diameter"].")"; - } else { - $insert = "insert into ".$_REQUEST["table"]. - " (maintenanceoid,unit,subtype,costcenter)". - " values (".$_REQUEST["WorkorderID"].",".$_POST["quantity"].",". - $_POST["subtype"].",".$_POST["costcenter"].")"; - } - //print_r($insert); - $result = pg_exec($insert); - if ($result){ - $dcmPage->writelog($insert); - } else { - echo("<p class=\"important\">". - _("Failed to update the resource information.")."</p>"); - } - - } elseif($_REQUEST["action"] == "update") { - if (($_REQUEST["table"]=="Material")&&($_POST["subtype"]>100)|| - ($_REQUEST["table"]=="Staff")||($_REQUEST["table"]=="Equipment")){ - $update = "update ".$_REQUEST["table"]." set maintenanceoid = ". - $_REQUEST["WorkorderID"].",costcenter=".$_POST["costcenter"]. - ",unit = ".$_POST["quantity"].",subtype =". $_POST["subtype"]. - " where id = ".$_REQUEST["id"]; - } else { - $update = "update ".$_REQUEST["table"]." set maintenanceoid = ". - $_REQUEST["WorkorderID"].",costcenter=".$_POST["costcenter"]. - ",unit = ".$_POST["quantity"].",subtype =". $_POST["subtype"]. - ",diameter =". $_POST["Diameter"]. - " where id = ".$_REQUEST["id"]; - } - // TODO: check result - $result = pg_exec($update); - if ($result){ - $dcmPage->writelog($update); - } else { - echo("<p class=\"important\">". - _("Failed to update the resource information.")."</p>"); - } - } - } else { ?> - <p class="important"><?= _("Incorrect data entry.") ?></p><?php - - } - -} elseif (($_REQUEST["action"]=="delete")) { - - $delete = "delete from ".$_REQUEST["table"]." where maintenanceoid = ". - $_REQUEST["WorkorderID"]. - "and id = ".$_REQUEST["id"]; - - //TODO: check result - $result = pg_exec($delete); - if ($result){ - $dcmPage->writelog($delete); - } else { - echo("<p class=\"important\">". - _("Failed to delete the resource information.")."</p>"); - } -} - -if(array_key_exists("table", $_REQUEST)) { ?> - <h2><?= _($_REQUEST["table"]) ?></h2> - <p><?php - $arrTables = array("Staff", "Equipment", "Material", "Seal"); - foreach($arrTables as $strTable) { - if($_REQUEST["table"] != $strTable) { ?><a href="<?php - if ($strTable =="Seal"){ - echo ("seal.php"); - } else { - echo ("resource.php"); - } - ?>?<?php - if($strTable=="Seal") { - echo ("action=queryrecord&"); - } ?>table=<?= $strTable ?>&PHPSESSID=<?= session_id() - ?>&WorkorderID=<?php - if((array_key_exists("WorkorderID", $_REQUEST)&& - ($_REQUEST["WorkorderID"]!=""))) { - echo ($_REQUEST["WorkorderID"]); - } else{ - echo ($_POST["WorkorderID"]); - } - ?>"><?php - } - echo(_($strTable)); - $_SESSION["table"]=$_REQUEST["table"]; - if($_REQUEST["table"] != $strTable) { - echo("</a>"); - } - echo(" "); - } - echo("</p>"); - if (array_key_exists("WorkorderID", $_REQUEST)) { - $strAction="insert"; - switch ($_REQUEST["action"]){ - case "confirmdelete": - $strAction="delete"; - break; - case "query": - $strAction="update"; - break; - } - echo("<form name=\"resourceupdate\" action=\"resource.php?table=". - $_REQUEST["table"]. - "&action=".$strAction."&WorkorderID=".$_REQUEST["WorkorderID"]. - "&id=".$_REQUEST["id"]."&PHPSESSID=".session_id()."\" method=\"POST\">"); - echo("<table summary=\"Staff information\">"); - $query = "select subtype, description from ".$_REQUEST["table"]."subtype"; - $result = pg_exec($query); - $arrSubtype = array(); - while($arrRow = pg_fetch_row($result)) { - array_push($arrSubtype, $arrRow); - } - $arrQuery = array(); - - if(($_REQUEST["action"] == "query")|| - ($_REQUEST["action"] == "confirmdelete")) { - $query = "select * from ".$_REQUEST["table"]." where ID=".$_REQUEST["id"]; - $result = pg_exec($query); - $arrQuery = pg_fetch_array($result); - } - $dcmPage->printSelect("subtype", $arrSubtype, $arrQuery, - _("Select the type of")." "._($_REQUEST["table"]), "", - "setUnit(this.value)"); - if(($_REQUEST["table"]=="Staff")||($_REQUEST["table"]=="Equipment")) { - $dcmPage->printTextInput("quantity", $arrQuery, 0, - _("Insert the quantity used."), "Working hours"); - } else { - if($_REQUEST["table"] == "Material") { - $dcmPage->printTextInput("unit", $arrQuery, "undefined", - _("The material unit."), "","", true, true); - } - $dcmPage->printTextInput("quantity", $arrQuery, 0, - _("Insert the quantity used.")); - } - if ($_REQUEST["table"]=="Material"){ - $query = "select codedvalue,description from DiameterDomain"; - $result = pg_exec($query); - $arrResult = array(); - while($arrRow = pg_fetch_row($result)) { - array_push($arrResult, $arrRow); - } - $dcmPage->printSelect("Diameter", $arrResult, $arrQuery, - _("Select the pipe diameter.")); - } - $query = "select CostCenter, ".substr($_SESSION["language"],0,2). - "Description from CostCenter"; - - $result = pg_exec($query); - $arrCostCenter = array(); - while($arrRow = pg_fetch_row($result)) { - array_push($arrCostCenter, $arrRow); - } - $dcmPage->printSelect("costcenter", $arrCostCenter, $arrQuery, - _("Select the costcenter.")); - ?><input type="hidden" name="WorkorderID" value="<?= - $_REQUEST["WorkorderID"] ?>" /> - <?php - echo("</table></table>");?> - <button type="submit" name="submit"><?php - switch ($_REQUEST["action"]){ - case "query": - echo(_("Update")); - break; - case "confirmdelete": - echo (_("Delete")); - break; - default: - echo (_("Save")); - break; - } - ?></button></form><?php - - $strWhere = $_REQUEST["table"].".maintenanceoid = ". - $_REQUEST["WorkorderID"]." "; - - $strFrom = $_REQUEST["table"].' left outer join '.$_REQUEST['table']. - 'Subtype on '.$_REQUEST['table'].'.Subtype = '.$_REQUEST['table']. - 'Subtype.Subtype '; - if('Material' == $_REQUEST['table']) { - $strFrom = $strFrom." left outer join DiameterDomain on ". - "DiameterDomain.CodedValue = Material.Diameter"; - } - $query = 'select count('.$_REQUEST['table'].'.*) from '.$strFrom." where ". - $strWhere; - //echo($query); - $result = pg_exec($query); - $arrRow = pg_fetch_array($result, 0); - $params['totalItems'] = $arrRow[0]; - $params['perPage'] = 10; - $params['nextImg'] = _('Next >>'); - $params['prevImg'] = _('<< Back'); - $pager =& Pager::factory($params); - $data = $pager->getPageData(); - $links = $pager->getLinks(); - list($from, $to) = $pager->getOffsetByPageId(); - - $query = "select ".$_REQUEST["table"].".id, ".$_REQUEST["table"].".id, ". - $_REQUEST["table"].".id, ". - $_REQUEST["table"]."subtype.description as Description,"; - - if ($_REQUEST["table"] == "Material"){ - $query = $query." coalesce(DiameterDomain.Description, '') as diameter, "; - } - $query = $query.$_REQUEST["table"].".unit as quantity, ". - $_REQUEST["table"]."subtype.unit , ". - $_REQUEST["table"].".costcenter from "; - $query = $query.$strFrom. - " where ". - $strWhere. " limit ".$params['perPage']. " offset ".($from-1) ; - //echo($query); - if($_REQUEST["action"] != "confirmdelete") { - $dcmPage->printTable($_REQUEST["table"], $query, array("Edit" => "resource.php?WorkorderID=". - $_REQUEST["WorkorderID"]."&PHPSESSID=".session_id()."&table=".$_REQUEST["table"]. - "&action=query&id=","Delete" => "resource.php?WorkorderID=". - $_REQUEST["WorkorderID"]."&PHPSESSID=".session_id()."&table=".$_REQUEST["table"]. - "&action=confirmdelete&id=")); ?> - <p><?= sprintf(_("Displaying [%s - %s] of %s"), $from, $to, - $pager->_totalItems) ?> </p> - <p><?= $links["back"]." ".$links["pages"]." ".$links["next"] ?></p> <?php - } - } -} - -$dcmPage->footer("$Date$Empty"); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 17:31:23
|
Revision: 1119 Author: sdteffen Date: 2006-08-11 10:31:07 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1119&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/resource_report.php Removed Paths: ------------- branches/ms4w/dcmms/resource_report.php Copied: branches/ms4w/dcmms/htdocs/resource_report.php (from rev 1118, branches/ms4w/dcmms/resource_report.php) =================================================================== --- branches/ms4w/dcmms/htdocs/resource_report.php (rev 0) +++ branches/ms4w/dcmms/htdocs/resource_report.php 2006-08-11 17:31:07 UTC (rev 1119) @@ -0,0 +1,207 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * resource_report.php - Report on resources used + * + * Copyright (C) 2003, 2004 DORSCH Consult, NGWA + * Copyright (C) 2006 DORSCH Consult + * + * 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +require_once('include/dcmmspage.php'); +require_once('include/dcmmspear.php'); +require_once('include/dcmmspostgis.php'); +require_once('HTML/QuickForm.php'); +require_once("HTML/QuickForm/select.php"); +require_once("HTML/QuickForm/text.php"); + +$dcmPage = new DcmmsPage(_('Resource Report')); +$dcmPage->setIconImage('documents.png'); +$dcmPage->setPageName(basename(__FILE__)); + +$form = new HTML_QuickForm('ResourceReportForm'); +$form->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + >*</span><span style="font-size:80%;">'. + _('denotes required field').'</span>'); + +$dcmPage->add('<img class="org_logo_report" src="'.$_SESSION['OrgLogoSmall']. + '" border="0" alt="Organization Logo" />'); +$dcmPage->add('<p>'.sprintf( + _('A DCMMS %sReport%s summarizing resource usage for a period of time.') + ,'<a href="reports.php">','</a>').'</p>'); + +$strQuery = "select ". + $dcmPage->postgis->localize('Name', 'AdministrativeArea'). + ", CodedValue from AdministrativeArea"; +$selArea = new HTML_QuickForm_select("AdministrativeArea", + _("Administrative Area:")); +$selArea->addOption(_('[Select One]'), 0); +$selArea->loadQuery($dcmPage->postgis->db, $strQuery); +$form->addElement($selArea); +$form->addElement(new HTML_QuickForm_text("StartDate", _("Start Date:")), + array("maxlength" => 16)); +$form->addElement(new HTML_QuickForm_text("EndDate", _("End Date:")), + array("maxlength" => 16)); +$form->addElement("submit", null, _("Create Report")); +/** + * Default values + */ +$form->setDefaults(array("StartDate" => $dcmPage->getTimestamp(0,1), + "EndDate" => $dcmPage->getTimestamp())); + +/** + * Validate input. + */ +$form->applyFilter("StartDate", "trim"); +$form->applyFilter("EndDate", "trim"); +$form->addRule("AdministrativeArea", + _("Please select the administrative area."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("StartDate", + _("Please enter the start date."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("EndDate", + _("Please enter the end date."), "required", + null, $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("StartDate", + _("Start date has to be entered in the following format: 2004-08-21 21:30."), + "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", + $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("EndDate", + _("End date has to be entered in the following format: 2004-08-21 21:30."), + "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", + $_SESSION["strHtmlQuickFormValidation"]); +/** + * \todo date validation + */ +$dcmPage->add($form->toHtml()); + +/** + * Handle request + */ +if($form->validate()) { + /** + * Restrict queries to administrative area if necessary. + */ + $strWhere = ''; + if(0 != $form->exportValue('AdministrativeArea')) { + $strWhere = ' and Workorder.AdministrativeArea = '. + $form->exportValue('AdministrativeArea'); + } + $strQuery = "select costcenter.endescription as costcenter, + materialsubtype.description as type,diameterdomain.description as diameter, + sum(material.unit) as totalcount, materialsubtype.unit as quantity, + sum(material.unit)*materialcost.cost as price from + costcenter,materialsubtype,workorder, DiameterDomain, Material + left outer join MaterialCost on + MaterialCost.Subtype = Material.Subtype + where + workorder.id = material.maintenanceoid and + material.costcenter = costcenter.costcenter and + material.subtype = materialsubtype.subtype + and material.diameter=diameterdomain.codedvalue ". + "and workorder.receiveddate > '".$form->exportValue('StartDate'). + "' and workorder.receiveddate < '".$form->exportValue('EndDate').'\''. + $strWhere. + " group by + costcenter.endescription,material.subtype,materialsubtype.description, + diameterdomain.description,materialsubtype.unit,materialcost.cost + order by costcenter,diameter"; + $dcmPage->add('<h2>'._('Material').'</h2>'); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $objTable->gettextColumn(1); + $objTable->gettextColumn(2); + $objTable->gettextColumn(4); + $dcmPage->add($objTable->toHtml()); + + $strQuery = "select costcenter.endescription as costcenter, + equipmentsubtype.description as type + ,sum(equipment.unit) as totalCount,equipmentsubtype.unit as unit from + equipment,costcenter, EquipmentSubtype, + workorder where equipment.costcenter = costcenter.costcenter and + equipment.subtype = equipmentsubtype.subtype and workorder.id = + equipment.maintenanceoid ". + "and workorder.receiveddate > '".$form->exportValue('StartDate'). + "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'". + $strWhere. + " group by costcenter.endescription, + equipmentsubtype.description,equipmentsubtype.unit order by totalcount"; + $dcmPage->add('<h2>'._('Equipment').'</h2>'); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $objTable->gettextColumn(1); + $objTable->gettextColumn(3); + $dcmPage->add($objTable->toHtml()); + + $strQuery = "select costcenter.endescription as costcenter,". + "staffsubtype.description". + " as type,sum(staff.unit) as totalCount,staffsubtype.unit as unit from ". + "staff,costcenter,workorder, StaffSubtype where + staff.costcenter = costcenter.costcenter ". + "and staff.subtype = staffsubtype.subtype and ". + "workorder.id = staff.maintenanceoid ". + "and workorder.receiveddate > '".$form->exportValue('StartDate'). + "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'".$strWhere. + " group by costcenter.endescription, staffsubtype.description,". + "staffsubtype.unit order by costcenter,totalcount"; + $dcmPage->add('<h2>'._('Staff').'</h2>'); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $objTable->gettextColumn(1); + $objTable->gettextColumn(3); + $dcmPage->add($objTable->toHtml()); + + /** + * Excavation information. + */ + $strQuery = "select costcenter.endescription as costcenter,". + "materialsubtype.description". + " as type,sum(material.unit) as totalCount,materialsubtype.unit as unit ". + "from material,costcenter,workorder, MaterialSubtype where ". + "material.costcenter = costcenter.costcenter and material.subtype =". + "materialsubtype.subtype and workorder.id = material.maintenanceoid ". + "and workorder.receiveddate > '".$form->exportValue('StartDate'). + "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'". + " and material.subtype > 100 ".$strWhere. + " group by costcenter.endescription, materialsubtype.description,". + "materialsubtype.unit order by costcenter,totalcount"; + $dcmPage->add('<h2>'._('Excavation').'</h2>'); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $objTable->gettextColumn(1); + $objTable->gettextColumn(3); + $dcmPage->add($objTable->toHtml()); + + /** + * Calculate cost. + */ + $strQuery = "select sum(material.unit*materialcost.cost) as Price from + material,materialsubtype,workorder,materialcost where + workorder.id = material.maintenanceoid and + material.subtype = materialsubtype.subtype and + material.subtype = materialcost.subtype ". + "and workorder.receiveddate > '".$form->exportValue('StartDate'). + "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'";//. + $dcmPage->add('<h2>'._('Total Material Price').'</h2>'); + $objTable = new DbTable($dcmPage->postgis->db, $strQuery); + $objTable->addRows(); + $dcmPage->add($objTable->toHtml()); +} +$dcmPage->setCvsDate("$Date$Empty"); +echo($dcmPage->toHtml()); + +?> Deleted: branches/ms4w/dcmms/resource_report.php =================================================================== --- branches/ms4w/dcmms/resource_report.php 2006-08-11 16:06:53 UTC (rev 1118) +++ branches/ms4w/dcmms/resource_report.php 2006-08-11 17:31:07 UTC (rev 1119) @@ -1,207 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * resource_report.php - Report on resources used - * - * Copyright (C) 2003, 2004 DORSCH Consult, NGWA - * Copyright (C) 2006 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once('include/dcmmspage.php'); -require_once('include/dcmmspear.php'); -require_once('include/dcmmspostgis.php'); -require_once('HTML/QuickForm.php'); -require_once("HTML/QuickForm/select.php"); -require_once("HTML/QuickForm/text.php"); - -$dcmPage = new DcmmsPage(_('Resource Report')); -$dcmPage->setIconImage('documents.png'); -$dcmPage->setPageName(basename(__FILE__)); - -$form = new HTML_QuickForm('ResourceReportForm'); -$form->setRequiredNote('<span style="font-size:80%; color:#ff0000;" - >*</span><span style="font-size:80%;">'. - _('denotes required field').'</span>'); - -$dcmPage->add('<img class="org_logo_report" src="'.$_SESSION['OrgLogoSmall']. - '" border="0" alt="Organization Logo" />'); -$dcmPage->add('<p>'.sprintf( - _('A DCMMS %sReport%s summarizing resource usage for a period of time.') - ,'<a href="reports.php">','</a>').'</p>'); - -$strQuery = "select ". - $dcmPage->postgis->localize('Name', 'AdministrativeArea'). - ", CodedValue from AdministrativeArea"; -$selArea = new HTML_QuickForm_select("AdministrativeArea", - _("Administrative Area:")); -$selArea->addOption(_('[Select One]'), 0); -$selArea->loadQuery($dcmPage->postgis->db, $strQuery); -$form->addElement($selArea); -$form->addElement(new HTML_QuickForm_text("StartDate", _("Start Date:")), - array("maxlength" => 16)); -$form->addElement(new HTML_QuickForm_text("EndDate", _("End Date:")), - array("maxlength" => 16)); -$form->addElement("submit", null, _("Create Report")); -/** - * Default values - */ -$form->setDefaults(array("StartDate" => $dcmPage->getTimestamp(0,1), - "EndDate" => $dcmPage->getTimestamp())); - -/** - * Validate input. - */ -$form->applyFilter("StartDate", "trim"); -$form->applyFilter("EndDate", "trim"); -$form->addRule("AdministrativeArea", - _("Please select the administrative area."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Please enter the start date."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("Please enter the end date."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Start date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("End date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -/** - * \todo date validation - */ -$dcmPage->add($form->toHtml()); - -/** - * Handle request - */ -if($form->validate()) { - /** - * Restrict queries to administrative area if necessary. - */ - $strWhere = ''; - if(0 != $form->exportValue('AdministrativeArea')) { - $strWhere = ' and Workorder.AdministrativeArea = '. - $form->exportValue('AdministrativeArea'); - } - $strQuery = "select costcenter.endescription as costcenter, - materialsubtype.description as type,diameterdomain.description as diameter, - sum(material.unit) as totalcount, materialsubtype.unit as quantity, - sum(material.unit)*materialcost.cost as price from - costcenter,materialsubtype,workorder, DiameterDomain, Material - left outer join MaterialCost on - MaterialCost.Subtype = Material.Subtype - where - workorder.id = material.maintenanceoid and - material.costcenter = costcenter.costcenter and - material.subtype = materialsubtype.subtype - and material.diameter=diameterdomain.codedvalue ". - "and workorder.receiveddate > '".$form->exportValue('StartDate'). - "' and workorder.receiveddate < '".$form->exportValue('EndDate').'\''. - $strWhere. - " group by - costcenter.endescription,material.subtype,materialsubtype.description, - diameterdomain.description,materialsubtype.unit,materialcost.cost - order by costcenter,diameter"; - $dcmPage->add('<h2>'._('Material').'</h2>'); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $objTable->gettextColumn(1); - $objTable->gettextColumn(2); - $objTable->gettextColumn(4); - $dcmPage->add($objTable->toHtml()); - - $strQuery = "select costcenter.endescription as costcenter, - equipmentsubtype.description as type - ,sum(equipment.unit) as totalCount,equipmentsubtype.unit as unit from - equipment,costcenter, EquipmentSubtype, - workorder where equipment.costcenter = costcenter.costcenter and - equipment.subtype = equipmentsubtype.subtype and workorder.id = - equipment.maintenanceoid ". - "and workorder.receiveddate > '".$form->exportValue('StartDate'). - "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'". - $strWhere. - " group by costcenter.endescription, - equipmentsubtype.description,equipmentsubtype.unit order by totalcount"; - $dcmPage->add('<h2>'._('Equipment').'</h2>'); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $objTable->gettextColumn(1); - $objTable->gettextColumn(3); - $dcmPage->add($objTable->toHtml()); - - $strQuery = "select costcenter.endescription as costcenter,". - "staffsubtype.description". - " as type,sum(staff.unit) as totalCount,staffsubtype.unit as unit from ". - "staff,costcenter,workorder, StaffSubtype where - staff.costcenter = costcenter.costcenter ". - "and staff.subtype = staffsubtype.subtype and ". - "workorder.id = staff.maintenanceoid ". - "and workorder.receiveddate > '".$form->exportValue('StartDate'). - "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'".$strWhere. - " group by costcenter.endescription, staffsubtype.description,". - "staffsubtype.unit order by costcenter,totalcount"; - $dcmPage->add('<h2>'._('Staff').'</h2>'); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $objTable->gettextColumn(1); - $objTable->gettextColumn(3); - $dcmPage->add($objTable->toHtml()); - - /** - * Excavation information. - */ - $strQuery = "select costcenter.endescription as costcenter,". - "materialsubtype.description". - " as type,sum(material.unit) as totalCount,materialsubtype.unit as unit ". - "from material,costcenter,workorder, MaterialSubtype where ". - "material.costcenter = costcenter.costcenter and material.subtype =". - "materialsubtype.subtype and workorder.id = material.maintenanceoid ". - "and workorder.receiveddate > '".$form->exportValue('StartDate'). - "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'". - " and material.subtype > 100 ".$strWhere. - " group by costcenter.endescription, materialsubtype.description,". - "materialsubtype.unit order by costcenter,totalcount"; - $dcmPage->add('<h2>'._('Excavation').'</h2>'); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $objTable->gettextColumn(1); - $objTable->gettextColumn(3); - $dcmPage->add($objTable->toHtml()); - - /** - * Calculate cost. - */ - $strQuery = "select sum(material.unit*materialcost.cost) as Price from - material,materialsubtype,workorder,materialcost where - workorder.id = material.maintenanceoid and - material.subtype = materialsubtype.subtype and - material.subtype = materialcost.subtype ". - "and workorder.receiveddate > '".$form->exportValue('StartDate'). - "' and workorder.receiveddate < '".$form->exportValue('EndDate')."'";//. - $dcmPage->add('<h2>'._('Total Material Price').'</h2>'); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $dcmPage->add($objTable->toHtml()); -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); - -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 17:32:52
|
Revision: 1120 Author: sdteffen Date: 2006-08-11 10:32:38 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1120&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/response_time_report.php Removed Paths: ------------- branches/ms4w/dcmms/response_time_report.php Copied: branches/ms4w/dcmms/htdocs/response_time_report.php (from rev 1119, branches/ms4w/dcmms/response_time_report.php) =================================================================== --- branches/ms4w/dcmms/htdocs/response_time_report.php (rev 0) +++ branches/ms4w/dcmms/htdocs/response_time_report.php 2006-08-11 17:32:38 UTC (rev 1120) @@ -0,0 +1,76 @@ +<?php +/* DCMMS -- DC Maintenance Management System + * + * response_time_report.php - Report on workorder response time + * + * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA + * Copyright (C) 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ +/** + * \todo Copy interval localisation code from aging_report.php when + * reimplementing using PEAR HTML_Table. + */ +@include("include/header.php"); +include("include/dcmpostgis.php"); + +$dcmPage = new DcmPage(basename(__FILE__)); +$dcmPage->header(_("Response Time Report"),TRUE,"","documents.png"); +echo("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. + "\" border=\"0\" alt=\"Organization Logo\" />"); +echo("<p>".sprintf( + _("A DCMMS %sReport%s on the maintenance team response time.") + ,"<a href=\"reports.php\">","</a>")."</p>"); ?> + +<form name="responsetime" action="response_time_report.php?PHPSESSID=<?= + session_id()?>" method="POST"> + <table summary="date_selection"> <?php + $dcmPage->printTextInput("FromDate", $_POST,$dcmPage->getTimeStamp("","",1), + _("Insert the report period starting date.")); + $dcmPage->printTextInput("ToDate", $_POST,$dcmPage->getTimeStamp(), + _("Insert the report period ending date.")); ?> +</table> +<input type="submit" name="submit" value="<?=_("Create Report")?>" + title="<?= _('Click this button to create the report.')?>" /> +</form> <? +if((array_key_exists("FromDate",$_POST))&&(array_key_exists("ToDate", + $_POST))&&($_POST["FromDate"]!="")&&($_POST["ToDate"]!="")) { + $query = "select ".pg_localize('Name', 'AdministrativeArea')." as ". + "AdministrativeAreaDescription, ".pg_localize("Description", "Team"). + " as team, ". + "avg(Maintenance.CompletionDate-workorder.receiveddate) as responsetime,". + " count(maintenance.id) as count from workorder, maintenance, team left outer join AdministrativeArea on". + " AdministrativeArea.CodedValue = Team.AdministrativeArea ". + " where workorder.receiveddate > '".$_POST["FromDate"]. + "' and workorder.receiveddate < '".$_POST["ToDate"]."'". + " and workorder.id = maintenance.id". + " and maintenance.team = team.codedvalue group by ". + pg_localize('Name', 'AdministrativeArea').", ". + pg_localize("Description", "Team"); ?> + <h2><?= sprintf(_("Period from %s to %s"), $_POST["FromDate"], + $_POST["ToDate"]) ?></h2> <?php + echo (_("The average response time is:")); + $dcmPage->printTable("response", $query); +} else { + $query="select avg(Maintenance.CompletionDate - Workorder.ReceivedDate) from ". + "Workorder, Maintenance where Workorder.ID = Maintenance.ID"; + $result=pg_exec($query); + $row=pg_fetch_row($result); ?> + <h2><?= _("Querying all DCMMS records") ?></h2> + <p><?= sprintf(_("The average response time is %s minutes."), $row[0]); + ?></p> <?php +} +$dcmPage->footer("$Date$Empty"); ?> Deleted: branches/ms4w/dcmms/response_time_report.php =================================================================== --- branches/ms4w/dcmms/response_time_report.php 2006-08-11 17:31:07 UTC (rev 1119) +++ branches/ms4w/dcmms/response_time_report.php 2006-08-11 17:32:38 UTC (rev 1120) @@ -1,76 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * response_time_report.php - Report on workorder response time - * - * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ -/** - * \todo Copy interval localisation code from aging_report.php when - * reimplementing using PEAR HTML_Table. - */ -@include("include/header.php"); -include("include/dcmpostgis.php"); - -$dcmPage = new DcmPage(basename(__FILE__)); -$dcmPage->header(_("Response Time Report"),TRUE,"","documents.png"); -echo("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. - "\" border=\"0\" alt=\"Organization Logo\" />"); -echo("<p>".sprintf( - _("A DCMMS %sReport%s on the maintenance team response time.") - ,"<a href=\"reports.php\">","</a>")."</p>"); ?> - -<form name="responsetime" action="response_time_report.php?PHPSESSID=<?= - session_id()?>" method="POST"> - <table summary="date_selection"> <?php - $dcmPage->printTextInput("FromDate", $_POST,$dcmPage->getTimeStamp("","",1), - _("Insert the report period starting date.")); - $dcmPage->printTextInput("ToDate", $_POST,$dcmPage->getTimeStamp(), - _("Insert the report period ending date.")); ?> -</table> -<input type="submit" name="submit" value="<?=_("Create Report")?>" - title="<?= _('Click this button to create the report.')?>" /> -</form> <? -if((array_key_exists("FromDate",$_POST))&&(array_key_exists("ToDate", - $_POST))&&($_POST["FromDate"]!="")&&($_POST["ToDate"]!="")) { - $query = "select ".pg_localize('Name', 'AdministrativeArea')." as ". - "AdministrativeAreaDescription, ".pg_localize("Description", "Team"). - " as team, ". - "avg(Maintenance.CompletionDate-workorder.receiveddate) as responsetime,". - " count(maintenance.id) as count from workorder, maintenance, team left outer join AdministrativeArea on". - " AdministrativeArea.CodedValue = Team.AdministrativeArea ". - " where workorder.receiveddate > '".$_POST["FromDate"]. - "' and workorder.receiveddate < '".$_POST["ToDate"]."'". - " and workorder.id = maintenance.id". - " and maintenance.team = team.codedvalue group by ". - pg_localize('Name', 'AdministrativeArea').", ". - pg_localize("Description", "Team"); ?> - <h2><?= sprintf(_("Period from %s to %s"), $_POST["FromDate"], - $_POST["ToDate"]) ?></h2> <?php - echo (_("The average response time is:")); - $dcmPage->printTable("response", $query); -} else { - $query="select avg(Maintenance.CompletionDate - Workorder.ReceivedDate) from ". - "Workorder, Maintenance where Workorder.ID = Maintenance.ID"; - $result=pg_exec($query); - $row=pg_fetch_row($result); ?> - <h2><?= _("Querying all DCMMS records") ?></h2> - <p><?= sprintf(_("The average response time is %s minutes."), $row[0]); - ?></p> <?php -} -$dcmPage->footer("$Date$Empty"); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 17:42:26
|
Revision: 1127 Author: sdteffen Date: 2006-08-11 10:40:25 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1127&view=rev Log Message: ----------- Restructuring, removing <?=, switching to PEAR File_Archive. Modified Paths: -------------- branches/ms4w/dcmms/htdocs/logon.php branches/ms4w/dcmms/include/header.php Added Paths: ----------- branches/ms4w/dcmms/htdocs/images/ branches/ms4w/dcmms/htdocs/images/about.png branches/ms4w/dcmms/htdocs/images/accept_area_of_interest.png branches/ms4w/dcmms/htdocs/images/administration-32.png branches/ms4w/dcmms/htdocs/images/area_of_interest_center.png branches/ms4w/dcmms/htdocs/images/area_of_interest_radius.png branches/ms4w/dcmms/htdocs/images/backup.png branches/ms4w/dcmms/htdocs/images/calendar.png branches/ms4w/dcmms/htdocs/images/config-language.png branches/ms4w/dcmms/htdocs/images/dc.png branches/ms4w/dcmms/htdocs/images/dcmms-install.ico branches/ms4w/dcmms/htdocs/images/dcmms-uninstall.ico branches/ms4w/dcmms/htdocs/images/dcmms.ico branches/ms4w/dcmms/htdocs/images/dcmms.png branches/ms4w/dcmms/htdocs/images/dcmms_icon_16.png branches/ms4w/dcmms/htdocs/images/dcmms_keymap.png branches/ms4w/dcmms/htdocs/images/dcmms_logo.dia branches/ms4w/dcmms/htdocs/images/dcmms_logo.xcf branches/ms4w/dcmms/htdocs/images/dcmms_small.png branches/ms4w/dcmms/htdocs/images/documents.png branches/ms4w/dcmms/htdocs/images/exec.png branches/ms4w/dcmms/htdocs/images/filter.png branches/ms4w/dcmms/htdocs/images/gnome-starthere.png branches/ms4w/dcmms/htdocs/images/icon_eye.gif branches/ms4w/dcmms/htdocs/images/icon_landmark.png branches/ms4w/dcmms/htdocs/images/installer-header.bmp branches/ms4w/dcmms/htdocs/images/landmark.png branches/ms4w/dcmms/htdocs/images/language.png branches/ms4w/dcmms/htdocs/images/move_landmark.png branches/ms4w/dcmms/htdocs/images/new_workorder.png branches/ms4w/dcmms/htdocs/images/ngwa.png branches/ms4w/dcmms/htdocs/images/ngwa_keymap.png branches/ms4w/dcmms/htdocs/images/ngwa_small.png branches/ms4w/dcmms/htdocs/images/purge_workorder.png branches/ms4w/dcmms/htdocs/images/remove_temporary_files.png branches/ms4w/dcmms/htdocs/images/repair.gif branches/ms4w/dcmms/htdocs/images/restore.png branches/ms4w/dcmms/htdocs/images/serviceconf-48.png branches/ms4w/dcmms/htdocs/images/sewer_network.png branches/ms4w/dcmms/htdocs/images/shapefile_dumper.png branches/ms4w/dcmms/htdocs/images/shapefile_loader.png branches/ms4w/dcmms/htdocs/images/stock-tool-move.png branches/ms4w/dcmms/htdocs/images/stock_exit-16.png branches/ms4w/dcmms/htdocs/images/stock_extended-help.png branches/ms4w/dcmms/htdocs/images/stock_help-16.png branches/ms4w/dcmms/htdocs/images/stock_refresh.png branches/ms4w/dcmms/htdocs/images/stock_search.png branches/ms4w/dcmms/htdocs/images/stock_zoom-in.png branches/ms4w/dcmms/htdocs/images/stock_zoom-out.png branches/ms4w/dcmms/htdocs/images/system-config-users-48.png branches/ms4w/dcmms/htdocs/images/team_management.png branches/ms4w/dcmms/htdocs/images/todo.png branches/ms4w/dcmms/htdocs/images/water_network.png branches/ms4w/dcmms/htdocs/images/workorder.png branches/ms4w/dcmms/htdocs/images/zoom_to_landmark.png Removed Paths: ------------- branches/ms4w/dcmms/htdocs/images/about.png branches/ms4w/dcmms/htdocs/images/accept_area_of_interest.png branches/ms4w/dcmms/htdocs/images/administration-32.png branches/ms4w/dcmms/htdocs/images/area_of_interest_center.png branches/ms4w/dcmms/htdocs/images/area_of_interest_radius.png branches/ms4w/dcmms/htdocs/images/backup.png branches/ms4w/dcmms/htdocs/images/calendar.png branches/ms4w/dcmms/htdocs/images/config-language.png branches/ms4w/dcmms/htdocs/images/dc.png branches/ms4w/dcmms/htdocs/images/dcmms-install.ico branches/ms4w/dcmms/htdocs/images/dcmms-uninstall.ico branches/ms4w/dcmms/htdocs/images/dcmms.ico branches/ms4w/dcmms/htdocs/images/dcmms.png branches/ms4w/dcmms/htdocs/images/dcmms_icon_16.png branches/ms4w/dcmms/htdocs/images/dcmms_keymap.png branches/ms4w/dcmms/htdocs/images/dcmms_logo.dia branches/ms4w/dcmms/htdocs/images/dcmms_logo.xcf branches/ms4w/dcmms/htdocs/images/dcmms_small.png branches/ms4w/dcmms/htdocs/images/documents.png branches/ms4w/dcmms/htdocs/images/exec.png branches/ms4w/dcmms/htdocs/images/filter.png branches/ms4w/dcmms/htdocs/images/gnome-starthere.png branches/ms4w/dcmms/htdocs/images/icon_eye.gif branches/ms4w/dcmms/htdocs/images/icon_landmark.png branches/ms4w/dcmms/htdocs/images/installer-header.bmp branches/ms4w/dcmms/htdocs/images/landmark.png branches/ms4w/dcmms/htdocs/images/language.png branches/ms4w/dcmms/htdocs/images/move_landmark.png branches/ms4w/dcmms/htdocs/images/new_workorder.png branches/ms4w/dcmms/htdocs/images/ngwa.png branches/ms4w/dcmms/htdocs/images/ngwa_keymap.png branches/ms4w/dcmms/htdocs/images/ngwa_small.png branches/ms4w/dcmms/htdocs/images/purge_workorder.png branches/ms4w/dcmms/htdocs/images/remove_temporary_files.png branches/ms4w/dcmms/htdocs/images/repair.gif branches/ms4w/dcmms/htdocs/images/restore.png branches/ms4w/dcmms/htdocs/images/serviceconf-48.png branches/ms4w/dcmms/htdocs/images/sewer_network.png branches/ms4w/dcmms/htdocs/images/shapefile_dumper.png branches/ms4w/dcmms/htdocs/images/shapefile_loader.png branches/ms4w/dcmms/htdocs/images/stock-tool-move.png branches/ms4w/dcmms/htdocs/images/stock_exit-16.png branches/ms4w/dcmms/htdocs/images/stock_extended-help.png branches/ms4w/dcmms/htdocs/images/stock_help-16.png branches/ms4w/dcmms/htdocs/images/stock_refresh.png branches/ms4w/dcmms/htdocs/images/stock_search.png branches/ms4w/dcmms/htdocs/images/stock_zoom-in.png branches/ms4w/dcmms/htdocs/images/stock_zoom-out.png branches/ms4w/dcmms/htdocs/images/system-config-users-48.png branches/ms4w/dcmms/htdocs/images/team_management.png branches/ms4w/dcmms/htdocs/images/todo.png branches/ms4w/dcmms/htdocs/images/water_network.png branches/ms4w/dcmms/htdocs/images/workorder.png branches/ms4w/dcmms/htdocs/images/zoom_to_landmark.png branches/ms4w/dcmms/images/ Copied: branches/ms4w/dcmms/htdocs/images (from rev 1125, branches/ms4w/dcmms/images) Deleted: branches/ms4w/dcmms/htdocs/images/about.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/about.png (from rev 1126, branches/ms4w/dcmms/images/about.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/accept_area_of_interest.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/accept_area_of_interest.png (from rev 1126, branches/ms4w/dcmms/images/accept_area_of_interest.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/administration-32.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/administration-32.png (from rev 1126, branches/ms4w/dcmms/images/administration-32.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/area_of_interest_center.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/area_of_interest_center.png (from rev 1126, branches/ms4w/dcmms/images/area_of_interest_center.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/area_of_interest_radius.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/area_of_interest_radius.png (from rev 1126, branches/ms4w/dcmms/images/area_of_interest_radius.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/backup.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/backup.png (from rev 1126, branches/ms4w/dcmms/images/backup.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/calendar.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/calendar.png (from rev 1126, branches/ms4w/dcmms/images/calendar.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/config-language.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/config-language.png (from rev 1126, branches/ms4w/dcmms/images/config-language.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dc.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dc.png (from rev 1126, branches/ms4w/dcmms/images/dc.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms-install.ico =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms-install.ico (from rev 1126, branches/ms4w/dcmms/images/dcmms-install.ico) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms-uninstall.ico =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms-uninstall.ico (from rev 1126, branches/ms4w/dcmms/images/dcmms-uninstall.ico) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms.ico =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms.ico (from rev 1126, branches/ms4w/dcmms/images/dcmms.ico) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms.png (from rev 1126, branches/ms4w/dcmms/images/dcmms.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms_icon_16.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms_icon_16.png (from rev 1126, branches/ms4w/dcmms/images/dcmms_icon_16.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms_keymap.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms_keymap.png (from rev 1126, branches/ms4w/dcmms/images/dcmms_keymap.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms_logo.dia =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms_logo.dia (from rev 1126, branches/ms4w/dcmms/images/dcmms_logo.dia) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms_logo.xcf =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms_logo.xcf (from rev 1126, branches/ms4w/dcmms/images/dcmms_logo.xcf) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/dcmms_small.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/dcmms_small.png (from rev 1126, branches/ms4w/dcmms/images/dcmms_small.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/documents.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/documents.png (from rev 1126, branches/ms4w/dcmms/images/documents.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/exec.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/exec.png (from rev 1126, branches/ms4w/dcmms/images/exec.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/filter.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/filter.png (from rev 1126, branches/ms4w/dcmms/images/filter.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/gnome-starthere.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/gnome-starthere.png (from rev 1126, branches/ms4w/dcmms/images/gnome-starthere.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/icon_eye.gif =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/icon_eye.gif (from rev 1126, branches/ms4w/dcmms/images/icon_eye.gif) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/icon_landmark.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/icon_landmark.png (from rev 1126, branches/ms4w/dcmms/images/icon_landmark.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/installer-header.bmp =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/installer-header.bmp (from rev 1126, branches/ms4w/dcmms/images/installer-header.bmp) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/landmark.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/landmark.png (from rev 1126, branches/ms4w/dcmms/images/landmark.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/language.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/language.png (from rev 1126, branches/ms4w/dcmms/images/language.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/move_landmark.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/move_landmark.png (from rev 1126, branches/ms4w/dcmms/images/move_landmark.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/new_workorder.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/new_workorder.png (from rev 1126, branches/ms4w/dcmms/images/new_workorder.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/ngwa.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/ngwa.png (from rev 1126, branches/ms4w/dcmms/images/ngwa.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/ngwa_keymap.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/ngwa_keymap.png (from rev 1126, branches/ms4w/dcmms/images/ngwa_keymap.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/ngwa_small.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/ngwa_small.png (from rev 1126, branches/ms4w/dcmms/images/ngwa_small.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/purge_workorder.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/purge_workorder.png (from rev 1126, branches/ms4w/dcmms/images/purge_workorder.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/remove_temporary_files.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/remove_temporary_files.png (from rev 1126, branches/ms4w/dcmms/images/remove_temporary_files.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/repair.gif =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/repair.gif (from rev 1126, branches/ms4w/dcmms/images/repair.gif) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/restore.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/restore.png (from rev 1126, branches/ms4w/dcmms/images/restore.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/serviceconf-48.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/serviceconf-48.png (from rev 1126, branches/ms4w/dcmms/images/serviceconf-48.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/sewer_network.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/sewer_network.png (from rev 1126, branches/ms4w/dcmms/images/sewer_network.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/shapefile_dumper.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/shapefile_dumper.png (from rev 1126, branches/ms4w/dcmms/images/shapefile_dumper.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/shapefile_loader.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/shapefile_loader.png (from rev 1126, branches/ms4w/dcmms/images/shapefile_loader.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock-tool-move.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock-tool-move.png (from rev 1126, branches/ms4w/dcmms/images/stock-tool-move.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_exit-16.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_exit-16.png (from rev 1126, branches/ms4w/dcmms/images/stock_exit-16.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_extended-help.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_extended-help.png (from rev 1126, branches/ms4w/dcmms/images/stock_extended-help.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_help-16.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_help-16.png (from rev 1126, branches/ms4w/dcmms/images/stock_help-16.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_refresh.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_refresh.png (from rev 1126, branches/ms4w/dcmms/images/stock_refresh.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_search.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_search.png (from rev 1126, branches/ms4w/dcmms/images/stock_search.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_zoom-in.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_zoom-in.png (from rev 1126, branches/ms4w/dcmms/images/stock_zoom-in.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/stock_zoom-out.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/stock_zoom-out.png (from rev 1126, branches/ms4w/dcmms/images/stock_zoom-out.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/system-config-users-48.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/system-config-users-48.png (from rev 1126, branches/ms4w/dcmms/images/system-config-users-48.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/team_management.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/team_management.png (from rev 1126, branches/ms4w/dcmms/images/team_management.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/todo.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/todo.png (from rev 1126, branches/ms4w/dcmms/images/todo.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/water_network.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/water_network.png (from rev 1126, branches/ms4w/dcmms/images/water_network.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/workorder.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/workorder.png (from rev 1126, branches/ms4w/dcmms/images/workorder.png) =================================================================== (Binary files differ) Deleted: branches/ms4w/dcmms/htdocs/images/zoom_to_landmark.png =================================================================== (Binary files differ) Copied: branches/ms4w/dcmms/htdocs/images/zoom_to_landmark.png (from rev 1126, branches/ms4w/dcmms/images/zoom_to_landmark.png) =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/htdocs/logon.php =================================================================== --- branches/ms4w/dcmms/htdocs/logon.php 2006-08-11 17:37:26 UTC (rev 1126) +++ branches/ms4w/dcmms/htdocs/logon.php 2006-08-11 17:40:25 UTC (rev 1127) @@ -38,7 +38,7 @@ /** * Perform startup checks to make sure that the installation is complete. */ -$arrExtensions = array("MapScript", "gettext", "zip", "pgsql", "gd"); +$arrExtensions = array("MapScript", "gettext", "pgsql", "gd"); foreach($arrExtensions as $strExtension) { if(!extension_loaded($strExtension)) { @@ -53,24 +53,24 @@ 'DB_DataObject_FormBuilder' => 'DB/DataObject/FormBuilder.php', 'Image_Graph' => 'Image/Graph.php'); foreach($arrPearFiles as $strPearPackage => $strPearInclude) { - require_once($strPearInclude); + require_once $strPearInclude ; } -$arrConfigurationFiles = array('include/dcmconfig.php', 'conf/dataobject.ini', - 'conf/identifyplugin.ini'); +$arrConfigurationFiles = array('../include/dcmconfig.php', '../conf/dataobject.ini', + '../conf/identifyplugin.ini'); foreach($arrConfigurationFiles as $strConfigurationFile) { if(!file_exists($strConfigurationFile)) { die(sprintf(_('FATAL ERROR: Configuration file "%s" is missing.'), $strConfigurationFile)); } -} +} if(array_key_exists("action", $_REQUEST)) { switch($_REQUEST["action"]) { case "logon_failure" : $strMessage = $strMessage._("Logon failed."); break; case "database_down" : - @include_once("include/header.php"); + include '../include/header.php'; $strMessage = $strMessage. sprintf(_("Could not connect to database '%s'."), $_SESSION["strDataBase"])." ". @@ -91,7 +91,7 @@ session_id()); exit(); } - include("include/dcmpostgis.php"); + include '../include/dcmpostgis.php'; // check for PostGIS $strQuery = "select x(GeometryFromText('POINT(1 1)',-1))"; @$result = pg_query($strQuery); @@ -103,7 +103,9 @@ } else { $strMessage = $strMessage._("PostGIS is not installed."); } - // check for fuzzystrmatch + /** + * Check for fuzzystrmatch in PostgreSQL. + */ $strQuery = "select levenshtein('test','test')"; @$result = pg_query($strQuery); if($result) { @@ -184,16 +186,16 @@ } } -require_once("include/header.php"); +require_once '../include/header.php'; $dcmPage = new DcmPage(basename(__FILE__)); $dcmPage->header(_("Logon to DCMMS")); if($strMessage != "") { - echo("<p class=\"important\">".$strMessage."</p>"); + echo "<p class=\"important\">".$strMessage."</p>"; } echo("<p>"._("Please login to the DC Maintenance Management System.")."</p>"); ?> -<form name="login" method="post" action="logon.php?action=login<?= $strWebtest +<form name="login" method="post" action="logon.php?action=login<?php $strWebtest ?>"> <table summary="login"> <?php $dcmPage->printTextInput("UserName", $_POST, "", Modified: branches/ms4w/dcmms/include/header.php =================================================================== --- branches/ms4w/dcmms/include/header.php 2006-08-11 17:37:26 UTC (rev 1126) +++ branches/ms4w/dcmms/include/header.php 2006-08-11 17:40:25 UTC (rev 1127) @@ -63,7 +63,7 @@ bindtextdomain("dcmms", $strPathInDcmms."locale"); bind_textdomain_codeset ("dcmms","UTF-8"); textdomain("dcmms"); -require_once($strPathInDcmms."include/dcmconfig.php"); +require_once $strPathInDcmms."/../include/dcmconfig.php"; //Enable logging function require_once("Log.php"); @@ -123,10 +123,10 @@ } } ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml" lang="<?= $_SESSION["language"]?>"> + <html xmlns="http://www.w3.org/1999/xhtml" lang="<?php echo $_SESSION["language"]?>"> <head> <title><?php echo(_($title)) ?></title> - <link rel="stylesheet" href="<?= $strPathInDcmms + <link rel="stylesheet" href="<?php echo $strPathInDcmms ?>dcmms.css" type="text/css"/> <link rel="stylesheet" href="<?php echo($strPathInDcmms); @@ -135,9 +135,9 @@ } else { echo("ltr"); } ?>.css" type="text/css"/> - <link rel="shortcut icon" href="<?= $strPathInDcmms?>images/dcmms.ico" /> + <link rel="shortcut icon" href="<?php echo $strPathInDcmms?>images/dcmms.ico" /> <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> - <?= $strScript ?> + <?php echo $strScript ?> </head> <body dir="<?php if(strncmp($_SESSION['language'], 'ar', 2) == 0) { echo("rtl"); @@ -201,7 +201,7 @@ if(!isset($_SESSION['language'])) { $_SESSION['language'] = 'en'; } - $dirName = $strPathInDcmms.'locale'; + $dirName = $strPathInDcmms.'/../locale'; $d = dir($dirName); while($entry = $d->read()) { if($entry != '.' && $entry != '..' && $entry != 'CVS' && @@ -248,8 +248,9 @@ '; echo($strHtml); if($boolH1) { ?> - <h1><img alt="DCMMS" src="<?= $strPathInDcmms ?>images/<?= $strImage ?>" - /><?= _($title); ?></h1><?php + <h1><img alt="DCMMS" src="<?php echo $strPathInDcmms + ?>images/<?php echo $strImage ?>" + /><?php echo _($title); ?></h1><?php } } @@ -257,8 +258,8 @@ function footer($cvsdate) { GLOBAL $strPathInDcmms; ?> <div id="footer"> - <?= _("Copyright (c) 2003-2006 DORSCH Consult, NGWA"); ?> - <?php echo($cvsdate); ?> + <?php echo _('Copyright (c) 2003-2006 DORSCH Consult, NGWA'); ?> + <?php echo $cvsdate; ?> </div> </body> </html> <?php @@ -279,22 +280,22 @@ $strLabel = "") { ?> <tr><td class="label"><?php if($strHelp != "") {?> - <a name="#" title="<?= $strHelp ?>"><?php + <a name="#" title="<?php echo $strHelp ?>"><?php } else {?> - <a name="#" title="<?= _("Please choose the")." "._($strName)." ". + <a name="#" title="<?php echo _("Please choose the")." "._($strName)." ". _("from the list") ?>"><?php } - ?><?= $strLabel == "" ? _($strName) : $strLabel ?> + ?><?php echo $strLabel == "" ? _($strName) : $strLabel ?> </a></td><td class="input"><?php if($strHelp != "") {?> - <a name="#" title="<?= $strHelp ?>"><?php + <a name="#" title="<?php echo $strHelp ?>"><?php } ?> - <select name="<?= $strName ?>" <?= $boolDisabled ? "disabled=\"disabled\"": - "" ?> onChange="<?= $onClick ?>"><?php + <select name="<?php echo $strName; ?>" <?php + echo $boolDisabled ? "disabled=\"disabled\"" : "" ?> onChange="<?php echo $onClick; ?>"><?php if($boolHasSelectOne) { ?> - <option value="0"><?= _("[Select One]") ?></option><?php + <option value="0"><?php echo _("[Select One]") ?></option><?php } foreach($arrValues as $row) { if(($row[0] != 0)||(!is_numeric($row[0]))) { @@ -343,19 +344,19 @@ </td><td class="input"> <?php if ($strType != ""){?> - <input dir="<?= $boolLtr ? "ltr": "rtl" ?>" type=<?= $strType - ?> name="<?php echo("$strName");?>" value="<?php + <input dir="<?php echo $boolLtr ? "ltr": "rtl" ?>" type=<?php echo $strType + ?> name="<?php $strName; ?>" value="<?php } else {?> - <input dir="<?= $boolLtr ? "ltr": "rtl" ?>" type="text" name="<?= - $strName ?>" value="<?php + <input dir="<?php echo $boolLtr ? "ltr": "rtl" ?>" type="text" name="<?php + echo $strName ?>" value="<?php } if((array_key_exists(strtolower($strName), $arrRecord))&& ($arrRecord[strtolower($strName)] != "")) { echo($arrRecord[strtolower($strName)]); } else { echo($strValue); - }?>" <?= $boolDisabled ? "disabled=\"disabled\"": "" ?> - title="<?= $strHelp ?>" /> + }?>" <?php echo $boolDisabled ? "disabled=\"disabled\"": "" ?> + title="<?php echo $strHelp ?>" /> </td> </tr> <?php } @@ -368,16 +369,17 @@ // strLabel is the optional label function printCheckbox($strName, $arrValue = array(), $strHelp = "", $strLabel = "") { ?> - <tr><td class="label"> </td><td class="input"><input type="checkbox" name="<?= $strName - ?>" value="<?= $strName ?>" <?php + <tr><td class="label"> </td><td class="input"><input type="checkbox" + name="<?php echo $strName + ?>" value="<?php echo $strName ?>" <?php if(array_key_exists($strName, $arrValue) && ($arrValue[$strName] == $strName)) { ?> checked="checked" <?php } ?>/><?php if($strHelp != "") {?> - <a name="#" title="<?= $strHelp ?>"><?php + <a name="#" title="<?php echo $strHelp ?>"><?php } else {?> - <a name="#" title="<?= _("Please insert the")." "._($strName)." ". + <a name="#" title="<?php echo _("Please insert the")." "._($strName)." ". _("to the text box") ?>"><?php } if($strLabel != ""){ @@ -415,7 +417,7 @@ $result = pg_exec($strQuery); $numFields = pg_numfields($result); ?> - <table summary="<?= $strName ?>" class="<?= $strCssClass ?>"> + <table summary="<?php echo $strName ?>" class="<?php echo $strCssClass ?>"> <tr><?php $numActions = count($arrActions); for($i = $numActions; $i < $numFields; $i++) { @@ -447,12 +449,12 @@ echo("<a href=\"".$arrActions[$j].$arrRow[$j]."\" title=\"".$strHelp."\">". _($arrActionKeys[$j])."</a> "); } else { ?> - <a href="<?= $arrActions[$j].$arrRow[$j]?>" title="<? + <a href="<?php echo $arrActions[$j].$arrRow[$j]?>" title="<? if ($arrActionKeys[$j]!="View"){ echo (_("Please click the link to go to the ")._($arrActionKeys[$j])); } else { echo (_("Please click the link to View related information ")); - } ?>"><?= _($arrActionKeys[$j]) ?></a> <?php + } ?>"><?php echo _($arrActionKeys[$j]) ?></a> <?php } } echo("</td>"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 18:52:27
|
Revision: 1128 Author: sdteffen Date: 2006-08-11 11:52:12 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1128&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/ltr.css Removed Paths: ------------- branches/ms4w/dcmms/ltr.css Copied: branches/ms4w/dcmms/htdocs/ltr.css (from rev 1127, branches/ms4w/dcmms/ltr.css) =================================================================== --- branches/ms4w/dcmms/htdocs/ltr.css (rev 0) +++ branches/ms4w/dcmms/htdocs/ltr.css 2006-08-11 18:52:12 UTC (rev 1128) @@ -0,0 +1,81 @@ +.copyright { + right: 1.5em; + text-align: right; + position: absolute; + top: 0px; + vertical-align: top; +} + +.copyright a { + top: 0px; + vertical-align: top; +} + +.mainpage { + left: 1.5em; + text-align: left; + position: absolute; + top: 0px; + vertical-align: top; +} + +.dateinput { + text-align: left; +} + + +.tab_one_panel { + margin-right: 2em; +} + +div#contentright a img {height: 0px; width: 0px; border-width: 0px; } +div#contentright a:hover img {position: relative; top: -10px; height: 48px; + width: 48px;} +div#contentright a:hover { border-left: 1px; } +div#contentright a span {display: none; } +div#contentright a:hover span {display: block; + position: absolute; top: -12em; left: -15em; width: 20em; + color: black; background: white; + font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } +div#contentright { position: absolute; top: 0px; left: 1em; margin-top: 22em; + margin-left: 30em; } + +div#contentleft a img {height: 0px; width: 0px; border-width: 0px; } +div#contentleft a:hover img {position: relative; top: -10px; height: 48px; + width: 48px;} +div#contentleft a:hover { border-left: 1px; } +div#contentleft a span {display: none; } +div#contentleft a:hover span {display: block; + position: absolute; top: -12em; left: 30em; width: 20em; + color: black; background: white; + font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } +div#contentleft { position:absolute; top: 0px; left: 0px; margin-top: 22em; + margin-left: 0em; } + +ul#indexlist a img {height: 0px; width: 0px; border-width: 0px;} +ul#indexlist a:hover img {position: relative; top: -10px; height: 48px; + width: 48px;} +ul#indexlist a:hover { border-left: 1px; } +ul#indexlist a span {display: none;} +ul#indexlist a:hover span {display: block; + position: absolute; top: 17em; left: 30em; width: 20em; + color: black; background: white; + font: 10px Verdana, sans-serif; text-align: center; text-decoration: none;} + +.org_logo_report { position:absolute; right: 1px; top: 1.7em; } + +.navigationstart { + left: 0.1em; + top: 0px; + text-align: left; + position: absolute; + line-height: 1.0em; +} + +.navigationend { + text-align: right; + position: absolute; + right: 0.1em; + top: 0px; + line-height: 1.0em; +} Deleted: branches/ms4w/dcmms/ltr.css =================================================================== --- branches/ms4w/dcmms/ltr.css 2006-08-11 17:40:25 UTC (rev 1127) +++ branches/ms4w/dcmms/ltr.css 2006-08-11 18:52:12 UTC (rev 1128) @@ -1,81 +0,0 @@ -.copyright { - right: 1.5em; - text-align: right; - position: absolute; - top: 0px; - vertical-align: top; -} - -.copyright a { - top: 0px; - vertical-align: top; -} - -.mainpage { - left: 1.5em; - text-align: left; - position: absolute; - top: 0px; - vertical-align: top; -} - -.dateinput { - text-align: left; -} - - -.tab_one_panel { - margin-right: 2em; -} - -div#contentright a img {height: 0px; width: 0px; border-width: 0px; } -div#contentright a:hover img {position: relative; top: -10px; height: 48px; - width: 48px;} -div#contentright a:hover { border-left: 1px; } -div#contentright a span {display: none; } -div#contentright a:hover span {display: block; - position: absolute; top: -12em; left: -15em; width: 20em; - color: black; background: white; - font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } -div#contentright { position: absolute; top: 0px; left: 1em; margin-top: 22em; - margin-left: 30em; } - -div#contentleft a img {height: 0px; width: 0px; border-width: 0px; } -div#contentleft a:hover img {position: relative; top: -10px; height: 48px; - width: 48px;} -div#contentleft a:hover { border-left: 1px; } -div#contentleft a span {display: none; } -div#contentleft a:hover span {display: block; - position: absolute; top: -12em; left: 30em; width: 20em; - color: black; background: white; - font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } -div#contentleft { position:absolute; top: 0px; left: 0px; margin-top: 22em; - margin-left: 0em; } - -ul#indexlist a img {height: 0px; width: 0px; border-width: 0px;} -ul#indexlist a:hover img {position: relative; top: -10px; height: 48px; - width: 48px;} -ul#indexlist a:hover { border-left: 1px; } -ul#indexlist a span {display: none;} -ul#indexlist a:hover span {display: block; - position: absolute; top: 17em; left: 30em; width: 20em; - color: black; background: white; - font: 10px Verdana, sans-serif; text-align: center; text-decoration: none;} - -.org_logo_report { position:absolute; right: 1px; top: 1.7em; } - -.navigationstart { - left: 0.1em; - top: 0px; - text-align: left; - position: absolute; - line-height: 1.0em; -} - -.navigationend { - text-align: right; - position: absolute; - right: 0.1em; - top: 0px; - line-height: 1.0em; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 18:53:40
|
Revision: 1129 Author: sdteffen Date: 2006-08-11 11:53:27 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1129&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/rtl.css Removed Paths: ------------- branches/ms4w/dcmms/rtl.css Copied: branches/ms4w/dcmms/htdocs/rtl.css (from rev 1128, branches/ms4w/dcmms/rtl.css) =================================================================== --- branches/ms4w/dcmms/htdocs/rtl.css (rev 0) +++ branches/ms4w/dcmms/htdocs/rtl.css 2006-08-11 18:53:27 UTC (rev 1129) @@ -0,0 +1,85 @@ +.copyright { + left: 1.5em; + text-align: left; + position: absolute; + top: 0px; + vertical-align: top; +} + +.copyright a { + top: 0px; + vertical-align: top; +} + +.mainpage { + right: 1.5em; + text-align: right; + position: absolute; + top: 0px; + vertical-align: top; +} + +li { + padding-right: 1em; +} + +.dateinput { + text-align: right; +} + +.tab_one_panel { + margin-left: 2em; +} + + +div#contentright a img {height: 0px; width: 0px; border-width: 0px; } +div#contentright a:hover img {position: relative; top: -10px; height: 48px; + width: 48px;} +div#contentright a:hover { border-right: 1px; } +div#contentright a span {display: none; } +div#contentright a:hover span {display: block; + position: absolute; top: -12em; right: -15em; width: 20em; + color: black; background: white; + font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } +div#contentright { position: absolute; top: 0px; right: 1px; margin-top: 22em; + margin-right: 30em; } + +div#contentleft a img {height: 0px; width: 0px; border-width: 0px; } +div#contentleft a:hover img {position: relative; top: -10px; height: 48px; + width: 48px;} +div#contentleft a:hover { border-right: 1px; } +div#contentleft a span {display: none; } +div#contentleft a:hover span {display: block; + position: absolute; top: -12em; right: 30em; width: 20em; + color: black; background: white; + font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } +div#contentleft { position:absolute; top: 0px; right: 0px; margin-top: 22em; + margin-right: 0em; } + +ul#indexlist a img {height: 0px; width: 0px; border-width: 0px;} +ul#indexlist a:hover img {position: relative; top: -10px; height: 48px; + width: 48px;} +ul#indexlist a:hover { border-right: 1px; } +ul#indexlist a span {display: none;} +ul#indexlist a:hover span {display: block; + position: absolute; top: 17em; right: 30em; width: 20em; + color: black; background: white; + font: 10px Verdana, sans-serif; text-align: center; text-decoration: none;} + +.org_logo_report { position:absolute; left: 1px; top: 1.7em; } + +.navigationend { + left: 0.1em; + top: 0px; + text-align: left; + position: absolute; + line-height: 1.0em; +} + +.navigationstart { + text-align: right; + position: absolute; + right: 0.1em; + top: 0px; + line-height: 1.0em; +} Deleted: branches/ms4w/dcmms/rtl.css =================================================================== --- branches/ms4w/dcmms/rtl.css 2006-08-11 18:52:12 UTC (rev 1128) +++ branches/ms4w/dcmms/rtl.css 2006-08-11 18:53:27 UTC (rev 1129) @@ -1,85 +0,0 @@ -.copyright { - left: 1.5em; - text-align: left; - position: absolute; - top: 0px; - vertical-align: top; -} - -.copyright a { - top: 0px; - vertical-align: top; -} - -.mainpage { - right: 1.5em; - text-align: right; - position: absolute; - top: 0px; - vertical-align: top; -} - -li { - padding-right: 1em; -} - -.dateinput { - text-align: right; -} - -.tab_one_panel { - margin-left: 2em; -} - - -div#contentright a img {height: 0px; width: 0px; border-width: 0px; } -div#contentright a:hover img {position: relative; top: -10px; height: 48px; - width: 48px;} -div#contentright a:hover { border-right: 1px; } -div#contentright a span {display: none; } -div#contentright a:hover span {display: block; - position: absolute; top: -12em; right: -15em; width: 20em; - color: black; background: white; - font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } -div#contentright { position: absolute; top: 0px; right: 1px; margin-top: 22em; - margin-right: 30em; } - -div#contentleft a img {height: 0px; width: 0px; border-width: 0px; } -div#contentleft a:hover img {position: relative; top: -10px; height: 48px; - width: 48px;} -div#contentleft a:hover { border-right: 1px; } -div#contentleft a span {display: none; } -div#contentleft a:hover span {display: block; - position: absolute; top: -12em; right: 30em; width: 20em; - color: black; background: white; - font: 10px Verdana, sans-serif; text-align: center; text-decoration: none; } -div#contentleft { position:absolute; top: 0px; right: 0px; margin-top: 22em; - margin-right: 0em; } - -ul#indexlist a img {height: 0px; width: 0px; border-width: 0px;} -ul#indexlist a:hover img {position: relative; top: -10px; height: 48px; - width: 48px;} -ul#indexlist a:hover { border-right: 1px; } -ul#indexlist a span {display: none;} -ul#indexlist a:hover span {display: block; - position: absolute; top: 17em; right: 30em; width: 20em; - color: black; background: white; - font: 10px Verdana, sans-serif; text-align: center; text-decoration: none;} - -.org_logo_report { position:absolute; left: 1px; top: 1.7em; } - -.navigationend { - left: 0.1em; - top: 0px; - text-align: left; - position: absolute; - line-height: 1.0em; -} - -.navigationstart { - text-align: right; - position: absolute; - right: 0.1em; - top: 0px; - line-height: 1.0em; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 18:55:02
|
Revision: 1130 Author: sdteffen Date: 2006-08-11 11:54:53 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1130&view=rev Log Message: ----------- These files are not required any more. Removed Paths: ------------- branches/ms4w/dcmms/ngwa.map branches/ms4w/dcmms/sample.map Deleted: branches/ms4w/dcmms/ngwa.map =================================================================== --- branches/ms4w/dcmms/ngwa.map 2006-08-11 18:53:27 UTC (rev 1129) +++ branches/ms4w/dcmms/ngwa.map 2006-08-11 18:54:53 UTC (rev 1130) @@ -1,398 +0,0 @@ -# -# DCMMS map file -# -# $Id$ -# -NAME DCMMS -STATUS ON -SIZE 400 300 -SYMBOLSET etc/symbols.sym -EXTENT 200000 127000 555000 310000 -UNITS METERS -SHAPEPATH "c:/program files/dcmms/data" -IMAGECOLOR 255 255 255 -FONTSET etc/fonts.txt -IMAGETYPE PNG - -# -# Start of web interface definition -# -WEB - MINSCALE 20 - MAXSCALE 500000000 -# -# On Windows systems, /tmp and /tmp/ms_tmp/ should be created at the root -# of the drive where the .MAP file resides. -# - IMAGEPATH "/tmp/ms_tmp/" - IMAGEURL "/ms_tmp/" -# LOG "/tmp/gmap.log" -END - -# -# Start of reference map -# -REFERENCE - IMAGE images/ngwa_keymap.png - EXTENT 203000 127000 555000 310000 - STATUS ON - COLOR -1 -1 -1 - OUTLINECOLOR 255 0 0 - SIZE 120 66 -END - -# -# Start of legend -# -LEGEND - KEYSIZE 18 12 - LABEL - TYPE BITMAP - SIZE MEDIUM - COLOR 0 0 89 - END - STATUS ON -END - -# -# Start of scalebar -# -# Scalebar -SCALEBAR - IMAGECOLOR 255 255 255 - LABEL - COLOR 0 0 0 - SIZE SMALL - END - SIZE 150 5 - COLOR 0 0 0 - BACKGROUNDCOLOR -1 -1 -1 - OUTLINECOLOR 0 0 0 - UNITS kilometers - INTERVALS 5 - STATUS EMBED -END - - -QUERYMAP - STYLE HILITE - COLOR 255 255 0 -END - -# Layers - -layer - CONNECTIONTYPE postgis - - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from administrativearea" - - type polygon - status default - minscale 15000 - labelitem "endescript" - class - color 255 255 200 - name 'Irbid' - expression ([ADMINISTRA] = 6) - outlinecolor 0 0 0 - end - class - color 200 255 255 - name 'Bani Kinana' - expression ([ADMINISTRA] = 3) - outlinecolor 0 0 0 - end - class - color 255 200 200 - name 'Ramtha' - expression ([ADMINISTRA] = 4) - outlinecolor 0 0 0 - end - class - color 255 255 220 - name 'Irbid West' - expression ([ADMINISTRA] = 7) - outlinecolor 0 0 0 - end - class - color 200 200 200 - name 'North Shouna' - expression ([ADMINISTRA] = 5) - outlinecolor 0 0 0 - end - class - color 255 200 255 - name 'Ajloun' - outlinecolor 0 0 0 - expression ([ADMINISTRA] = 11) - end - class - color 255 155 150 - name 'Badia' - outlinecolor 0 0 0 - expression ([ADMINISTRA] = 2) - end - class - color 200 255 200 - name 'Mafraq' - outlinecolor 0 0 0 - expression ([ADMINISTRA] = 10) - end - class - color 255 150 150 - name 'Jerash' - outlinecolor 0 0 0 - expression ([ADMINISTRA] = 12) - end - class - color 150 155 150 - name 'Al-Koura' - outlinecolor 0 0 0 - expression ([ADMINISTRA] = 9) - end - class - color 150 150 255 - name 'Bani Ubaid' - outlinecolor 0 0 0 - expression ([ADMINISTRA] = 8) - end -end - -layer - name "AdministrativeAreaLabel" - CONNECTIONTYPE postgis - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from administrativearea" - - type polygon - status default - minscale 15000 - labelitem "endescript" - CLASS - NAME 'Label' - label - color 0 0 0 - position auto - font arial - type truetype - size 10 - end - END -end - - -layer - tileindex "lot_line_index" - type line - status default - class - name 'lot' - color 170 170 170 - end - maxscale 25000 - tolerance 0 -end - -LAYER - maxscale 10000 - labelmaxscale 2000 - tileindex "gravitymain_index" - NAME gravitymain - METADATA - "DESCRIPTION" "Gravitymain" - "RESULT_FIELDS" "" - END - TYPE LINE - STATUS ON - #LABELITEM "diameter" - CLASS - NAME "sewer" - template "ttt_query.html" - SIZE 2 - symbol "circle" - COLOR 170 120 0 - overlaysymbol "arrow" - overlaycolor 170 120 0 - overlaysize 8 - label - color 170 120 0 - position auto - end - END - TOLERANCE 15 -END # Layer - -LAYER - NAME pressurizedmain - tileindex "pressurizedmain_index" - TYPE Line - STATUS ON - maxscale 20000 - labelmaxscale 5000 - labelitem "DIAMETER" - - CLASS - NAME 'Pressurizedmain' - - #template "ttt_query.html" - SYMBOL "circle" - SIZE 2 - COLOR 0 0 255 - label - color 0 0 0 - position auto - font arial - type truetype - size 10 - end - END - - METADATA - "DESCRIPTION" "water" - "RESULT_FIELDS" "diameter length" - END - TOLERANCE 5 -END # Layer - -LAYER - CONNECTIONTYPE postgis - NAME Village - TYPE POLYGON - STATUS on - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from village" - labelmaxscale 100000 - labelitem "EnDescript" - transparency 100 - CLASS - NAME 'Village' - template "ttt_query.html" - SYMBOL "circle" - SIZE 2 - OUTLINECOLOR 150 150 150 - label - color 0 0 0 - position auto - font arial - type truetype - size 15 - end - END - - METADATA - "DESCRIPTION" "Village" - #"RESULT_FIELDS" "the_geom" - "RESULT_FIELDS" "endescript" - END - TOLERANCE 5 -END # Village Layer - - -# LandMark Layer -LAYER - CONNECTIONTYPE postgis - NAME Landmark - maxscale 15000 - TYPE POINT - STATUS DEFAULT - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from landmark" - labelitem "enLocation" - CLASS - NAME 'LandMark' - template "ttt_query.html" - SYMBOL "circle" - SIZE 6 - color 0 150 0 - label - color 0 150 0 - position uc - font arial - type truetype - size 15 - end - END - - METADATA - "DESCRIPTION" "LandMark" - "RESULT_FIELDS" "arlocation" - END - TOLERANCE 15 -END # Layer - -# AreaOfInterest Layer -LAYER - CONNECTIONTYPE postgis - NAME AreaOfInterest - #maxscale 15000 - TYPE POLYGON - STATUS OFF - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "areaofinterest from workorder" - filter "id = -1" - CLASS - NAME 'AreaOfInterest' - #template "ttt_query.html" - SYMBOL "circle" - SIZE 1 - color 255 255 0 - outlinecolor 255 255 0 - END - METADATA - "DESCRIPTION" "AreaOfInterest" - "RESULT_FIELDS" "" - END - TOLERANCE 15 -END # Layer - -# Empty layer, used for AreaOfInterest center points -layer - connectiontype PostGIS - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - name "center" - type POINT - status OFF - DATA "the_geom from center" - CLASS - NAME "Center Point" - #template "ttt_query.html" - SYMBOL "circle" - SIZE 8 - color 0 0 0 - outlinecolor 255 255 255 - END - METADATA - "DESCRIPTION" "Center Point" - "RESULT_FIELDS" "" - END - TOLERANCE 15 -END # Layer - -# Maintenance Layer -LAYER - CONNECTIONTYPE postgis - NAME Maintenance - TYPE POINT - STATUS ON - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "shape from maintenance" - - CLASS - NAME 'Maintenance' - template "ttt_query.html" - SYMBOL "circle" - SIZE 6 - color 255 0 0 - - END - - METADATA - "DESCRIPTION" "Maintenance" - "RESULT_FIELDS" "ID" - END - TOLERANCE 15 -END # Layer - -END # Map File - Deleted: branches/ms4w/dcmms/sample.map =================================================================== --- branches/ms4w/dcmms/sample.map 2006-08-11 18:53:27 UTC (rev 1129) +++ branches/ms4w/dcmms/sample.map 2006-08-11 18:54:53 UTC (rev 1130) @@ -1,332 +0,0 @@ -# -# DCMMS map file -# -# $Id$ -# -NAME DCMMS -STATUS ON -SIZE 400 300 -SYMBOLSET etc/symbols.sym -EXTENT 214600 200230 218000 202835 -UNITS METERS -SHAPEPATH "c:/program files/dcmms/data/" -IMAGECOLOR 255 255 255 -FONTSET etc/fonts.txt -IMAGETYPE PNG - -# Web interface definition -WEB - MINSCALE 20 - MAXSCALE 500000000 - IMAGEPATH "/tmp/ms_tmp/" - IMAGEURL "/ms_tmp/" -END - -# Reference map -REFERENCE - IMAGE images/dcmms_keymap.png - EXTENT 214578 200220 218073 202836 - STATUS ON - COLOR -1 -1 -1 - OUTLINECOLOR 255 0 0 - SIZE 120 90 -END - -# Legend -LEGEND - KEYSIZE 18 12 - LABEL - TYPE BITMAP - SIZE MEDIUM - COLOR 0 0 89 - END - STATUS ON -END - -# Scalebar -SCALEBAR - IMAGECOLOR 255 255 255 - LABEL - COLOR 0 0 0 - SIZE SMALL - END - SIZE 150 5 - COLOR 0 0 0 - BACKGROUNDCOLOR -1 -1 -1 - OUTLINECOLOR 0 0 0 - UNITS kilometers - INTERVALS 5 - STATUS EMBED -END - -#Querymap -QUERYMAP - STYLE HILITE - COLOR 255 255 0 -END - -# Layers - -# AdministrativeArea -layer - CONNECTIONTYPE postgis - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from administrativearea" - type polygon - status default - minscale 15000 - labelitem "endescript" - class - color 255 255 200 - name 'West Sector' - expression ([CODEDVALUE] = 1) - outlinecolor 0 0 0 - end - class - color 200 255 255 - name 'North Sector' - expression ([CODEDVALUE] = 2) - outlinecolor 0 0 0 - end - class - color 255 200 200 - name 'South Sector' - expression ([CODEDVALUE] = 3) - outlinecolor 0 0 0 - end - METADATA - "DESCRIPTION" "AdministrativeArea" - "RESULT_FIELDS" "endescript" - END -end - -#AdministrativeArea Label -layer - name "AdministrativeAreaLabel" - CONNECTIONTYPE postgis - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from administrativearea" - type polygon - status off - minscale 15000 - labelitem "endescript" - CLASS - NAME 'Label' - label - color 0 0 0 - position auto - font arial - type truetype - size 10 - end - END -end - -# Basemap -layer - data "c:/program files/dcmms/data/basemap" - type line - status default - class - template "ttt_query.html" - name "Basemap" - color 170 170 170 - end - maxscale 20000 - tolerance 1 - METADATA - "DESCRIPTION" "Basemap" - "RESULT_FIELDS" "AREA" - END -end - -LAYER - maxscale 10000 - labelmaxscale 2000 - data "c:/program files/dcmms/data/sewer/gravitymain" - NAME gravitymain - METADATA - "DESCRIPTION" "Gravitymain" - "RESULT_FIELDS" "DIAMETER" - END - TYPE LINE - STATUS ON - #LABELITEM "diameter" - CLASS - NAME "sewer" - template "ttt_query.html" - SIZE 2 - symbol "circle" - COLOR 170 120 0 - overlaysymbol "arrow" - overlaycolor 170 120 0 - overlaysize 8 - label - color 170 120 0 - position auto - end - END - TOLERANCE 15 -END # Layer - -LAYER - NAME pressurizedmain - data "c:/program files/dcmms/data/water/pressurizedmain" - TYPE Line - STATUS ON - maxscale 20000 - labelmaxscale 5000 - labelitem "DIAMETER" - CLASS - NAME 'Pressurizedmain' - template "ttt_query.html" - SYMBOL "circle" - SIZE 2 - COLOR 0 0 255 - label - color 0 0 0 - position auto - font arial - type truetype - size 10 - end - END - METADATA - "DESCRIPTION" "Water Network" - "RESULT_FIELDS" "DIAMETER" - END - TOLERANCE 5 -END - -LAYER - CONNECTIONTYPE postgis - NAME Village - TYPE POLYGON - STATUS on - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from village" - labelmaxscale 10 - labelitem "EnDescript" - transparency 100 - CLASS - NAME 'Village' - template "ttt_query.html" - SYMBOL "circle" - SIZE 2 - OUTLINECOLOR 150 150 150 - label - color 0 0 0 - position auto - font arial - type truetype - size 15 - end - END - - METADATA - "DESCRIPTION" "Village" - "RESULT_FIELDS" "gid endescript" - END - TOLERANCE 5 -END # Village Layer - - -# LandMark Layer -LAYER - CONNECTIONTYPE postgis - NAME Landmark - maxscale 15000 - TYPE POINT - STATUS DEFAULT - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from landmarkview using SRID=-1" - labelitem "enLocation" - CLASS - NAME 'LandMark' - template "ttt_query.html" - SYMBOL "square" - SIZE 12 - color 0 150 0 - label - color 38 119 38 - position uc - font arial - type truetype - size 15 - end - END - METADATA - "DESCRIPTION" "Landmark" - "RESULT_FIELDS" "id type enlocation arlocation frlocation" - END - TOLERANCE 15 -END # Layer - -# AreaOfInterest -LAYER - CONNECTIONTYPE postgis - NAME AreaOfInterest - maxscale 15000 - TYPE POLYGON - STATUS OFF - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "areaofinterest from workorder" - filter "id = -1" - CLASS - NAME 'AreaOfInterest' - #template "ttt_query.html" - SYMBOL "circle" - SIZE 1 - color 255 255 0 - outlinecolor 255 255 0 - END - TOLERANCE 15 -END # Layer - -# Empty layer, used for AreaOfInterest center points -layer - connectiontype PostGIS - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - name "center" - type POINT - status OFF - DATA "the_geom from center" - CLASS - NAME "Center Point" - #template "ttt_query.html" - SYMBOL "circle" - SIZE 8 - color 0 0 0 - outlinecolor 255 255 255 - END - METADATA - "DESCRIPTION" "Center Point" - "RESULT_FIELDS" "" - END - TOLERANCE 15 -END - -# Maintenance Layer -LAYER - CONNECTIONTYPE postgis - NAME Maintenance - TYPE POINT - STATUS ON - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "shape from maintenance" - CLASS - NAME "Maintenance" - template "ttt_query.html" - SYMBOL "square" - SIZE 8 - color 223 66 30 - END - METADATA - "DESCRIPTION" "Maintenance" - "RESULT_FIELDS" "id note" - END - TOLERANCE 15 -END - -END # Map File - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 18:59:28
|
Revision: 1131 Author: sdteffen Date: 2006-08-11 11:59:12 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1131&view=rev Log Message: ----------- Moved remotely Added Paths: ----------- branches/ms4w/dcmms/htdocs/zoom.php Removed Paths: ------------- branches/ms4w/dcmms/zoom.php Copied: branches/ms4w/dcmms/htdocs/zoom.php (from rev 1130, branches/ms4w/dcmms/zoom.php) =================================================================== --- branches/ms4w/dcmms/htdocs/zoom.php (rev 0) +++ branches/ms4w/dcmms/htdocs/zoom.php 2006-08-11 18:59:12 UTC (rev 1131) @@ -0,0 +1,207 @@ +<?php +/** + * DCMMS -- DC Maintenance Management System + * + * zoom.php - zoom to landmarks + * + * Copyright (C) 2005 DORSCH Consult + * Copyright (C) 2006 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 + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +/** + * \todo AJAX implementation of search. + */ + +require_once('include/dcmmspage.php'); +require_once('include/dcmpostgis.php'); +require_once('include/dcmmspear.php'); +require_once('HTML/QuickForm.php'); +require_once('HTML/QuickForm/select.php'); + +$dcmPage = new DcmmsPage(_('Find a Landmark')); +$dcmPage->setIconImage('zoom_to_landmark.png'); +$dcmPage->setPageName(basename(__FILE__)); + +if(isset($_REQUEST['message'])) { + $strMessage = urldecode($_REQUEST['message']); + $dcmPage->addMessage($strMessage); +} + +$objForm = new HTML_QuickForm('ZoomForm'); +$objForm->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + >*</span><span style="font-size:80%;"> '. + _('denotes required field').'</span>'); + +$objDb =& $dcmPage->postgis->db; + +$objArea =& $objForm->addElement('hierselect', 'area', 'Area:', + array('title' => _('Narrow down the area in which to search for points of interest.'))); +$strQuery = 'select dcmmstranslation(\''.$_SESSION['language']. + '\',Name), CodedValue from AdministrativeArea'; +$arrAdministrativeArea[0] = _('[Select One]'); +$objResult =& $objDb->query($strQuery); +if(DB::isError($objResult)) { + die($objResult->getMessage()); +} +while($arrRow =& $objResult->fetchRow()) { + $arrAdministrativeArea[$arrRow[1]] = $arrRow[0]; +} +$strQuery = 'select dcmmstranslation(\''.$_SESSION['language']. + '\',Name), Administra, CodedValue from Village order by Administra'; +$arrVillage[0][0] = _('[Select One]'); +$objResult =& $objDb->query($strQuery); +if(DB::isError($objResult)) { + die($objResult->getMessage); +} +$intLast = 0; +while($arrRow =& $objResult->fetchRow()) { + if($arrRow[1] != $intLast) { + $arrVillage[$arrRow[1]][0] = _('[Select One]'); + } + $arrVillage[$arrRow[1]][$arrRow[2]] = $arrRow[0]; +} +$objArea->setOptions(array($arrAdministrativeArea, $arrVillage)); + +$objSubtype =& new HTML_QuickForm_select('subtype', _('Type:'),NULL, + array('title' => _('Select the landmark type.'))); +$objSubtype->addOption(_('[Select One]'), 0); +$strQuery = 'select distinct Landmark.Subtype, LandmarkSubtype.Description + from Landmark left join LandmarkSubtype on + Landmark.Subtype = LandmarkSubtype.Subtype'; +/** + * \todo Switch to using dcmmstranslation(). + */ +$objResult =& $objDb->query($strQuery); +if(DB::isError($objResult)) { + die($objResult->getMessage); +} +while($arrRow =& $objResult->fetchRow()) { + $objSubtype->addOption(_($arrRow[1]), $arrRow[0]); +} +$objForm->addElement($objSubtype); +$objForm->addElement('text', 'name', _('Name:'), array('maxlength' => 64, + 'title' => _('The name of the point of interest or a part of it.'))); +$objFuzzy[] =& HTML_QuickForm::createElement('radio', null, null, _('Accurate'), + 0, array('title' => + _('Find points of interest that contain the name field exactly (case insensitive).'))); +$objFuzzy[] =& HTML_QuickForm::createElement('radio', null, null, _('Fuzzy'), 1, + array('title' => + _('Find landmarks that similar to the provided name. Ignore spelling mistakes.'))); +$objForm->addGroup($objFuzzy, 'fuzzy', _('Matching:')); +$objForm->addElement('submit', null, _('Select'), array('title' => + _('Search for points of interest. Click this button when all available information has been entered.'))); + +/** + * Default values + */ +$arrDefaults = array('fuzzy' => 0, 'area' => array(0, 0), 'subtype' => 0); +$objForm->setDefaults($arrDefaults); +/** + * Allow to take over values from HTTP GET request. + */ +$arrTakeover = array('name', 'subtype', 'fuzzy'); +foreach($arrTakeover as $strKey) { + if(isset($_GET[$strKey])&&(!isset($_POST[$strKey]))) { + $strName = substr(addslashes($_GET[$strKey]), 0, 128); + $objForm->setConstants(array($strKey => $strName)); + $objForm->_flagSubmitted = true; + } +} +/** + * \todo Verify that QuickForm scrutinizes this. + */ +if(isset($_GET['area'])&&(!isset($_POST['area']))) { + $objForm->_flagSubmitted = true; + $objForm->setConstants(array('area' => $_GET['area'])); +} +unset($strName); + +/** + * \todo Add validation rules. + */ +$dcmPage->add($objForm->toHtml()); +$strWhere = ' '; +$boolFuzzy = false; +/** + * Extra variables to be passed to the Pager class. + */ +$arrExtraVars = array(); +/** + * Build up the where clause. + */ + +if($objForm->validate()) { + $strName = $objForm->exportValue('name'); + $intSubtype = $objForm->exportValue('subtype'); + if(0 != $intSubtype) { + $strWhere = ' and Subtype = '.$intSubtype.' '; + } + $arrArea = $objForm->exportValue('area'); + if(0 != $arrArea[1]) { + $strWhere .= ' and Village = '.$arrArea[1].' '; + } elseif(0 != $arrArea[0]) { + $strWhere .= ' and AdministrativeArea = '.$arrArea[0].' '; + } + if(1 == $objForm->exportValue('fuzzy')) { + $boolFuzzy = true; + } + $arrExtraVars = array('subtype' => $objForm->exportValue('subtype'), + 'area[0]' => $arrArea[0], + 'area[1]' => $arrArea[1], + 'fuzzy' => $objForm->exportValue('fuzzy'), + 'name' => $strName); +} +if(isset($strName)) { + if($boolFuzzy) { + $strNameWhere = ' order by levenshtein(dcmmstranslation(\''. + $_SESSION['language'].'\', Name), \''.$strName.'\') '; + } else { + $strNameWhere = ' and (Name ilike \'%'.$strName.'%\' or + Translation ilike \'%'.$strName.'%\' ) '; + } +} +$strQuery = 'select dcmmstranslation(IsoCode, Name) as Name, "Type", + AdministrativeAreaTranslation as AdministrativeArea, + VillageTranslation as Village, GID as Action + from TranslatedLandmarkView where IsoCode = \''.$_SESSION['language'].'\' '; +$objTable =& new DbTablePager($objDb, $strQuery.$strWhere.$strNameWhere, NULL, + $arrExtraVars); +$objTable->addRows(); +/** + * Add the actions. + */ +$numRows = $objTable->getRowCount(); +if(1 == $numRows && !$boolFuzzy && isset($strName)) { + $dcmPage->addMessage( + _('Accurate search returned no results. Falling back to fuzzy search.')); + $strNameWhere = ' order by levenshtein(dcmmstranslation(\''. + $_SESSION['language'].'\', Name), \''.$strName.'\') '; + $objTable =& new DbTablePager($objDb, $strQuery.$strWhere.$strNameWhere); +} +for($i=1; $i < $numRows; $i++) { + $strId = $objTable->getCellContents($i, 4); + $objTable->setCellContents($i, 4, '<a href="landmark.php?action=map&gid='. + $strId.'">'._('Map').'</a> <a href="landmark.php?gid='.$strId.'">'. + _('Details').'</a>'); + /** + * \todo Switch to dcmmstranslation(). + */ + $objTable->setCellContents($i, 1, _($objTable->getCellContents($i, 1))); +} +$dcmPage->add($objTable->toHtml()); +$dcmPage->setCvsDate("$Date$Empty"); +echo $dcmPage->toHtml(); ?> Deleted: branches/ms4w/dcmms/zoom.php =================================================================== --- branches/ms4w/dcmms/zoom.php 2006-08-11 18:54:53 UTC (rev 1130) +++ branches/ms4w/dcmms/zoom.php 2006-08-11 18:59:12 UTC (rev 1131) @@ -1,207 +0,0 @@ -<?php -/** - * DCMMS -- DC Maintenance Management System - * - * zoom.php - zoom to landmarks - * - * Copyright (C) 2005 DORSCH Consult - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \todo AJAX implementation of search. - */ - -require_once('include/dcmmspage.php'); -require_once('include/dcmpostgis.php'); -require_once('include/dcmmspear.php'); -require_once('HTML/QuickForm.php'); -require_once('HTML/QuickForm/select.php'); - -$dcmPage = new DcmmsPage(_('Find a Landmark')); -$dcmPage->setIconImage('zoom_to_landmark.png'); -$dcmPage->setPageName(basename(__FILE__)); - -if(isset($_REQUEST['message'])) { - $strMessage = urldecode($_REQUEST['message']); - $dcmPage->addMessage($strMessage); -} - -$objForm = new HTML_QuickForm('ZoomForm'); -$objForm->setRequiredNote('<span style="font-size:80%; color:#ff0000;" - >*</span><span style="font-size:80%;"> '. - _('denotes required field').'</span>'); - -$objDb =& $dcmPage->postgis->db; - -$objArea =& $objForm->addElement('hierselect', 'area', 'Area:', - array('title' => _('Narrow down the area in which to search for points of interest.'))); -$strQuery = 'select dcmmstranslation(\''.$_SESSION['language']. - '\',Name), CodedValue from AdministrativeArea'; -$arrAdministrativeArea[0] = _('[Select One]'); -$objResult =& $objDb->query($strQuery); -if(DB::isError($objResult)) { - die($objResult->getMessage()); -} -while($arrRow =& $objResult->fetchRow()) { - $arrAdministrativeArea[$arrRow[1]] = $arrRow[0]; -} -$strQuery = 'select dcmmstranslation(\''.$_SESSION['language']. - '\',Name), Administra, CodedValue from Village order by Administra'; -$arrVillage[0][0] = _('[Select One]'); -$objResult =& $objDb->query($strQuery); -if(DB::isError($objResult)) { - die($objResult->getMessage); -} -$intLast = 0; -while($arrRow =& $objResult->fetchRow()) { - if($arrRow[1] != $intLast) { - $arrVillage[$arrRow[1]][0] = _('[Select One]'); - } - $arrVillage[$arrRow[1]][$arrRow[2]] = $arrRow[0]; -} -$objArea->setOptions(array($arrAdministrativeArea, $arrVillage)); - -$objSubtype =& new HTML_QuickForm_select('subtype', _('Type:'),NULL, - array('title' => _('Select the landmark type.'))); -$objSubtype->addOption(_('[Select One]'), 0); -$strQuery = 'select distinct Landmark.Subtype, LandmarkSubtype.Description - from Landmark left join LandmarkSubtype on - Landmark.Subtype = LandmarkSubtype.Subtype'; -/** - * \todo Switch to using dcmmstranslation(). - */ -$objResult =& $objDb->query($strQuery); -if(DB::isError($objResult)) { - die($objResult->getMessage); -} -while($arrRow =& $objResult->fetchRow()) { - $objSubtype->addOption(_($arrRow[1]), $arrRow[0]); -} -$objForm->addElement($objSubtype); -$objForm->addElement('text', 'name', _('Name:'), array('maxlength' => 64, - 'title' => _('The name of the point of interest or a part of it.'))); -$objFuzzy[] =& HTML_QuickForm::createElement('radio', null, null, _('Accurate'), - 0, array('title' => - _('Find points of interest that contain the name field exactly (case insensitive).'))); -$objFuzzy[] =& HTML_QuickForm::createElement('radio', null, null, _('Fuzzy'), 1, - array('title' => - _('Find landmarks that similar to the provided name. Ignore spelling mistakes.'))); -$objForm->addGroup($objFuzzy, 'fuzzy', _('Matching:')); -$objForm->addElement('submit', null, _('Select'), array('title' => - _('Search for points of interest. Click this button when all available information has been entered.'))); - -/** - * Default values - */ -$arrDefaults = array('fuzzy' => 0, 'area' => array(0, 0), 'subtype' => 0); -$objForm->setDefaults($arrDefaults); -/** - * Allow to take over values from HTTP GET request. - */ -$arrTakeover = array('name', 'subtype', 'fuzzy'); -foreach($arrTakeover as $strKey) { - if(isset($_GET[$strKey])&&(!isset($_POST[$strKey]))) { - $strName = substr(addslashes($_GET[$strKey]), 0, 128); - $objForm->setConstants(array($strKey => $strName)); - $objForm->_flagSubmitted = true; - } -} -/** - * \todo Verify that QuickForm scrutinizes this. - */ -if(isset($_GET['area'])&&(!isset($_POST['area']))) { - $objForm->_flagSubmitted = true; - $objForm->setConstants(array('area' => $_GET['area'])); -} -unset($strName); - -/** - * \todo Add validation rules. - */ -$dcmPage->add($objForm->toHtml()); -$strWhere = ' '; -$boolFuzzy = false; -/** - * Extra variables to be passed to the Pager class. - */ -$arrExtraVars = array(); -/** - * Build up the where clause. - */ - -if($objForm->validate()) { - $strName = $objForm->exportValue('name'); - $intSubtype = $objForm->exportValue('subtype'); - if(0 != $intSubtype) { - $strWhere = ' and Subtype = '.$intSubtype.' '; - } - $arrArea = $objForm->exportValue('area'); - if(0 != $arrArea[1]) { - $strWhere .= ' and Village = '.$arrArea[1].' '; - } elseif(0 != $arrArea[0]) { - $strWhere .= ' and AdministrativeArea = '.$arrArea[0].' '; - } - if(1 == $objForm->exportValue('fuzzy')) { - $boolFuzzy = true; - } - $arrExtraVars = array('subtype' => $objForm->exportValue('subtype'), - 'area[0]' => $arrArea[0], - 'area[1]' => $arrArea[1], - 'fuzzy' => $objForm->exportValue('fuzzy'), - 'name' => $strName); -} -if(isset($strName)) { - if($boolFuzzy) { - $strNameWhere = ' order by levenshtein(dcmmstranslation(\''. - $_SESSION['language'].'\', Name), \''.$strName.'\') '; - } else { - $strNameWhere = ' and (Name ilike \'%'.$strName.'%\' or - Translation ilike \'%'.$strName.'%\' ) '; - } -} -$strQuery = 'select dcmmstranslation(IsoCode, Name) as Name, "Type", - AdministrativeAreaTranslation as AdministrativeArea, - VillageTranslation as Village, GID as Action - from TranslatedLandmarkView where IsoCode = \''.$_SESSION['language'].'\' '; -$objTable =& new DbTablePager($objDb, $strQuery.$strWhere.$strNameWhere, NULL, - $arrExtraVars); -$objTable->addRows(); -/** - * Add the actions. - */ -$numRows = $objTable->getRowCount(); -if(1 == $numRows && !$boolFuzzy && isset($strName)) { - $dcmPage->addMessage( - _('Accurate search returned no results. Falling back to fuzzy search.')); - $strNameWhere = ' order by levenshtein(dcmmstranslation(\''. - $_SESSION['language'].'\', Name), \''.$strName.'\') '; - $objTable =& new DbTablePager($objDb, $strQuery.$strWhere.$strNameWhere); -} -for($i=1; $i < $numRows; $i++) { - $strId = $objTable->getCellContents($i, 4); - $objTable->setCellContents($i, 4, '<a href="landmark.php?action=map&gid='. - $strId.'">'._('Map').'</a> <a href="landmark.php?gid='.$strId.'">'. - _('Details').'</a>'); - /** - * \todo Switch to dcmmstranslation(). - */ - $objTable->setCellContents($i, 1, _($objTable->getCellContents($i, 1))); -} -$dcmPage->add($objTable->toHtml()); -$dcmPage->setCvsDate("$Date$Empty"); -echo $dcmPage->toHtml(); ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 19:02:26
|
Revision: 1133 Author: sdteffen Date: 2006-08-11 12:02:14 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1133&view=rev Log Message: ----------- Removed file/folder Removed Paths: ------------- branches/ms4w/dcmms/seal.php branches/ms4w/dcmms/search.php branches/ms4w/dcmms/team_report.php branches/ms4w/dcmms/workorder_status_report.php branches/ms4w/dcmms/workorderlist.php Deleted: branches/ms4w/dcmms/seal.php =================================================================== --- branches/ms4w/dcmms/seal.php 2006-08-11 19:00:24 UTC (rev 1132) +++ branches/ms4w/dcmms/seal.php 2006-08-11 19:02:14 UTC (rev 1133) @@ -1,136 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * seal.php - Record information on broken meter seals. - * - * Copyright (C) 2004, 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); -require_once("include/dcmpostgis.php"); -require_once("include/dcmmspear.php"); -require_once("HTML/QuickForm.php"); -require_once("DB/DataObject/FormBuilder.php"); -require_once("DB/DataObject.php"); -require_once("DB/common.php"); -require_once("PEAR.php"); - -$dcmPage = new DcmmsPage(_("Unsealed")); -/** - * \todo Adjust icon. - */ -$dcmPage->setIconImage("team_management.png"); -$dcmPage->setPageName(basename(__FILE__)); - -$options = &PEAR::getStaticProperty("DB_DataObject", "options"); -$config = parse_ini_file("conf/dataobject.ini", TRUE); -/** - * \todo Refactor - */ -$options = $config["DB_DataObject"]; -$_DB_DATAOBJECT_FORMBUILDER["CONFIG"] = $config["DB_DataObject_FormBuilder"]; -$options["database"] = "pgsql://".$_SESSION["UserName"].":". - $_SESSION["Password"]."@"."localhost/".$_SESSION["strDataBase"]; -/** - * Set up DB_DataObject config settings. - */ -$do =& DB_DataObject::factory('seal'); - -$blnShowform = false; - -if(isset($_REQUEST['action'])){ - if(PEAR::isError($do)or(null == $do)) { - die($do->getMessage()); - } - switch($_REQUEST["action"]) { - case "edit": - $do->get($_REQUEST["id"]); - $blnShowform = true; - break; - case "insert": - if(isset($_REQUEST['WorkorderID'])) { - $do->maintenanceoid = $_REQUEST['WorkorderID']; - if($do->insert()) {; - $blnShowform = true; - } - } - break; - default: - break; - } -} - -if(isset($_REQUEST["WorkorderID"])&&($_REQUEST["WorkorderID"] != 0)) { - $_SESSION["WorkorderID"] = $_REQUEST["WorkorderID"]; -} - -if($blnShowform) { - $dcmPage->add(_("Unseal information for maintenance record : "). - '<a href="maintenance.php?page=resource&id='. - $_SESSION['WorkorderID'].'&action=viewworkorder&PHPSESSID='.session_id(). - '">'.$_SESSION['WorkorderID'].'</a>'); - -$dcmPage->add('<p><a href="'.basename(__FILE__). - '?action=queryrecord&WorkorderID='.$_SESSION['WorkorderID'].'">'. - _('Show Unsealed Meters').'</a></p>'); - -$formBuilder = DB_DataObject_FormBuilder::create($do); - -$form = $formBuilder->getForm(); -if($form->validate()){ - $form->process(array(&$formBuilder, 'processForm'), false); -} -if(isset($_SESSION['WorkorderID'])) { - $form->setDefaults(array('maintenanceoid' => $_SESSION['WorkorderID'])); -} -$form->addElement("hidden", "action", "edit"); -$dcmPage->add($form->toHtml()); -} else { - $dcmPage->add(_("Unseal information for maintenance record : "). - "<a href=\"maintenance.php?page=resource&id=". - $_SESSION["WorkorderID"]."&action=viewworkorder&PHPSESSID=".session_id(). - "\">".$_SESSION["WorkorderID"]."</a>"); - - $dcmPage->add("<p><a href=\"".basename(__FILE__)."?action=insert&WorkorderID=". - $_SESSION["WorkorderID"]."\">"._("Unseal Meter")."</a></p>"); - - $query = "select ID, Reason, Responsible, SubscriberOID, SerialNumber from Seal "; - if((isset($_REQUEST['action']))&&(isset($_REQUEST['WorkorderID']))&& - ('queryrecord' == $_REQUEST['action'])&&($_REQUEST['WorkorderID']!=0)) { - $query = $query." where MaintenanceOID = ".$_REQUEST["WorkorderID"]; - $_SESSION["WorkorderID"] = $_REQUEST["WorkorderID"]; - } - $objDbTablePager = new DbTablePager($dcmPage->postgis->db, $query); - $objDbTablePager->addRows(); - $objDbTablePager->setCellContents(0, 0, _("ID"), "TH"); - $objDbTablePager->setCellContents(0, 1, _("Reason"), "TH"); - $objDbTablePager->setCellContents(0, 2, _("Responsible"), "TH"); - $objDbTablePager->setCellContents(0, 3, _("Subscriber #"), "TH"); - $objDbTablePager->setCellContents(0, 4, _("Serial Number"), "TH"); - $objDbTablePager->setCellContents(0, 5, _("Action"), "TH"); - $intRowCount = $objDbTablePager->getRowCount(); - for($intI = 1; $intI < $intRowCount; $intI++) { - $strID = $objDbTablePager->getCellContents($intI, 0); - $objDbTablePager->setCellContents($intI, 5, - "<a href=\"".basename(__FILE__)."?action=edit&id=$strID&WorkorderID=". - $_REQUEST["WorkorderID"]."\">"._("Edit")."</a>"); - } - $dcmPage->add($objDbTablePager->toHtml()); -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> Deleted: branches/ms4w/dcmms/search.php =================================================================== --- branches/ms4w/dcmms/search.php 2006-08-11 19:00:24 UTC (rev 1132) +++ branches/ms4w/dcmms/search.php 2006-08-11 19:02:14 UTC (rev 1133) @@ -1,42 +0,0 @@ -<?php -/** - * DCMMS -- DC Maintenance Management System - * - * search.php - Search page redirecting workorder and landmark searches. - * - * Copyright (C) 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \todo Actually perform the search here. - * \todo If landmark query has one hit, user should be forwarded to map page. - * \todo Avoid forwarding whenever possible. - * \todo Search plug-ins. - */ -if(isset($_REQUEST['WorkorderID'])) { - session_start(); - if(is_numeric($_REQUEST['WorkorderID'])) { - header('Location: query_workorder_status.php?WorkorderID='. - $_REQUEST['WorkorderID']); - } else { - header('Location: zoom.php?name='.$_REQUEST['WorkorderID']); - } -} else { - echo('FATAL ERROR: No WorkorderID provided'); -} - -?> Deleted: branches/ms4w/dcmms/team_report.php =================================================================== --- branches/ms4w/dcmms/team_report.php 2006-08-11 19:00:24 UTC (rev 1132) +++ branches/ms4w/dcmms/team_report.php 2006-08-11 19:02:14 UTC (rev 1133) @@ -1,43 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * team_report.php - List maintenance teams. - * - * Copyright (C) 2005 NGWA, DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once('include/dcmmspage.php'); -require_once('include/dcmpostgis.php'); -require_once('include/dcmmspear.php'); -require_once('HTML/Table.php'); - -$dcmPage = new DcmmsPage(_('Team Report')); - -$dcmPage->setIconImage('documents.png'); - -$dcmPage->add('<p>'.sprintf( - _('A %sReport%s listing all maintenance teams.'), - '<a href="reports.php">', '</a>').'</p>'); -$strQuery = 'select * from TeamView'; -$objTable = new DbTable($dcmPage->postgis->db, $strQuery); -$objTable->addRows(); -/** - * TODO: better layout, i18n - */ -$dcmPage->add($objTable->toHtml()); -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); ?> Deleted: branches/ms4w/dcmms/workorder_status_report.php =================================================================== --- branches/ms4w/dcmms/workorder_status_report.php 2006-08-11 19:00:24 UTC (rev 1132) +++ branches/ms4w/dcmms/workorder_status_report.php 2006-08-11 19:02:14 UTC (rev 1133) @@ -1,97 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * workorder_status_report.php - Summary of pending workorders - * - * Copyright (C) 2003 DORSCH Consult, Northern Governorates Water Administration - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -@include("include/header.php"); -include("include/dcmpostgis.php"); - -$dcmPage = new DcmPage(basename(__FILE__)); - -$dcmPage->header(_("Workorder Status Report"),TRUE,"","documents.png"); -echo("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. - "\" border=\"0\" alt=\"Organization Logo\" />"); -echo("<p>".sprintf( - _("A DCMMS %sReport%s summarizing the workorder status for a period of time.") - ,"<a href=\"reports.php\">","</a>")."</p>"); -$strHeader2 = _("Querying all DCMMS records"); -if((array_key_exists("FromDate",$_POST))&&(array_key_exists("ToDate", -$_POST))&&($_POST["FromDate"]!="")&&($_POST["ToDate"]!="")) { - $query = 'select dcmmstranslation(\''.$_SESSION['language']. - '\', Workordersubtype.Description), 2*count(*)-sum(status) as '. - 'pending, sum(status)-count(*) as completed, count(*) from workorder - left join WorkorderSubtype on Workorder.Subtype = WorkorderSubtype.Subtype - left join Maintenance on Workorder.ID = Maintenance.ID where '. - "receiveddate > '".$_POST["FromDate"]."' and receiveddate < '".$_POST["ToDate"]."'"; - - // echo($query); - $strHeader2 = sprintf(_("Period from %s to %s"), $_POST["FromDate"], - $_POST["ToDate"]); -} else { - $query = 'select dcmmstranslation(\''.$_SESSION['language']. - '\', WorkorderSubtype.Description) as Type, 2*count(*)-sum(Status) as - Pending, sum(Status)-count(*) as Completed, Count(*) from Workorder - left join WorkorderSubtype on Workorder.Subtype = WorkorderSubtype.Subtype - left join Maintenance on Workorder.ID = Maintenance.ID'; -} -$strAdministra = ""; -if ((array_key_exists("AdministrativeArea",$_POST)) && ($_POST["AdministrativeArea"] !=0)){ - $strAdministra = " and administrativearea = ".$_POST["AdministrativeArea"]; -} - $query = $query.$strAdministra.' group by dcmmstranslation(\''. - $_SESSION['language'].'\', WorkorderSubtype.Description)'; - // echo ($query); - ?> -<form name="workorderstatus" action="workorder_status_report.php?PHPSESSID="<?= - session_id() ?>" method="POST"> -<table summary="workorderstatus"> <?php - -$strAdministra = ""; - -// AdministrativeArea -$Adminquery = "select distinct Landmark.Administra, ". - pg_localize('Name', 'AdministrativeArea'). - " from AdministrativeArea, Landmark where Landmark.Administra = ". - "AdministrativeArea.CodedValue".$strAdministra; -//echo($query); -$result = pg_exec($Adminquery); -$arrResult = array(); -while($arrRow = pg_fetch_row($result)) { - array_push($arrResult, $arrRow); -} - -$dcmPage->printSelect("AdministrativeArea", $arrResult, $_POST, - _("Query for landmarks in this region.")); - -$dcmPage->printTextInput("FromDate", $_POST, $dcmPage->getTimeStamp("", "", 1), - _("Insert the report period starting date.")); -$dcmPage->printTextInput("ToDate", $_POST, $dcmPage->getTimeStamp(), - _("Insert the report period ending date.")); - - ?> - -</table> - <input type="submit" name="submit" value="<?=_("Create Report")?>" - title="<?= _('Click this button to create the report.') ?>"/> -</form> -<h2><?= $strHeader2 ?></h2> <?php -$dcmPage->printTable("Complaints", $query); -$dcmPage->footer("$Date$Empty"); ?> Deleted: branches/ms4w/dcmms/workorderlist.php =================================================================== --- branches/ms4w/dcmms/workorderlist.php 2006-08-11 19:00:24 UTC (rev 1132) +++ branches/ms4w/dcmms/workorderlist.php 2006-08-11 19:02:14 UTC (rev 1133) @@ -1,289 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * workorderlist.php - Display and filter lists of workorder records. - * - * Copyright (C) 2003 - 2004 DORSCH Consult, NGWA - * Copyright (C) 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \todo Delete action. - * \todo Avoid redirection. - */ -require_once('include/dcmmspage.php'); -require_once('include/dcmmspear.php'); -require_once('Pager/Pager.php'); -require_once('DB/DataObject.php'); -require_once('DB/DataObject/FormBuilder.php'); -require_once('HTML/QuickForm/Renderer/Default.php'); - -$dcmPage = new DcmmsPage(_('Workorder')); -$dcmPage->setIconImage('todo.png'); -$dcmPage->setPageName(basename(__FILE__)); -if(!isset($_REQUEST['action'])) { - $_REQUEST['action'] = 'list'; -} - -/** - * Determine workorder status - */ -$intStatus = 1; -switch($_REQUEST["action"]) { - case "list" : - if(array_key_exists("status", $_REQUEST) && $_REQUEST["status"] == 2) { - $intStatus = 2; - } elseif (array_key_exists("status", $_REQUEST) && $_REQUEST["status"] == 2) { - $intStatus = 3; - } else { - $intStatus = 1; - } - break; - case "view" : - case "edit" : - $arrWorkorderRecord = array(); - $strQuery = $strQuery = "select ID,Complainant, Subtype, Telephone,". - " LocationDescription, Status, ". - $dcmPage->postgis->formatTimestamp("ReceivedDate"). - " as ReceivedDate, Note, AdministrativeArea, Team, DcmmsUser, Network". - " from Workorder where ID="; - if((array_key_exists("NewWorkorderID", $_SESSION)) && - ($_SESSION["NewWorkorderID"] != "")) { - $strQuery = $strQuery.$_SESSION["NewWorkorderID"]; - } else { - $strQuery = $strQuery.$_REQUEST["WorkorderID"]; - } - //echo($strQuery); - $objResult = pg_query($strQuery); - if($objResult) { - $arrWorkorderRecord = pg_fetch_assoc($objResult); - $intStatus = $arrWorkorderRecord['status']; - } - break; -} -/** - * Display tabs. - */ -if(2 == $intStatus) { - $dcmPage->add('<a href="'.basename(__FILE__).'?PHPSESSID='.session_id(). - '&action=list&status=1" class="tab_one_inactive">'); -} else { - $dcmPage->add('<span class="tab_one">'); -} -$dcmPage->add(_('Pending')); -if(2 == $intStatus) { - $dcmPage->add('</a>'); -} else { - $dcmPage->add('</span>'); -} -$dcmPage->add(' '); -if(1 == $intStatus) { - $dcmPage->add('<a href="'.basename(__FILE__).'?PHPSESSID='.session_id(). - '&action=list&status=2" class="tab_one_inactive">'); -} else { - $dcmPage->add('<span class="tab_one">'); -} -$dcmPage->add(_('Completed')); -if(1 == $intStatus) { - $dcmPage->add('</a>'); -} else { - $dcmPage->add('</span>'); -} -$boolFormDisabled = false; -/** - * Handle request actions. - */ -switch($_REQUEST['action']) { - case 'list' : - /** - * List workorders. - */ - $strWhere = "workorder.subtype = workordersubtype.Subtype and ". - " Maintenance.status=".$_REQUEST["status"]; - /** - * Ensure full maps in print_workorder.php - */ - $_SESSION["gravitymain"] = "Y"; - $_SESSION["pressurizedmain"] = "Y"; - - $query = 'select count(*) from Workorder - left join WorkorderSubtype on Workorder.Subtype=WorkorderSubtype.Subtype - left join Maintenance on Workorder.ID = Maintenance.ID where '.$strWhere; - $result = pg_exec($query); - $arrRow = pg_fetch_array($result, 0); - $params['totalItems'] = $arrRow[0]; - $params['perPage'] = 10; - $params['nextImg'] = _('Next >>'); - $params['prevImg'] = _('<< Back'); - $pager =& Pager::factory($params); - $data = $pager->getPageData(); - $links = $pager->getLinks(); - list($from, $to) = $pager->getOffsetByPageId(); - /** - * \todo Adjust table to data model. - */ - $query = 'select Workorder.ID as WorkorderID, - workorder.complainant, dcmmstranslation(\''.$_SESSION['language']. - '\', WorkorderSubtype.Description) as Type - from Workorder - left join WorkorderSubtype on Workorder.Subtype = WorkorderSubtype.Subtype - left join Maintenance on Workorder.ID = Maintenance.ID - where '.$strWhere. - ' order by Workorder.ID desc'; - //echo($query); - $arreActions = array('Map' => - basename(__FILE__).'?PHPSESSID='. - session_id().'&action=map&WorkorderID=', - 'View' => 'workorderpage.php?'. - 'PHPSESSID='.session_id().'&action=view&id=', - 'Print' => 'print_workorder.php?PHPSESSID='.session_id(). - '&action=print&WorkorderID=', "Maintenance"=>"maintenance.php?". - "PHPSESSID=".session_id()."&action=viewworkorder&id=", - "Resource"=>"resource.php?table=Staff&PHPSESSID=".session_id(). - "&action=select_workorder&WorkorderID=" - ); - if(2 == $_REQUEST["status"]) { - $arreActions = array_merge($arreActions, $arrCompletedActions); - } - $objDbTablePager = new DbTablePager($dcmPage->postgis->db, $query, - array('class' => 'tab_one_panel')); - $objDbTablePager->addRows(); - $objDbTablePager->setCellContents(0, 0, _('ID'), 'TH'); - $objDbTablePager->setCellContents(0, 1, _('Complainant'), 'TH'); - $objDbTablePager->setCellContents(0, 2, _('Type'), 'TH'); - $objDbTablePager->setCellContents(0, 3, _('Action'), 'TH'); - $intRowCount = $objDbTablePager->getRowCount(); - /** - * Localize types - * \todo Switch to database side translation. - */ - for($intI = 1; $intI < $intRowCount; $intI++) { - $objDbTablePager->setCellContents($intI, 2, - _($objDbTablePager->getCellContents($intI, 2))); - } - /** - * Add actions - */ - - for($intI = 1; $intI < $intRowCount; $intI++) { - $strID = $objDbTablePager->getCellContents($intI, 0); - $strActionHtml = ''; - foreach($arreActions as $strActionName => $strActionUrl) { - $strActionHtml .= '<a href="'.$strActionUrl.$strID.'">'. - _($strActionName).'</a> '; - } - $objDbTablePager->setCellContents($intI, 3, $strActionHtml); - } - $dcmPage->add($objDbTablePager->toHtml()); - break; - case 'view' : - /** - * View one workorder. - */ - case 'edit' : - /** - * Edit or view one workorder. - * \todo Refactor this (e.g. DcmmsDataObjectPage). - */ - $options = &PEAR::getStaticProperty('DB_DataObject', 'options'); - $config = parse_ini_file('conf/dataobject.ini', TRUE); - $options = $config['DB_DataObject']; - $_DB_DATAOBJECT_FORMBUILDER['CONFIG'] = - $config['DB_DataObject_FormBuilder']; - $options['database'] = 'pgsql://'.$_SESSION['UserName'].':'. - $_SESSION['Password'].'@'.'localhost/'.$_SESSION['strDataBase']; - - $objWorkorder = DB_DataObject::factory('Workorder'); - if(PEAR::isError($objWorkorder)or(NULL == $objWorkorder)) { - die($objWorkorder->getMessage()); - } - if(!$objWorkorder->get($_REQUEST['WorkorderID'])) { - die(sprintf(_('Could not retrieve record for workorder #%s.'), - $_REQUEST['WorkorderID'])); - } - if(PEAR::isError($objWorkorder)or(NULL == $objWorkorder)) { - die($objWorkorder->getMessage()); - } - $objWorkorderBuilder = DB_DataObject_FormBuilder::create($objWorkorder); - if(PEAR::isError($objWorkorderBuilder)) { - die($objWorkorderBuilder->getMessage()); - } - $objWorkorderForm = $objWorkorderBuilder->getForm(); - if($objWorkorderForm->validate()) { - if($objWorkorderForm->process(array(&$objWorkorderBuilder, - 'processForm'), false)) { - header('Location: '.basename(__FILE__).'?message='. - urlencode(_('Successfully updated the workorder record.'))); - } else { - $dcmPage->add('<p class="important">'. - _('Failed to update the workorder record.').'</p>'); - } - } - /** - * Come back to the data entry form. - */ - $objWorkorderForm->addElement("hidden", "action", "edit"); - $objRenderer =& new HTML_QuickForm_Renderer_Default(); - $objRenderer->setFormTemplate( - "\n<form{attributes}>\n<table class=\"tab_one_panel\">\n{content}\n</table></form>"); - $objWorkorderForm->accept($objRenderer); - - $dcmPage->add($objRenderer->toHtml()); - - break; - case "map" : - $query = "select box3d(shape),StartPoint(shape) from workorder where id=". - $_REQUEST["WorkorderID"]; - $_SESSION["WorkorderID"]=$_REQUEST["WorkorderID"]; - $result = pg_query($query); - $numrows = pg_numrows($result); - for($i=0; $i<$numrows;$i++) { - $r = pg_fetch_row($result, $i); - $box3d = $r[0]; - $box3d = str_replace("BOX3D(", "", $box3d); - $token = strtok($box3d, " "); - $minx = $token; - $token = strtok(" "); - $miny = $token; - $token = strtok(","); - $token = strtok(" "); - $maxx = $token+1; - $token = strtok(" "); - $maxy = $token+1; - } - /** - * Remember the WorkorderID if it exists. - */ - $strWorkorderID = ""; - if(array_key_exists("WorkorderID", $_REQUEST)) { - $strWorkorderID = "&WorkorderID=".$_REQUEST["WorkorderID"]; - } - header("location: map.php?PHPSESSID=".$_REQUEST["PHPSESSID"]. - "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+". - "View&minx=$minx&miny=$miny&maxx=$maxx&maxy=$maxy&imagewidth=400&". - "imageheight=300&CMD=ADD_REPAIR". - "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1". - $strWorkorderID); - if(isset($dbconnect)) { - pg_close ($dbconnect); - } - break; -} - -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 20:29:08
|
Revision: 1134 Author: sdteffen Date: 2006-08-11 13:28:17 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1134&view=rev Log Message: ----------- * conf/dataobject.ini.default: * conf/sample_en.map: * htdocs/index.php: * htdocs/landmark.php: * htdocs/logon.php: * htdocs/map.php: * htdocs/print_workorder.php: * htdocs/reports.php: * htdocs/workorderlist.php: * htdocs/zoom.php: * include/dataobject/Landmark.php: * include/dcmmap.php: * include/dcmmspage.php: * include/header.php: * locale/*/LC_MESSAGES/dcmms.po: Adjusting to MS4W structure; trying to track down crashbug that is mapfile/mapscript related. Modified Paths: -------------- branches/ms4w/dcmms/.project branches/ms4w/dcmms/conf/dataobject.ini.default branches/ms4w/dcmms/conf/sample_en.map branches/ms4w/dcmms/htdocs/index.php branches/ms4w/dcmms/htdocs/landmark.php branches/ms4w/dcmms/htdocs/logon.php branches/ms4w/dcmms/htdocs/map.php branches/ms4w/dcmms/htdocs/print_workorder.php branches/ms4w/dcmms/htdocs/reports.php branches/ms4w/dcmms/htdocs/workorderlist.php branches/ms4w/dcmms/htdocs/workorderpage.php branches/ms4w/dcmms/htdocs/zoom.php branches/ms4w/dcmms/include/dataobject/Landmark.php branches/ms4w/dcmms/include/dcmmap.php branches/ms4w/dcmms/include/dcmmspage.php branches/ms4w/dcmms/include/header.php branches/ms4w/dcmms/locale/ar/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/locale/ar_SY/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/locale/en/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/locale/fr/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/locale/it/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/locale/th/LC_MESSAGES/dcmms.po Modified: branches/ms4w/dcmms/.project =================================================================== --- branches/ms4w/dcmms/.project 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/.project 2006-08-11 20:28:17 UTC (rev 1134) @@ -5,7 +5,13 @@ <projects> </projects> <buildSpec> + <buildCommand> + <name>net.sf.eclipsensis.installoptions.InstallOptionsBuilder</name> + <arguments> + </arguments> + </buildCommand> </buildSpec> <natures> + <nature>net.sf.eclipsensis.installoptions.InstallOptionsNature</nature> </natures> </projectDescription> Modified: branches/ms4w/dcmms/conf/dataobject.ini.default =================================================================== --- branches/ms4w/dcmms/conf/dataobject.ini.default 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/conf/dataobject.ini.default 2006-08-11 20:28:17 UTC (rev 1134) @@ -2,9 +2,9 @@ ; PEAR::DB DSN database = pgsql://user:password@localhost/dcmms ; Location where dcmms.ini schema file should be created -schema_location = c:\program files\dcmms\include\dataobject +schema_location = c:\ms4w\apps\dcmms\include\dataobject ; Location where DataObject classes should be created -class_location = c:\program files\dcmms\include\dataobject +class_location = c:\ms4w\dcmms\include\dataobject ; Prefix for including files from your code require_prefix = DataObject_ ; Classes should be prefixed with this string e.g. DataObject_User Modified: branches/ms4w/dcmms/conf/sample_en.map =================================================================== --- branches/ms4w/dcmms/conf/sample_en.map 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/conf/sample_en.map 2006-08-11 20:28:17 UTC (rev 1134) @@ -19,380 +19,73 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -NAME DCMMS +NAME "DCMMS" +SIZE 640 480 STATUS ON -SIZE 600 450 -SYMBOLSET ../etc/symbols.sym +SYMBOLSET "/ms4w/apps/dcmms/etc/symbols.sym" EXTENT 214600 200230 218000 202835 UNITS METERS -SHAPEPATH "c:/program files/dcmms/data/" -IMAGECOLOR 255 255 255 -FONTSET ../etc/fonts.txt -IMAGETYPE PNG +SHAPEPATH "/ms4w/apps/dcmms/data/" -# Web interface definition WEB - MINSCALE 20 - MAXSCALE 500000000 - IMAGEPATH "/tmp/ms_tmp/" + IMAGEPATH "/ms4w/tmp/ms_tmp/" IMAGEURL "/ms_tmp/" END -# Reference map -REFERENCE - IMAGE ../images/dcmms_keymap.png - EXTENT 214578 200220 218073 202836 - STATUS ON - COLOR -1 -1 -1 - OUTLINECOLOR 255 0 0 - SIZE 120 90 -END - -# Legend -LEGEND - KEYSIZE 18 12 - LABEL - TYPE BITMAP - SIZE MEDIUM - COLOR 0 0 89 - END - STATUS ON -END - -# Scalebar -SCALEBAR - IMAGECOLOR 255 255 255 - LABEL - COLOR 0 0 0 - SIZE SMALL - END - SIZE 150 5 - COLOR 0 0 0 - BACKGROUNDCOLOR -1 -1 -1 - OUTLINECOLOR 0 0 0 - UNITS kilometers - INTERVALS 5 - STATUS EMBED -END - -#Querymap -QUERYMAP - STYLE HILITE - COLOR 255 255 0 -END - -# Layers - -# PendingWorkorders LAYER - CONNECTIONTYPE postgis - NAME PendingWorkorders - maxscale 15000 + NAME "AreaOfInterest" TYPE POLYGON STATUS DEFAULT - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "areaofinterest from workorder using unique id using SRID=-1" - filter "1=(select status from maintenance where maintenance.id=workorder.id)" + DATA "administrativearea" CLASS - NAME 'PendingWorkorders' - TEMPLATE "dummy.html" STYLE - SYMBOL "aoihatch" - SIZE 8 - WIDTH 1 - ANGLE 315 - COLOR 255 150 150 - OUTLINECOLOR 255 150 150 + COLOR 110 50 100 + OUTLINECOLOR 200 200 200 + SYMBOL 0 END END - METADATA - "DESCRIPTION" "Pending Workorders" - "RESULT_FIELDS" "id receiveddate complainant locationdescription" - END - TOLERANCE 15 -END # Layer +END -# AdministrativeArea -layer - CONNECTIONTYPE postgis - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from administrativearea" - type polygon - status default - minscale 15000 - labelitem "name" - class - color 255 255 200 - name 'West Sector' - expression ([CODEDVALUE] = 1) - outlinecolor 0 0 0 - end - class - color 200 255 255 - name 'North Sector' - expression ([CODEDVALUE] = 2) - outlinecolor 0 0 0 - end - class - color 255 200 200 - name 'South Sector' - expression ([CODEDVALUE] = 3) - outlinecolor 0 0 0 - end - METADATA - "DESCRIPTION" "AdministrativeArea" - "RESULT_FIELDS" "name" - END -end - -#AdministrativeArea Label -layer - name "AdministrativeAreaLabel" - CONNECTIONTYPE postgis - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from administrativearea" - type polygon - status off - minscale 15000 - labelitem "name" - CLASS - NAME 'Label' - label - color 0 0 0 - position auto - font arial - type truetype - size 10 - end - END -end - -# Road -layer - NAME "Road" - data "c:/program files/dcmms/data/basemap/roadcenterlines" - type line - status default - class - template "ttt_query.html" - name "Road" - color 170 170 170 - end - maxscale 20000 - tolerance 1 - METADATA - "DESCRIPTION" "Road" - "RESULT_FIELDS" "NAME" - END -end - -layer - NAME "Building" - data "c:/program files/dcmms/data/basemap/building" - type polygon - status default - class - template "ttt_query.html" - name "Building" - color 170 170 170 - end - maxscale 20000 - tolerance 1 - METADATA - "DESCRIPTION" "Building" - "RESULT_FIELDS" "AREA" - END -end - LAYER - maxscale 10000 - labelmaxscale 2000 - data "c:/program files/dcmms/data/sewer/gravitymain" - NAME gravitymain - METADATA - "DESCRIPTION" "Gravitymain" - "RESULT_FIELDS" "DIAMETER" - END - TYPE LINE - STATUS ON - #LABELITEM "diameter" - CLASS - NAME "sewer" - template "ttt_query.html" - SIZE 2 - symbol "circle" - COLOR 170 120 0 - overlaysymbol "arrow" - overlaycolor 170 120 0 - overlaysize 8 - label - color 170 120 0 - position auto - end - END - TOLERANCE 15 -END # Layer - -LAYER - NAME pressurizedmain - data "c:/program files/dcmms/data/water/pressurizedmain" - TYPE Line - STATUS ON - maxscale 20000 - labelmaxscale 5000 - labelitem "DIAMETER" - CLASS - NAME 'Pressurizedmain' - template "ttt_query.html" - SYMBOL "circle" - SIZE 2 - COLOR 0 0 255 - label - color 0 0 0 - position auto - font arial - type truetype - size 10 - end - END - METADATA - "DESCRIPTION" "Water Network" - "RESULT_FIELDS" "DIAMETER" - END - TOLERANCE 5 -END - -LAYER - CONNECTIONTYPE postgis - NAME Village + NAME "Maintenance" TYPE POLYGON - STATUS on - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from village" - labelmaxscale 10 - labelitem "name" - transparency 100 + STATUS DEFAULT + DATA "administrativearea" CLASS - NAME 'Village' - template "ttt_query.html" - SYMBOL "circle" - SIZE 2 - OUTLINECOLOR 150 150 150 - label - color 0 0 0 - position auto - font arial - type truetype - size 15 - end + STYLE + COLOR 110 50 100 + OUTLINECOLOR 200 200 200 + SYMBOL 0 + END END - - METADATA - "DESCRIPTION" "Village" - "RESULT_FIELDS" "gid name" - END - TOLERANCE 5 -END # Village Layer +END - -# LandMark Layer LAYER - CONNECTIONTYPE postgis - NAME Landmark - maxscale 15000 - TYPE POINT + NAME "pressurizedmain" + TYPE POLYGON STATUS DEFAULT - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "the_geom from landmarkview using unique gid using SRID=-1" - labelitem "name" + DATA "administrativearea" CLASS - NAME 'LandMark' - template "ttt_query.html" - SYMBOL "square" - SIZE 12 - color 0 150 0 - label - color 38 119 38 - position uc - font arial - type truetype - size 15 - end + STYLE + COLOR 110 50 100 + OUTLINECOLOR 200 200 200 + SYMBOL 0 + END END - METADATA - "DESCRIPTION" "Landmark" - "RESULT_FIELDS" "gid type name" - END - TOLERANCE 15 -END # Layer +END -# AreaOfInterest LAYER - CONNECTIONTYPE postgis - NAME AreaOfInterest + NAME "gravitymain" TYPE POLYGON - STATUS OFF - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "areaofinterest from workorder" - filter "id = -1" + STATUS DEFAULT + DATA "administrativearea" CLASS - NAME 'AreaOfInterest' STYLE - SYMBOL "aoihatch" - SIZE 10 - WIDTH 2 - ANGLE 45 - COLOR 255 255 0 - OUTLINECOLOR 255 255 0 + COLOR 110 50 100 + OUTLINECOLOR 200 200 200 + SYMBOL 0 END END - TOLERANCE 15 -END # Layer +END -# Empty layer, used for AreaOfInterest center points -layer - connectiontype PostGIS - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - name "center" - type POINT - status OFF - DATA "the_geom from center" - CLASS - NAME "Center Point" - #template "ttt_query.html" - SYMBOL "circle" - SIZE 8 - color 0 0 0 - outlinecolor 255 255 255 - END - METADATA - "DESCRIPTION" "Center Point" - "RESULT_FIELDS" "" - END - TOLERANCE 15 -END - -# Maintenance Layer -LAYER - CONNECTIONTYPE postgis - NAME Maintenance - TYPE POINT - STATUS ON - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "shape from maintenance" - CLASS - NAME "Maintenance" - template "ttt_query.html" - SYMBOL "square" - SIZE 8 - color 223 66 30 - END - METADATA - "DESCRIPTION" "Maintenance" - "RESULT_FIELDS" "id note" - END - TOLERANCE 15 -END - -END # Map File - +END \ No newline at end of file Modified: branches/ms4w/dcmms/htdocs/index.php =================================================================== --- branches/ms4w/dcmms/htdocs/index.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/index.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,5 +1,6 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * index.php - DCMMS main page * @@ -21,8 +22,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - @include("include/header.php"); - include("include/dcmpostgis.php"); + @include '../include/header.php'; + include '../include/dcmpostgis.php'; $dcmPage = new DcmPage(basename(__FILE__)); $dcmPage->header(_("DC Maintenance Management System")); $arrIDs = Array("NewWorkorderID", "WorkorderID"); @@ -41,9 +42,9 @@ */ function echoOnMouseOverLink($strURL, $strLabel, $strHelp="", $strImage="") { GLOBAL $strPathInDcmms; ?> - <a href="<?= $strURL ?>" title="<?= $strHelp ?>"><?= $strLabel ?> - <span><img src="<?= $strPathInDcmms ?>images/<?= $strImage ?>" /> - <br /> <?= $strHelp ?></span></a> <?php + <a href="<?php echo $strURL ?>" title="<?php echo $strHelp ?>"><?php echo $strLabel ?> + <span><img src="<?php echo $strPathInDcmms ?>images/<?php echo $strImage ?>" /> + <br /> <?php echo $strHelp ?></span></a> <?php } ?> @@ -51,7 +52,7 @@ <style type="text/css"> </style> -<p><?= _("Welcome to the DC Maintenance Management System.") ?></p> +<p><?php echo _("Welcome to the DC Maintenance Management System.") ?></p> <?php @@ -61,7 +62,7 @@ $strQuery = "select Description from CauseDomain where CodedValue = 7"; $objResult = pg_query($strQuery); if((!$objResult)||(pg_numrows($objResult) == 0)) { ?> - <p class="important"><?= _("Warning: Your data model might be outdated."). + <p class="important"><?php echo _("Warning: Your data model might be outdated."). " "._("Please contact your administrator.") ?></p> <?php } ?> @@ -87,8 +88,8 @@ <?php if(pg_is_administrator($_SESSION["UserName"])) { ?> - <h2><img alt="<?= _("Administration") ?>" src="<?= $strPathInDcmms - ?>images/administration-32.png" /><?= _("Administration") ?></h2> + <h2><img alt="<?php echo _("Administration") ?>" src="<?php echo $strPathInDcmms + ?>images/administration-32.png" /><?php echo _("Administration") ?></h2> <div id="contentleft"> <ul> <li><?php echoOnMouseOverLink("admin/shapefile_loader.php", Modified: branches/ms4w/dcmms/htdocs/landmark.php =================================================================== --- branches/ms4w/dcmms/htdocs/landmark.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/landmark.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -39,20 +39,20 @@ * map - select landmark surroundings and show on map * \todo Guard administrator-only functions. */ -require_once("include/dcmmspage.php"); -require_once("include/dcmpostgis.php"); -require_once("include/dcmmspear.php"); -require_once("HTML/QuickForm.php"); -require_once("DB/DataObject/FormBuilder.php"); -require_once("DB/DataObject.php"); -require_once("PEAR.php"); +require_once '../include/dcmmspage.php'; +require_once '../include/dcmpostgis.php'; +require_once '../include/dcmmspear.php'; +require_once 'HTML/QuickForm.php'; +require_once 'DB/DataObject/FormBuilder.php'; +require_once 'DB/DataObject.php'; +require_once 'PEAR.php'; /** * \todo Refactor. * \todo Remove dead code. */ $options = &PEAR::getStaticProperty('DB_DataObject', 'options'); -$config = parse_ini_file('conf/dataobject.ini', TRUE); +$config = parse_ini_file('../conf/dataobject.ini', TRUE); $options = $config['DB_DataObject']; $_DB_DATAOBJECT_FORMBUILDER['CONFIG'] = $config['DB_DataObject_FormBuilder']; $options['database'] = 'pgsql://'.$_SESSION['UserName'].':'. Modified: branches/ms4w/dcmms/htdocs/logon.php =================================================================== --- branches/ms4w/dcmms/htdocs/logon.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/logon.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,5 +1,6 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * index.php - log on and off * @@ -51,7 +52,7 @@ "Pager" => "Pager/Pager.php", 'HTML_QuickForm_SelectFilter' => 'HTML/QuickForm/SelectFilter.php', 'DB_DataObject_FormBuilder' => 'DB/DataObject/FormBuilder.php', - 'Image_Graph' => 'Image/Graph.php'); + 'Image_Graph' => 'Image/Graph.php', 'File_Archive' => 'File/Archive.php'); foreach($arrPearFiles as $strPearPackage => $strPearInclude) { require_once $strPearInclude ; } @@ -92,7 +93,9 @@ exit(); } include '../include/dcmpostgis.php'; - // check for PostGIS + /** + * Check for PostGIS. + */ $strQuery = "select x(GeometryFromText('POINT(1 1)',-1))"; @$result = pg_query($strQuery); if($result) { @@ -148,7 +151,7 @@ \''.$strTimestamp.'\' - now() > \'-1 minute\''; $strQuery24 = 'select \''.$strTimestamp24.'\' - now() < \'1 minute\' and \''.$strTimestamp24.'\' - now() > \'-1 minute\''; - @$objResult = pg_query($strQuery); + @$objResult = pg_query($strQuery); @$objResult24 = pg_query($strQuery24); if($objResult) { $arrRow = pg_fetch_row($objResult); @@ -162,9 +165,9 @@ $strMessage .= _('Error: Could not verify time configuration.'); } } + } else { + $strMessage .= _('Error: Could not verify time configuration.'); } - else{$strMessage .= _('Error: Could not verify time configuration.'); - } if($strMessage == '') { header("Location: index.php?PHPSESSID=". session_id()); @@ -203,8 +206,9 @@ <?php $dcmPage->printTextInput("Password", $_POST, "", _("Your DCMMS password."), _("Password:"), "password");?> </table> - <button type="submit" name="submit" title="<?= - _('Click this button after having entered username and password.') ?>"><?= _("Login") ?></button> + <button type="submit" name="submit" title="<?php echo + _('Click this button after having entered username and password.') + ?>"><?php echo _("Login") ?></button> </form><?php $dcmPage->footer("$Date$Empty"); ?> Modified: branches/ms4w/dcmms/htdocs/map.php =================================================================== --- branches/ms4w/dcmms/htdocs/map.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/map.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,11 +1,13 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * map.php - Central DCMMS map page * * Copyright (C) 2000 DM Solutions Group Inc. * Copyright (C) 2003,2004 DORSCH Consult, NGWA * Copyright (C) 2005 DORSCH Consult + * Copyright (C) 2006 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 @@ -49,10 +51,24 @@ * MOVE_LANDMARK: After the selection of a landmark, a new location has * been chosen. Available only to administrators. */ + +if (PHP_OS == "WINNT" || PHP_OS == "WIN32") +{ + $dlext = "dll"; +} +else +{ + $dlext = "so"; +} + +if (!extension_loaded("MapScript")) +{ + dl("php_mapscript_48.$dlext"); +} -require_once("include/dcmpostgis.php"); -require_once("include/dcmmaputil.php"); -@require_once("include/header.php"); +require_once '../include/dcmpostgis.php'; +require_once '../include/dcmmaputil.php'; +@require_once '../include/header.php'; $strMessages = ''; @@ -408,13 +424,13 @@ $dcmPage->header(_("DC Maintenance Management System"), true, $strScript); echo($strMessages); if(array_key_exists("WorkorderID", $_REQUEST)) { ?> - <p><?= sprintf(_("Please locate the maintenance activity for workorder %s."), + <p><?php echo sprintf(_("Please locate the maintenance activity for workorder %s."), "<a href=\"workorderpage.php?action=view&id=". $_REQUEST["WorkorderID"]."&". "PHPSESSID=".session_id()."\">#".$_REQUEST["WorkorderID"]."</a>") ?></p><?php } -include("./include/dcmmap.php"); +include '../include/dcmmap.php'; if((array_key_exists("HTTP_REFERER", $_SERVER)) && (strpos($_SERVER["HTTP_REFERER"], "index.php"))) { unset($HTTP_FORM_VARS["action"]); @@ -457,13 +473,13 @@ $_SESSION["NewWorkorderID"] = null; } ?> <form method="POST" name="mapform" action="map.php"> - <input type="hidden" name="PHPSESSID" value="<?= session_id()?>" /> + <input type="hidden" name="PHPSESSID" value="<?php echo session_id()?>" /> <table> <tr> <td valign="TOP" align="CENTER"> <table> <tr> - <th><?= _("Legend")?></td> + <th><?php echo _("Legend")?></td> </tr> <tr> <td> @@ -485,8 +501,8 @@ <td><img src="images/water_network.png" width="20" height="15"></td> <td> - <a name="#water_network" title="<?= _("Display the Water network")?>"> - <?= _("Water Network") ?></a></td> + <a name="#water_network" title="<?php echo _("Display the Water network")?>"> + <?php echo _("Water Network") ?></a></td> </tr> <?php if((array_key_exists("boolHasSewer", $_SESSION))&& ($_SESSION["boolHasSewer"] == true)) { ?> @@ -500,9 +516,9 @@ <td align="CENTER"><img src="images/sewer_network.png" width="20" height="15"></td> <td> - <a name="#sewer_network" title="<?= + <a name="#sewer_network" title="<?php echo _("Display the sewer network") ?>"> - <?= _("Sewer Network") ?></a></td> + <?php echo _("Sewer Network") ?></a></td> </tr> <?php } ?> <tr> @@ -515,9 +531,9 @@ <td align="CENTER"><img src="images/repair.gif" width="7" height="7"></td> <td> - <a href="workorderlist.php?action=list&status=1" title="<?= + <a href="workorderlist.php?action=list&status=1" title="<?php echo _("Display the repairs locations") ?>" - ><?= _("Maintenance") ?></a></td> + ><?php echo _("Maintenance") ?></a></td> </tr> <tr> <td align="CENTER"> @@ -527,9 +543,9 @@ <td align="CENTER"><img src="images/landmark.png" width="7" height="7"></td> <td> - <a href="zoom.php" title="<?= + <a href="zoom.php" title="<?php echo _("Click this link to zoom to a landmark.") - ?>"><?= _("Landmark") ?></a> + ?>"><?php echo _("Landmark") ?></a> </tr> <tr> <td align="CENTER"> @@ -537,8 +553,8 @@ width="24" height="24" name="redraw" border="0" /> </td> <td colspan="2"> - <a name="#" title="<?= _("Refresh the map display") ?>"> - <?= _("Redraw Map") ?></a></td> + <a name="#" title="<?php echo _("Refresh the map display") ?>"> + <?php echo _("Redraw Map") ?></a></td> </tr> </table> </td> @@ -546,7 +562,7 @@ <tr> <td> <select name="ViewRegion" onChange="ProvinceSelected()"> - <option><?= _("Quick View")?></option> + <option><?php echo _("Quick View")?></option> <option>- - - - - - - - - - - - - - -</option> <?php $strDescription = "name"; @@ -568,8 +584,8 @@ $maxx = (int)$token + 1; $token = strtok(")"); $maxy = (int)$token + 1; ?> - <option value="<?= $minx.",".$miny.",".$maxx.",".$maxy ?>" - ><?= _("Full View")?></option><?php + <option value="<?php echo $minx.",".$miny.",".$maxx.",".$maxy ?>" + ><?php echo _("Full View")?></option><?php } $query = "select extent(the_geom), ".pg_localize('name'). " from administrativearea group by ". @@ -592,13 +608,13 @@ $maxx = (int)$token + 1; $token = strtok(")"); $maxy = (int)$token + 1; ?> - <option value="<?= $minx.",".$miny.",".$maxx.",".$maxy ?>"><?= + <option value="<?php echo $minx.",".$miny.",".$maxx.",".$maxy ?>"><?php echo $r[1] ?></option> <?php } ?> </select><br /> - <SELECT name="MapSize" onChange="MapSizeSelected()" title="<?= _("Select the map size from the list.") ?>"> - <OPTION><?= _("Map Size")?></OPTION> + <SELECT name="MapSize" onChange="MapSizeSelected()" title="<?php echo _("Select the map size from the list.") ?>"> + <OPTION><?php echo _("Map Size")?></OPTION> <OPTION>---------------</OPTION> @@ -619,7 +635,7 @@ </td> </tr> - <tr><td style="text-align: center;"><img src="<?= $_SESSION["OrgLogo"]?>" border="0" /></td></tr> + <tr><td style="text-align: center;"><img src="<?php echo $_SESSION["OrgLogo"]?>" border="0" /></td></tr> </table> </td> <td valign="top"> @@ -635,10 +651,10 @@ <table> <tr align="CENTER"> - <th><?= _("Keymap") ?></th> + <th><?php echo _("Keymap") ?></th> </tr> <tr> - <td><a name="#keymap" title="<?= + <td><a name="#keymap" title="<?php echo _("Click on the key map to view an area.") ?>"><?php GMapDrawKeyMap() ?></a></td> </tr> @@ -649,44 +665,44 @@ <td> <input type="radio" name="CMD" value="ZOOM_IN" <?php if($gszCommand == "ZOOM_IN") echo "CHECKED"; ?> /> - <a name="#" title="<?= + <a name="#" title="<?php echo _("Zoom in further to display more detailed map information.") ?>"> - <?= _("Zoom In") ?></a></td> + <?php echo _("Zoom In") ?></a></td> </tr> <tr> <td><img src="images/stock_zoom-out.png" width="24" height="24" /></td> <td> <input type="radio" name="CMD" value="ZOOM_OUT" <?php if ($gszCommand == "ZOOM_OUT") echo "CHECKED"; ?> /> - <a name="#" title="<?= + <a name="#" title="<?php echo _("Zoom out to display a larger area of the map.") ?>"> - <?= _("Zoom Out") ?></a></td> + <?php echo _("Zoom Out") ?></a></td> </tr> <tr> <td><img src="images/stock-tool-move.png" width="24" height="24"></td> <td> <input type="radio" name="CMD" value="RECENTER"<?php if ($gszCommand == "RECENTER") echo "CHECKED"; ?> /> - <a name="#" title="<?= + <a name="#" title="<?php echo _("Move the map view without zooming in or out.") ?>"> - <?= _("Pan") ?></a></td> + <?php echo _("Pan") ?></a></td> </tr> <tr> <td><img src="images/stock_extended-help.png" width="24" height="24"></td> <td> <input type="radio" name="CMD" value="QUERY_POINT" <?php if ($gszCommand == "QUERY_POINT") echo "CHECKED"; ?> /> - <a name="#" title="<?= + <a name="#" title="<?php echo _("Display information about elements in the map.") ?>"> - <?= _("Identify") ?></a></td> + <?php echo _("Identify") ?></a></td> </tr> <tr> <td> - <?= $toolLandmark->toHtml() ?></td> + <?php echo $toolLandmark->toHtml() ?></td> </tr> <?php if(!(array_key_exists("CMD", $_REQUEST))|| ($_REQUEST["CMD"] != "ADD_REPAIR")) { ?> @@ -712,14 +728,14 @@ echo("area_of_interest_center.png"); } ?>" width="24" height="24"></td> <td> - <input type="radio" name="CMD" value="<?= $strCmd ?>" <?php + <input type="radio" name="CMD" value="<?php echo $strCmd ?>" <?php if(($gszCommand == "NEW_WORKORDER")|| ($gszCommand == "NEW_WORKORDER_CENTER")|| ($gszCommand == "NEW_WORKORDER_RADIUS")) { echo("checked=\"checked\""); } ?> /> - <a name="#" title="<?= $strNewWorkorderHelp ?>"> - <?= $strNewWorkorderLabel ?></a> + <a name="#" title="<?php echo $strNewWorkorderHelp ?>"> + <?php echo $strNewWorkorderLabel ?></a> </td> </tr><?php } @@ -751,10 +767,10 @@ $Row = pg_fetch_row($Result); $strArea = $Row[0]; if($Row[0] != null) { ?> - <a href="workorderpage.php?status=3&action=edit&PHPSESSID=<?= - session_id() ?>&id=<?= $_SESSION["NewWorkorderID"] ?>" title= - "<?=_("Accept the area of interest as displayed.")." ". - _("Continue with data entry.") ?>"><?= + <a href="workorderpage.php?status=3&action=edit&PHPSESSID=<?php echo + session_id() ?>&id=<?php echo $_SESSION["NewWorkorderID"] ?>" title= + "<?php echo_("Accept the area of interest as displayed.")." ". + _("Continue with data entry.") ?>"><?php echo _("[Accept Area of Interest]") ?></a></td></tr><?php } else { ?> @@ -772,19 +788,19 @@ } ?> <input type="radio" name="CMD" value="ADD_REPAIR" <?php if ($gszCommand == "ADD_REPAIR") echo "CHECKED"; ?>> - <a name="#" title="<?= + <a name="#" title="<?php echo _("Locate the repair as marked on the workorder sheet.")?>"> - <?= _("Locate Maintenance") ?></a> + <?php echo _("Locate Maintenance") ?></a> </td> </tr> <?php if(isset($_REQUEST['CMD']) && 'ADD_REPAIR' == $_REQUEST['CMD'] && isset($_REQUEST['mainmap_x'])) { ?> <tr><td><img src="images/accept_area_of_interest.png" width="24" - height="24" /></td><td> [ <a title="<?= + height="24" /></td><td> [ <a title="<?php echo _("Accept the repair location as displayed."). _("Continue with data entry.") ?>" - href="maintenance.php?<?= "x=$nClickGeoX&y=$nClickGeoY&id=". - $_REQUEST["WorkorderID"]?>"><?= + href="maintenance.php?<?php echo "x=$nClickGeoX&y=$nClickGeoY&id=". + $_REQUEST["WorkorderID"]?>"><?php echo _("Accept Maintenance Location") ?></a> ] </td></tr><?php } } ?> @@ -793,7 +809,7 @@ </tr> </table> </table> - <?= GMapDumpQueryResults() ?> + <?php echo GMapDumpQueryResults() ?> <?php if(array_key_exists("MAP_NAME", $HTTP_FORM_VARS) && $HTTP_FORM_VARS["MAP_NAME"]) { @@ -801,7 +817,7 @@ strval($HTTP_FORM_VARS["MAP_NAME"])); } if($strAction != "") { ?> - <input type="hidden" name="action" value="<?= + <input type="hidden" name="action" value="<?php echo $strAction ?>" /> <?php } ?> </form> <?php Modified: branches/ms4w/dcmms/htdocs/print_workorder.php =================================================================== --- branches/ms4w/dcmms/htdocs/print_workorder.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/print_workorder.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,5 +1,6 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * print_workorder.php - print out the workorder. * @@ -20,12 +21,26 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +if (PHP_OS == "WINNT" || PHP_OS == "WIN32") +{ + $dlext = "dll"; +} +else +{ + $dlext = "so"; +} -include("include/header.php"); -include_once("include/dcmconfig.php"); -include("include/dcmpostgis.php"); -include("include/dcmmaputil.php"); +if (!extension_loaded("MapScript")) +{ + dl("php_mapscript_48.$dlext"); +} +include '../include/header.php'; +include_once '../include/dcmconfig.php'; +include '../include/dcmpostgis.php'; +include '../include/dcmmaputil.php'; + $dcmPage = new DcmPage(basename(__FILE__)); $strDirection = (0 == strncmp($_SESSION['language'],'ar', 2)) ? 'rtl' : @@ -35,15 +50,15 @@ $_SESSION["WorkorderID"]=$_REQUEST["WorkorderID"]; } ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd"> -<html lang="<?= $_SESSION["language"] ?>"> +<html lang="<?php echo $_SESSION["language"] ?>"> <head> - <title><?= _("DCMMS Workorder"); ?></title> + <title><?php echo _("DCMMS Workorder"); ?></title> <link rel="stylesheet" href="dcmms.css" type="text/css" /> - <link rel="stylesheet" href="<?= $strDirection ?>.css" type="text/css" /> + <link rel="stylesheet" href="<?php echo $strDirection ?>.css" type="text/css" /> <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> </head> <body style="padding: 0px; margin: 0px; border: 0px; height: 18cm;" - dir="<?= (0 == strncmp($_SESSION['language'],'ar', 2)) ? 'rtl' : + dir="<?php echo (0 == strncmp($_SESSION['language'],'ar', 2)) ? 'rtl' : 'ltr' ?>" onload="if(window.print) window.print();"> <table border="1" summary="Header" width="100%" height="4%" cellspacing="0" cellpadding="0" nowrap="nowrap"> @@ -66,20 +81,20 @@ $row = pg_fetch_array($result); ?> <td align="left" ><a style="vertical-align: middle;" - href="index.php?PHPSESSID=<?= session_id()?>"><img + href="index.php?PHPSESSID=<?php echo session_id()?>"><img style="vertical-align: middle; height=1cm;" - src="<?= $_SESSION["DCMMSLogoSmall"]?>" border="0" align="left" /> - </a><b style="vertical-align: middle;"><?= _("DCMMS") ?></b></td> - <td align=dir="<?= $strDirection ?>"> + src="<?php echo $_SESSION["DCMMSLogoSmall"]?>" border="0" align="left" /> + </a><b style="vertical-align: middle;"><?php echo _("DCMMS") ?></b></td> + <td align=dir="<?php echo $strDirection ?>"> - <b><span dir="<?= $strDirections ?>"><?= sprintf( + <b><span dir="<?php echo $strDirections ?>"><?php echo sprintf( _("%s %s Workorder # %s Created %s "), _($_SESSION["strOrgName"]), ($row[6] == '' ? ' ' : _($row[6])), $_SESSION["WorkorderID"], '<span dir="ltr">'. ($row["receiveddate"] == '' ? ' ' : $row["receiveddate"]). '</span>'); ?></span></b> </td> - <td><img src="<?= $_SESSION["OrgLogoSmall"]?>" border="0" align="right" + <td><img src="<?php echo $_SESSION["OrgLogoSmall"]?>" border="0" align="right" style="height: 1cm" /></td> </tr> </table> @@ -137,16 +152,16 @@ $glrLayer->set("status", MS_OFF); showLayers($map, $_SESSION); $image=$map->draw(); - $image_url=$image->saveWebImage("MS_PNG", 1, 1, 0); + $image_url=$image->saveWebImage("MS_PNG", 1, 1, 0); ?> - <a href="index.php?PHPSESSID=<?= session_id()?>"><img src="<?= + <a href="index.php?PHPSESSID=<?php echo session_id()?>"><img src="<?php echo $image_url ?>" alt="Workorder Map" style="width: 20cm; height: 14cm;"/></a> <font size="1"> - <p><?= _("Actual Team:")?><br /> - <?=(_("Start Date and Time:"))?><br /> - <?=(_("Completion Date and Time:"))?><br /> - <?= _("Excavation Area in m<sup>2</sup>:") ?><br /> - <?= _("Supervisor Signature:") ?></p> + <p><?php echo _("Actual Team:")?><br /> + <?php echo(_("Start Date and Time:"))?><br /> + <?php echo(_("Completion Date and Time:"))?><br /> + <?php echo _("Excavation Area in m<sup>2</sup>:") ?><br /> + <?php echo _("Supervisor Signature:") ?></p> </font> </td> <td width=30% height=95% valign="top"> @@ -183,7 +198,7 @@ for($i=0; $i< pg_numrows($result); $i++) { $row = pg_fetch_row($result,$i); ?> <!-- TODO: create CSS box instead of checkbox --> - <nobr class="box"><input type="checkbox" class="squarebox" name="c1" value="c1" /> <?= + <nobr class="box"><input type="checkbox" class="squarebox" name="c1" value="c1" /> <?php echo str_replace(" ", " ", _($row[0])) ?></nobr> <?php } echo ("</div></td></tr>"); Modified: branches/ms4w/dcmms/htdocs/reports.php =================================================================== --- branches/ms4w/dcmms/htdocs/reports.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/reports.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,5 +1,6 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * reports.php - Links to all available reports * @@ -21,67 +22,67 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -@include("include/header.php"); -include("include/dcmpostgis.php"); +@include '../include/header.php'; +include '../include/dcmpostgis.php'; $dcmPage = new DcmPage(basename(__FILE__)); $dcmPage->header(_("Reports"),TRUE,"","documents.png"); ?> -<h2><?= _("Workorder") ?></h2> +<h2><?php echo _("Workorder") ?></h2> <ul> - <li><a href="workorder_status_report.php?PHPSESSID=<?= session_id()?>" - title="<?= _("Create workorder status report") ?>"><?= + <li><a href="workorder_status_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create workorder status report") ?>"><?php echo _("Workorder Status Report")?></a></li> - <li><a href="received_workorders_report.php?PHPSESSID=<?= session_id()?>" - title="<?= _("Create workorders received within a period of time report") ?>"><?= + <li><a href="received_workorders_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create workorders received within a period of time report") ?>"><?php echo _("Workorders Received")?></a></li> - <li><a href="complaint_pending_report.php?PHPSESSID=<?= session_id()?>" - title="<?= _("Create pending complaints report") ?>"><?= + <li><a href="complaint_pending_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create pending complaints report") ?>"><?php echo _("Pending Complaints Report")?></a></li> - <li><a href="Pending_by_team_report.php" title="<?= - _("Displays all pending workorders of every team.")?>"><?= + <li><a href="Pending_by_team_report.php" title="<?php echo + _("Displays all pending workorders of every team.")?>"><?php echo _("Pending Workorders by Team Report") ?></a></li> - <li><a href="query_workorder_status.php?PHPSESSID=<?= session_id()?>" - title="<?= _("Create workorder query report") ?>"><?= + <li><a href="query_workorder_status.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create workorder query report") ?>"><?php echo _("Query Workorder Status")?></a></li> - <li><a href="aging_report.php" title="<?= - _("Create an workorder aging report.")?>"><?= _("Aging Report") ?></a></li> + <li><a href="aging_report.php" title="<?php echo + _("Create an workorder aging report.")?>"><?php echo _("Aging Report") ?></a></li> </ul> -<h2><?= _("Maintenance") ?></h2> +<h2><?php echo _("Maintenance") ?></h2> <ul> - <li><a href="maintenance_by_team_report.php?PHPSESSID=<?= session_id()?>" - title="<?= _("Create Report of Compleated workorders by team") ?>"><?= + <li><a href="maintenance_by_team_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create Report of Compleated workorders by team") ?>"><?php echo _("Maintenance by Team")?></a></li> - <li><a href="response_time_report.php?PHPSESSID=<?= session_id()?>" - title="<?= _("Create response time report") ?>"><?= + <li><a href="response_time_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create response time report") ?>"><?php echo _("Response Time Report")?></a></li> - <li><a href="excavation_report.php?PHPSESSID=<?= session_id()?>" - title="<?=_("Create excavation report")?>"><?= + <li><a href="excavation_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create excavation report")?>"><?php echo _("Excavation Report")?></a></li> - <li><a href="resource_report.php?PHPSESSID=<?= session_id()?>" - title="<?=_("Create resource report")?>"><?= + <li><a href="resource_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create resource report")?>"><?php echo _("Resource Report")?></a></li> - <li><a href="broken_seals_report.php?PHPSESSID=<?= session_id()?>" - title="<?=_("Create a report on broken meter seals.")?>"><?= + <li><a href="broken_seals_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create a report on broken meter seals.")?>"><?php echo _("Broken Seals Report")?></a></li> - <li><a href="quantity_report.php" title="<?= - _("Create an quantity report.")?>"><?= _("Quantity Report") ?></a></li> + <li><a href="quantity_report.php" title="<?php echo + _("Create an quantity report.")?>"><?php echo _("Quantity Report") ?></a></li> </ul> -<h2><?= _("Other") ?></h2> +<h2><?php echo _("Other") ?></h2> <ul> - <li><a href="full_report.php?PHPSESSID=<?= session_id() ?>" - title="<?= _("Create a full report for a selected period of time") ?>"><?= + <li><a href="full_report.php?PHPSESSID=<?php echo session_id() ?>" + title="<?php echo _("Create a full report for a selected period of time") ?>"><?php echo _("Full Report") ?></a></li> - <li><a href="quality_control_report.php?PHPSESSID=<?= session_id()?>" - title="<?=_("Create a quality control report")?>"><?= + <li><a href="quality_control_report.php?PHPSESSID=<?php echo session_id()?>" + title="<?php echo _("Create a quality control report")?>"><?php echo _("Quality Control Report")?></a></li> - <li><a href="monthly_management_report.php" title="<?= - _('Create an executive summary.')?>"><?= + <li><a href="monthly_management_report.php" title="<?php echo + _('Create an executive summary.')?>"><?php echo _('Monthly Management Report') ?></a></li> <li><a href="Team_report.php" - title="<?=_("Displays all the teams")?>"><?= + title="<?php echo _("Displays all the teams")?>"><?php echo _("Team Report")?></a></li> </ul> <?php Modified: branches/ms4w/dcmms/htdocs/workorderlist.php =================================================================== --- branches/ms4w/dcmms/htdocs/workorderlist.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/workorderlist.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -25,12 +25,12 @@ * \todo Delete action. * \todo Avoid redirection. */ -require_once('include/dcmmspage.php'); -require_once('include/dcmmspear.php'); -require_once('Pager/Pager.php'); -require_once('DB/DataObject.php'); -require_once('DB/DataObject/FormBuilder.php'); -require_once('HTML/QuickForm/Renderer/Default.php'); +require_once '../include/dcmmspage.php'; +require_once '../include/dcmmspear.php'; +require_once 'Pager/Pager.php'; +require_once 'DB/DataObject.php'; +require_once 'DB/DataObject/FormBuilder.php'; +require_once 'HTML/QuickForm/Renderer/Default.php'; $dcmPage = new DcmmsPage(_('Workorder')); $dcmPage->setIconImage('todo.png'); @@ -156,9 +156,6 @@ "Resource"=>"resource.php?table=Staff&PHPSESSID=".session_id(). "&action=select_workorder&WorkorderID=" ); - if(2 == $_REQUEST["status"]) { - $arreActions = array_merge($arreActions, $arrCompletedActions); - } $objDbTablePager = new DbTablePager($dcmPage->postgis->db, $query, array('class' => 'tab_one_panel')); $objDbTablePager->addRows(); Modified: branches/ms4w/dcmms/htdocs/workorderpage.php =================================================================== --- branches/ms4w/dcmms/htdocs/workorderpage.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/workorderpage.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -25,11 +25,11 @@ * \todo Value history. * \todo Value changes in select fields are not recorded. */ -require_once('include/dcmmspage.php'); -require_once('include/dcmmspear.php'); -require_once('DB/DataObject.php'); -require_once('DB/DataObject/FormBuilder.php'); -require_once('HTML/QuickForm/Renderer/Default.php'); +require_once '../include/dcmmspage.php'; +require_once '../include/dcmmspear.php'; +require_once 'DB/DataObject.php'; +require_once 'DB/DataObject/FormBuilder.php'; +require_once 'HTML/QuickForm/Renderer/Default.php'; /** * Check for the ID Modified: branches/ms4w/dcmms/htdocs/zoom.php =================================================================== --- branches/ms4w/dcmms/htdocs/zoom.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/htdocs/zoom.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -26,9 +26,9 @@ * \todo AJAX implementation of search. */ -require_once('include/dcmmspage.php'); -require_once('include/dcmpostgis.php'); -require_once('include/dcmmspear.php'); +require_once('../include/dcmmspage.php'); +require_once('../include/dcmpostgis.php'); +require_once('../include/dcmmspear.php'); require_once('HTML/QuickForm.php'); require_once('HTML/QuickForm/select.php'); Modified: branches/ms4w/dcmms/include/dataobject/Landmark.php =================================================================== --- branches/ms4w/dcmms/include/dataobject/Landmark.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/include/dataobject/Landmark.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -21,7 +21,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -require_once('include/dataobject/dcmmsdataobject.php'); +require_once('../include/dataobject/dcmmsdataobject.php'); class DataObject_Landmark extends DcmmsDataObject { ###START_AUTOCODE Modified: branches/ms4w/dcmms/include/dcmmap.php =================================================================== --- branches/ms4w/dcmms/include/dcmmap.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/include/dcmmap.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,10 +1,12 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * dcmmap.php - PHP/Mapscript functions * * Copyright (C) 2000 DM Solutions Group Inc. * Copyright (C) 2003,2004 DORSCH Consult, NGWA + * Copyright (C) 2006 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 @@ -21,8 +23,8 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -require_once("dcmmaputil.php"); -require_once("plugin/identifyplugin.php"); +require_once 'dcmmaputil.php'; +require_once '../plugin/identifyplugin.php'; if(sizeof($_POST) > 0) { $HTTP_FORM_VARS = $_POST; @@ -31,15 +33,6 @@ } -/* ==================================================================== */ -/* Find out whether GIF is supported... if not falback on PNG/JPG */ -/* ==================================================================== */ -if(strpos( ms_GetVersion(), "OUTPUT=GIF") > 0 ) { - $gImagesFmt = "MS_GIF"; -} else { - $gImagesFmt = "MS_PNG"; -} - /************************************************************************/ /* function GMap75CheckClick() */ /* */ Modified: branches/ms4w/dcmms/include/dcmmspage.php =================================================================== --- branches/ms4w/dcmms/include/dcmmspage.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/include/dcmmspage.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -130,9 +130,9 @@ } else { set_include_path(get_include_path().PATH_SEPARATOR.'./include'); } - require_once('include/dcmconfig.php'); + require_once('../include/dcmconfig.php'); require_once('Log.php'); - require_once('include/dcmmspostgis.php'); + require_once('../include/dcmmspostgis.php'); /** * Set the locale @@ -158,7 +158,7 @@ echo("Failed to set the numeric locale"); } - bindtextdomain("dcmms", $strPathInDcmms."locale"); + bindtextdomain('dcmms', $strPathInDcmms.'../locale'); bind_textdomain_codeset ("dcmms","UTF-8"); textdomain("dcmms"); @@ -308,7 +308,7 @@ if(!isset($_SESSION['language'])) { $_SESSION['language'] = 'en'; } - $dirName = $this->strPathInDcmms.'locale'; + $dirName = $this->strPathInDcmms.'../locale'; $d = dir($dirName); while($entry = $d->read()) { if($entry != '.' && $entry != '..' && $entry != 'CVS' && Modified: branches/ms4w/dcmms/include/header.php =================================================================== --- branches/ms4w/dcmms/include/header.php 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/include/header.php 2006-08-11 20:28:17 UTC (rev 1134) @@ -1,5 +1,6 @@ <?php -/* DCMMS -- DC Maintenance Management System +/** + * DCMMS -- DC Maintenance Management System * * header.php - header page for the DCMMS pages * @@ -324,15 +325,17 @@ $this->logger->log($strMessage, LOG_INFO); } - // print a HTML text input and fill it with values - // strName is the name used for the label - // arrRecord is an associative array with the default value: arrRecord[strName] - // strValue is a default value for the field (optional) - // strHelp is the onmouseover help message (optional) - // strLabel is the label to be used (optional) - // strType is the type of the input, e.g. password (optional) - // boolLtr is whether the text direction is left-to-right (optional) - // boolDisabled allows to disable the text input field (optional) + /** + * print a HTML text input and fill it with values + * strName is the name used for the label + * arrRecord is an associative array with the default value: arrRecord[strName] + * strValue is a default value for the field (optional) + * strHelp is the onmouseover help message (optional) + * strLabel is the label to be used (optional) + * strType is the type of the input, e.g. password (optional) + * boolLtr is whether the text direction is left-to-right (optional) + * boolDisabled allows to disable the text input field (optional) + */ function printTextInput($strName, $arrRecord, $strValue = "", $strHelp="", $strLabel = "", $strType = "", $boolLtr = true, $boolDisabled = false) { ?> <tr><td class="label"><?php @@ -345,7 +348,7 @@ <?php if ($strType != ""){?> <input dir="<?php echo $boolLtr ? "ltr": "rtl" ?>" type=<?php echo $strType - ?> name="<?php $strName; ?>" value="<?php + ?> name="<?php echo $strName; ?>" value="<?php } else {?> <input dir="<?php echo $boolLtr ? "ltr": "rtl" ?>" type="text" name="<?php echo $strName ?>" value="<?php Modified: branches/ms4w/dcmms/locale/ar/LC_MESSAGES/dcmms.po =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/locale/ar_SY/LC_MESSAGES/dcmms.po =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/locale/en/LC_MESSAGES/dcmms.po =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/locale/fr/LC_MESSAGES/dcmms.po =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/locale/it/LC_MESSAGES/dcmms.po =================================================================== --- branches/ms4w/dcmms/locale/it/LC_MESSAGES/dcmms.po 2006-08-11 19:02:14 UTC (rev 1133) +++ branches/ms4w/dcmms/locale/it/LC_MESSAGES/dcmms.po 2006-08-11 20:28:17 UTC (rev 1134) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: DCMMS 1.0.4\n" "POT-Creation-Date: 2003-07-15 07:45+0200\n" -"PO-Revision-Date: 2006-06-24 10:32+0200\n" +"PO-Revision-Date: 2006-08-11 20:45+0200\n" "Last-Translator: Steffen Macke <Ste...@do...>\n" "Language-Team: IT <Ste...@do...>\n" "MIME-Version: 1.0\n" Modified: branches/ms4w/dcmms/locale/th/LC_MESSAGES/dcmms.po =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-11 16:02:37
|
Revision: 1117 Author: sdteffen Date: 2006-08-11 09:02:16 -0700 (Fri, 11 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1117&view=rev Log Message: ----------- These files have been moved to htdocs. Removed Paths: ------------- branches/ms4w/dcmms/excavation_report.php branches/ms4w/dcmms/full_report.php branches/ms4w/dcmms/index.php branches/ms4w/dcmms/landmark.php branches/ms4w/dcmms/logon.php branches/ms4w/dcmms/maintenance.php branches/ms4w/dcmms/maintenance_by_team_report.php branches/ms4w/dcmms/map.php branches/ms4w/dcmms/monthly_management_report.php branches/ms4w/dcmms/pending_by_team_report.php branches/ms4w/dcmms/print_workorder.php branches/ms4w/dcmms/quality_control_report.php branches/ms4w/dcmms/quantity_report.php branches/ms4w/dcmms/query_workorder_status.php branches/ms4w/dcmms/received_workorders_report.php branches/ms4w/dcmms/reports.php Deleted: branches/ms4w/dcmms/excavation_report.php =================================================================== --- branches/ms4w/dcmms/excavation_report.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/excavation_report.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,133 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * excavation_report.php - Summary of Excavations - * - * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); -require_once("include/dcmmspostgis.php"); -require_once("HTML/QuickForm.php"); -require_once("HTML/QuickForm/select.php"); -require_once('HTML/QuickForm/group.php'); -require_once('HTML/QuickForm/SelectFilter.php'); -require_once("HTML/QuickForm/text.php"); -require_once("HTML/Common.php"); -require_once("HTML/Table.php"); -require_once("include/dcmmspear.php"); - -$dcmPage = new DcmmsPage(_("Excavation Report")); -$dcmPage->setIconImage("documents.png"); -$dcmPage->setPageName(basename(__FILE__)); - -/** - * \todo subtype HTML_QuickForm - */ -$form = new HTML_QuickForm("ExcavationForm"); -$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). - ">*</span><span style=".quote("font-size:80%;")."> ". - _("denotes required field")."</span>"); -$form->SetDefaults(array("resolution_x" => "100", - "resolution_y" => "100")); -$dcmPage->add("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. - "\" border=\"0\" alt=\"Organization Logo\" />"); -$dcmPage->add("<p>".sprintf( - _("A %sReport%s summarizing excavations for a period of time.") - ,"<a href=\"reports.php\">","</a>")."</p>"); - -$strQuery = "select CodedValue,". - $dcmPage->postgis->localize('Name', 'AdministrativeArea'). - " from AdministrativeArea"; -$arrArea = array_merge(array(0 => _('All Areas')), - $dcmPage->postgis->db->getAssoc($strQuery)); -$selArea = new HTML_QuickForm_select("AdministrativeArea", - _("Administrative Area:"), $arrArea); -$selAreaFilter = new HTML_QuickForm_SelectFilter('AdministrativeAreaFilter', - _('Administrative Area Filter:'),array(),'AdministrativeAreaGroup[AdministrativeArea]'); -$grpArea = new HTML_QuickForm_Group('AdministrativeAreaGroup', - _('Administrative Area:'), array($selArea, $selAreaFilter)); -$form->addElement($grpArea); -$form->addElement(new HTML_QuickForm_text("StartDate", _("Start Date:")), - array("maxlength" => 16)); -$form->addElement(new HTML_QuickForm_text("EndDate", _("End Date:")), - array("maxlength" => 16)); -$form->addElement("submit", null, _("Create Report")); -/** - * Default values - */ -$form->setDefaults(array("StartDate" => $dcmPage->getTimestamp(0,1), - "EndDate" => $dcmPage->getTimestamp())); -/** - * Validate input. - */ -$form->applyFilter("StartDate", "trim"); -$form->applyFilter("EndDate", "trim"); -$form->addRule("AdministrativeArea", - _("Please select the administrative area."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Please enter the start date."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("Please enter the end date."), "required", - null, $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Start date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("End date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -/** - * \todo date validation - */ -$dcmPage->add($form->toHtml()); - -/** - * Handle request - */ -if($form->validate()) { - $arrAdministrativeArea = $form->exportValue('AdministrativeAreaGroup'); - $intAdministrativeArea = $arrAdministrativeArea['AdministrativeArea']; - $strQuery = 'select Workorder.ID as WorkorderID, Workorder.LocationDescription,'. - 'MaterialSubtype.Description as Type,'. - 'Material.Unit as Quantity, MaterialSubtype.Unit as Unit from '. - 'Workorder, Maintenance, Material, MaterialSubtype '. - 'where '. - (($intAdministrativeArea == 0)?'':("Workorder.AdministrativeArea = '". - $intAdministrativeArea."' and ")). - " Maintenance.CompletionDate ". - "> '".$form->exportValue('StartDate')."' and Maintenance.CompletionDate < '". - $form->exportValue('EndDate')."' and Workorder.ID = Maintenance.ID and ". - 'Maintenance.ID = Material.MaintenanceOID and Material.Subtype = '. - 'MaterialSubtype.Subtype and Material.Subtype > 100 order by Workorder.ID'; - - //echo($strQuery); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - /** - * \todo Use dcmmstranslation(). - */ - $objTable->gettextColumn(2); - $objTable->gettextColumn(4); - $dcmPage->add($objTable->toHtml()); -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> Deleted: branches/ms4w/dcmms/full_report.php =================================================================== --- branches/ms4w/dcmms/full_report.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/full_report.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,197 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * full_report.php - Full report of DCMMS data for a period of time - * - * Copyright (C) 2003, 2004 DORSCH Consult, NGWA - * Copyright (C) 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); -require_once("include/dcmmspostgis.php"); -require_once("HTML/QuickForm.php"); -require_once("HTML/QuickForm/select.php"); -require_once("HTML/QuickForm/text.php"); -require_once("HTML/Common.php"); -require_once("HTML/Table.php"); -require_once("DB.php"); -require_once("include/dcmmspear.php"); - -/** - * \todo Use dcmmstranslation() for WorkorderSubtype.Description. - */ - -$dcmPage = new DcmmsPage(_("Full Report")); -$dcmPage->setIconImage("documents.png"); -$dcmPage->setPageName(basename(__FILE__)); - -$form = new HTML_QuickForm("FullReportForm"); -$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). - ">*</span><span style=".quote("font-size:80%;")."> ". - _("denotes required field")."</span>"); -$form->SetDefaults(array("resolution_x" => "100", - "resolution_y" => "100")); - -$dcmPage->add("<img class=\"org_logo_report\" src=\"".$_SESSION["OrgLogoSmall"]. - "\" border=\"0\" alt=\"Organization Logo\" />"); -$dcmPage->add("<p>".sprintf( - _("A DCMMS %sReport%s that shows all of the recorded data for a period of time.") - ,"<a href=\"reports.php\">","</a>")."</p>"); - -$strQuery = "select 0, '[Select One]' union all select CodedValue,". - $dcmPage->postgis->localize('Name', 'AdministrativeArea'). - " from AdministrativeArea"; -$arrArea = $dcmPage->postgis->db->getAssoc($strQuery); -foreach($arrArea as $strKey => $strValue) { - $arrArea[$strKey] = _($strValue); -} -$selArea = new HTML_QuickForm_select("AdministrativeArea", _("Administrative Area:"), - $arrArea); -$strQuery = "select 0, '[Select One]' union all select CodedValue,". - "Description from NetworkDomain"; -$arrNetwork = $dcmPage->postgis->db->getAssoc($strQuery); -foreach($arrNetwork as $strKey => $strValue) { - $arrNetwork[$strKey] = _($strValue); -} -$selNetwork = new HTML_QuickForm_select("Network", _("Network Type:"), - $arrNetwork); -$form->addElement($selNetwork); -$form->addElement($selArea); -$form->addElement(new HTML_QuickForm_text("StartDate", _("Start Date:")), - array("maxlength" => 16)); -$form->addElement(new HTML_QuickForm_text("EndDate", _("End Date:")), - array("maxlength" => 16)); -$form->addElement("submit", null, _("Create Report")); -/** - * Default values - */ -$form->setDefaults(array("StartDate" => $dcmPage->getTimestamp(0,1), - "EndDate" => $dcmPage->getTimestamp())); -/** - * Validate input. - */ -$form->applyFilter("StartDate", "trim"); -$form->applyFilter("EndDate", "trim"); -$form->addRule("StartDate", - _("Please provide the start date."), "required", null, - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("Please provide the end date."), "required", null, - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("StartDate", - _("Start date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("EndDate", - _("End date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -/** - * \todo date validation - */ -$dcmPage->add($form->toHtml()); - -/** - * Handle request - */ -if($form->validate()) { - /** - * Find all workorders to display - */ - $strQuery = "select ID from WorkorderView left outer join AdministrativeArea". - " on AdministrativeArea.Name = WorkorderView.AdministrativeArea ". - "left outer join NetworkDomain on ". - "NetworkDomain.Description = WorkorderView.Network where ". - "ReceivedDate > '".$form->exportValue("StartDate"). - "' and ReceivedDate < '".$form->exportValue("EndDate")."'"; - $arrWhere = array("AdministrativeArea" => " and ". - "AdministrativeArea.CodedValue = ", - "Network" => " and NetworkDomain.CodedValue = "); - foreach($arrWhere as $strField => $strWhere) { - $strValue = $form->exportValue($strField); - if(($strValue != null)&&($strValue != 0)) { - $strQuery = $strQuery.$strWhere.$strValue; - } - } - - //echo($strQuery); - $rsoResult = $dcmPage->postgis->db->query($strQuery); - if(DB::isError($rsoResult)) { - die($rsoResult->getMessage()); - } - //print_r($rsoResult); - while($row = $rsoResult->fetchRow()) { - $dcmPage->add("<h2>"._("Workorder #").$row[0]."</h2>"); - $strQuery = "select ID, Complainant, Subtype as Type, Telephone,". - "LocationDescription, ". - $dcmPage->postgis->formatTimestamp("ReceivedDate"). - ' as ReceivedDate, Note, dcmmstranslation(\''.$_SESSION['language']. - '\', AdministrativeArea) as AdministrativeArea,'. - 'dcmmstranslation(\''.$_SESSION['language']. - '\', Team) as Team, Network as NetworkType from WorkorderView where ID='.$row[0]; - // echo($strQuery); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $objTable->gettextColumn(2); - $objTable->gettextColumn(7); - $objTable->gettextColumn(8); - $objTable->gettextColumn(9); - $dcmPage->add($objTable->toHtml()); - $arrQueries = array("Maintenance" => "select Subtype as Type, Diameter1,". - 'Material1,Diameter2,Material2,Cause,dcmmstranslation(\''. - $_SESSION['language'].'\', Team) as Team, Depth,'. - $dcmPage->postgis->formatTimestamp("StartDate"). - " as StartDate, ".$dcmPage->postgis->formatTimestamp("CompletionDate"). - " as CompletionDate,". - "LeakLocation,Note, Status from MaintenanceView where ID=".$row[0], - - "Staff" => "select ID, Type, Value as Amount, Unit, CostCenter ". - "from StaffView where MaintenanceOID=".$row[0], - - "Material" => "select ID, Type, Diameter, Value as Amount, Unit, ". - "CostCenter from MaterialView where MaintenanceOID=".$row[0], - - "Equipment" => "select ID, Type, Value as Amount, Unit, CostCenter ". - "from EquipmentView where MaintenanceOID=".$row[0], - - "Broken Seal" => "select ID, Reason, Responsible, SubscriberOID, ". - "SerialNumber from Seal where MaintenanceOID=".$row[0] - ); - $arrLocalization = array('Maintenance' => array(0, 2, 4, 5, 10), - 'Staff' => array(1, 3), - 'Material' => array(1, 4), - 'Equipment' => array(1, 3), - 'Broken Seal' => array()); - foreach($arrQueries as $strTable => $strQuery) { - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $arrLocale = $arrLocalization[$strTable]; - foreach($arrLocale as $numColumn) { - $objTable->gettextColumn($numColumn); - } - if($objTable->getRowCount() > 1) { - $dcmPage->add("<h3>"._($strTable)."</h3>"); - $dcmPage->add($objTable->toHtml()); - } - } - $dcmPage->add("<p> </p>"); - } - -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> Deleted: branches/ms4w/dcmms/index.php =================================================================== --- branches/ms4w/dcmms/index.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/index.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,135 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * index.php - DCMMS main page - * - * Copyright (C) 2003,2004 DORSCH Consult, NGWA - * Copyright (c) 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - - @include("include/header.php"); - include("include/dcmpostgis.php"); - $dcmPage = new DcmPage(basename(__FILE__)); - $dcmPage->header(_("DC Maintenance Management System")); - $arrIDs = Array("NewWorkorderID", "WorkorderID"); - foreach($arrIDs as $strID) { - $_SESSION[$strID] = null; - unset($_SESSION[$strID]); - } - - /** - * Print a link that displays an image and text for the onMouseOver event. - * @param $strURL is the linked URL. - * @param $strLabel is the link label. - * @param $strHelp is the onmouseover help message (optional). - * @param $strImage is the onmouseover image (optional) - * @return nothing. - */ - function echoOnMouseOverLink($strURL, $strLabel, $strHelp="", $strImage="") { - GLOBAL $strPathInDcmms; ?> - <a href="<?= $strURL ?>" title="<?= $strHelp ?>"><?= $strLabel ?> - <span><img src="<?= $strPathInDcmms ?>images/<?= $strImage ?>" /> - <br /> <?= $strHelp ?></span></a> <?php - } - -?> - -<style type="text/css"> -</style> - -<p><?= _("Welcome to the DC Maintenance Management System.") ?></p> - -<?php - -/** - * Check if data model is up-to-date - */ - $strQuery = "select Description from CauseDomain where CodedValue = 7"; - $objResult = pg_query($strQuery); - if((!$objResult)||(pg_numrows($objResult) == 0)) { ?> - <p class="important"><?= _("Warning: Your data model might be outdated."). - " "._("Please contact your administrator.") ?></p> <?php - } ?> - -<ul id="indexlist"> - <li><?php echoOnMouseOverLink("zoom.php", _("Zoom"), - _("Click this link to zoom to a landmark."), - "zoom_to_landmark.png"); ?></li> - <li><?php echoOnMouseOverLink("map.php", _("Map"), - _("Click this link to view the interactive DCMMS map."), - "gnome-starthere.png"); ?></li> - <li><?php echoOnMouseOverLink("workorderlist.php?PHPSESSID=".session_id(). - "&action=list&status=1", _("Workorders"), - _("Click this link to manage pending and completed workorders."), - "todo.png") ?></li> - <li><?php echoOnMouseOverLink("reports.php", _("Reports"), - _("Click this link to select one of the DCMMS reports."), - "documents.png"); ?></li> - <li><?php echoOnMouseOverLink("about.php", _("About"), - _("Click this link to view the DCMMS copyright information."), - "about.png") ?></li> -</ul> - -<?php - if(pg_is_administrator($_SESSION["UserName"])) { ?> - - <h2><img alt="<?= _("Administration") ?>" src="<?= $strPathInDcmms - ?>images/administration-32.png" /><?= _("Administration") ?></h2> - <div id="contentleft"> - <ul> - <li><?php echoOnMouseOverLink("admin/shapefile_loader.php", - _("Shapefile Loader"), - _("Load zipped files in shapefile format to the DCMMS geodatabase."), - "shapefile_loader.png"); ?></li> - <li><?php echoOnMouseOverLink("admin/shapefile_dumper.php", - _("Shapefile Dumper"), - _("Download zipped shapefiles from the DCMMS geodatabase."), - "shapefile_dumper.png"); ?></li> - <li><?php echoOnMouseOverLink("admin/translation_management.php", - _("Translation Management"), - _("Manage translations on the database side."), - "language.png") ?></li> - <li><?php echoOnMouseOverLink("admin/setup.php", - _("Setup Information"), - _("Information about the DCMMS configuration."), - "serviceconf-48.png") ?></li> - </ul> - </div> - <div id="contentright"> - <ul> - <li><?php echoOnMouseOverLink("admin/user_management.php", - _("User Management"), - _("Add or remove DCMMS users. Change passwords and access rights."), - "system-config-users-48.png") ?></li> - <li><?php echoOnMouseOverLink("admin/team_management.php", - _("Team Management"), _("Add or edit maintenance teams."), - "team_management.png") ?></li> - <li><?php echoOnMouseOverLink("admin/remove_temporary_files.php", - _("Remove Temporary Files"), _("Clean the temp directory."), - "remove_temporary_files.png") ?></li> - <li><?php echoOnMouseOverLink("admin/purge_workorder.php", - _("Purge Workorder"), _("Delete a workorder."), - "purge_workorder.png") ?></li> - <li><?php echoOnMouseOverLink("admin/analysis.php", - _("Analysis"), _("Analyze the data."), "exec.png") ?></li> - </ul> - </div> - <br clear="all" /> <?php - } ?> - <div style="margin-top: 10em;"> </div> <?php -$dcmPage->footer("$Date$Empty"); ?> - Deleted: branches/ms4w/dcmms/landmark.php =================================================================== --- branches/ms4w/dcmms/landmark.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/landmark.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,260 +0,0 @@ -<?php -/** - * DCMMS -- DC Maintenance Management System - * - * Landmark.php - add, edit, delete landmarks - * - * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA - * Copyright (C) 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * This page allows to pass the following actions via the request: - * update - update a landmark record - invoked from landmark.php; header - * forwards to zoom.php - * delete - delete a landmark record - invoked from landmark.php; header - * forwards to zoom.php - * edit - display a form to change the landmark information; - * invoked from zoom.php - * view - display the landmark information; invoked from map.php - * insert - insert a new landmark (spatial information) and allow to edit - * the tabular information; will add the id key to the - * request array if necessary; invoked from map.php - * confirmDelete - display the landmark information, allow to confirm deletion; - * invoked from zoom.php - * map - select landmark surroundings and show on map - * \todo Guard administrator-only functions. - */ -require_once("include/dcmmspage.php"); -require_once("include/dcmpostgis.php"); -require_once("include/dcmmspear.php"); -require_once("HTML/QuickForm.php"); -require_once("DB/DataObject/FormBuilder.php"); -require_once("DB/DataObject.php"); -require_once("PEAR.php"); - -/** - * \todo Refactor. - * \todo Remove dead code. - */ -$options = &PEAR::getStaticProperty('DB_DataObject', 'options'); -$config = parse_ini_file('conf/dataobject.ini', TRUE); -$options = $config['DB_DataObject']; -$_DB_DATAOBJECT_FORMBUILDER['CONFIG'] = $config['DB_DataObject_FormBuilder']; -$options['database'] = 'pgsql://'.$_SESSION['UserName'].':'. - $_SESSION['Password'].'@'.'localhost/'.$_SESSION['strDataBase']; -$dcmPage = new DcmmsPage(_('Landmark')); -/** - * \todo: Landmark icon - * $dcmPage->setIconImage('team_management.png'); - */ -$objUser = DB_DataObject::factory('Dcmmsuser'); -$objUser->get('name', $_SESSION['UserName']); -$strMessage = ''; -/** - * Handle actions that result in forwarding. - */ -if(array_key_exists("action", $_REQUEST)) { - switch($_REQUEST["action"]) { - case "map" : - if(array_key_exists("gid", $_REQUEST)) { - $query = "select X(the_geom), Y(the_geom) from Landmark where gid=". - $_REQUEST["gid"]; - //echo($query); - $result = pg_query($query); - $numrows = pg_numrows($result); - if($numrows > 0) { - for($i=0; $i<$numrows; $i++) { - $r = pg_fetch_row($result, $i); - $minx = $r[0]-75; - $miny = $r[1]-75; - $maxx = $r[0]+75; - $maxy = $r[1]+75; - header("location: map.php?PHPSESSID=".$_REQUEST["PHPSESSID"]. - "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+". - "View&minx=$minx&miny=$miny&maxx=$maxx&maxy=$maxy&imagewidth=400&". - "imageheight=300&CMD=NEW_WORKORDER". - "&KEYMAPXSIZE=120&KEYMAPYSIZE=90&MapSize=400%2C300&PREVIOUS_MODE=1"); - exit(); - } - } - } else { - $dcmPage->importantParagraph( - _("FATAL ERROR: No gid provided in request.")); - die(); - } - break; - case "updatelocation" : - if($_POST["subtype"] != 0){ - $strUpdate = "update Landmark set subtype = ".$_POST["subtype"]; - foreach($_SESSION["arrLanguages"] as $strLanguage) { - $strUpdate = $strUpdate.",".$strLanguage. - "name = '".addslashes($_POST['name'])."'"; - } - $strUpdate = $strUpdate.",the_geom = GeometryFromText('POINT(". - $_REQUEST["x"]." ".$_REQUEST["y"].")',-1)"; - - $strUpdate = $strUpdate." where gid = ".$_REQUEST['gid']; - //echo($strUpdate); - $objResult = pg_query($strUpdate); - if($objResult) { - $dcmPage->logger->log($strUpdate); - $strMessage = _("Successfully updated the landmark record."); - $strID = $_REQUEST['gid']; - $strNewAction = "updatelocation"; - $arrUpdates = array("AdministrativeArea"=> - "update landmark set administra = (select max(". - "administrativearea.codedvalue) from administrativearea, landmark ". - "where landmark.gid=$strID and ". - "administrativearea.the_geom && 'BOX3D(".($_REQUEST["x"]-1)." ". - ($_REQUEST["y"]-1).",".($_REQUEST["x"]+1)." ".($_REQUEST["y"]+1). - ")'::box3d and ". - "distance(administrativearea.the_geom, landmark.the_geom) = 0 ". - ") where gid=$strID", "Village" => - "update landmark set village = (select max(". - "village.codedvalue) from village,landmark where ". - " landmark.gid=$strID and ". - "administrativearea.the_geom && 'BOX3D(".($_REQUEST["x"]-1)." ". - ($_REQUEST["y"]-1).",".($_REQUEST["x"]+1)." ".($_REQUEST["y"]+1). - ")'::box3d and ". - "distance(village.the_geom, landmark.the_geom) = 0 ". - ") where gid=$strID"); - foreach(array_keys($arrUpdates) as $strArea) { - // echo($arrUpdates[$strArea]); - $objResult = pg_query($arrUpdates[$strArea]); - if(!$objResult) { - $strMessage = $strMessage." ".sprintf( - _("Failed to update the field '%s'."), _($strArea)); - } - } - $strLocation = "landmark.php?action=edit&PHPSESSID=". - session_id()."&message=". - urlencode($strMessage)."&gid=".$_REQUEST['gid']; - header("Location: ".$strLocation); - exit(); - } else { - $strMessage = _("Failed to update the landmark record."); - } - } else { - $strMessage = _("Please select the landmark type."); - } - break; - case "delete" : - $delete = "delete from landmark where gid = ".$_REQUEST["gid"]; - $result = pg_query($delete); - if($result) { - $dcmPage->logger->log($delete); - $strMessage = _("Successfully deleted the landmark."); - header("Location: zoom.php?PHPSESSID=".session_id()."&message=". - urlencode($strMessage)); - exit(); - } else { - $strMessage = _("Deleting the landmark failed."); - } - - break; - } -} -$objLandmark = DB_DataObject::factory('Landmark'); -/** - * Get landmark record if GID was provided. - */ -if(isset($_REQUEST['gid'])&&($_REQUEST['gid'] != '')) { - $objLandmark->get('gid', $_REQUEST['gid']); - $objOriginalLandmark = $objLandmark; -} -$objLandmark->getXyFromRequest(); - -$objLandmarkBuilder = DB_DataObject_FormBuilder::create($objLandmark, - array()); -if(PEAR::isError($objLandmarkBuilder)) { - die($objLandmarkBuilder->getMessage()); -} -$objLandmarkForm = $objLandmarkBuilder->getForm(); -if($objLandmarkForm->validate()) { - $objResult =& $objLandmarkForm->process(array(&$objLandmarkBuilder, - 'processForm'), false); - if($objResult) { - $dcmPage->addMessage(_('Successfully updated the landmark record.')); - if(isset($objOriginalLandmark)) { - $objLandmark->logUpdateHistory($objOriginalLandmark); - $objLandmark->updateAreaFields($objOriginalLandmark); - } else { - $objLandmark->updateAreaFields(false); - } - } else { - $dcmPage->addMessage(_('Failed to update the landmark record.')); - } -} -if(isset($_REQUEST['action'])&&($_REQUEST['action'] == 'confirmDelete')) { - $objLandmarkForm->_attributes['action'] = 'landmark.php?action=delete'; -} -/** - * \todo This shouldn't be necessary, but needs testing. - */ -if(isset($_REQUEST['gid'])&&($_REQUEST['gid'] != '')) { - $objLandmark->gid = $_REQUEST['gid']; -} -$objLandmarkForm->setConstants(array('gid' => $objLandmark->gid, - 'administra' => $objLandmark->administra, 'village' => $objLandmark->village)); -if('t' != $objUser->islandmarkeditor) { - $objLandmarkForm->freeze(); -} -if(isset($objLandmark->gid)&&(is_numeric($objLandmark->gid))) { - $dcmPage->add('<p>'.sprintf(_('View this landmark on the %smap%s.').'</p>', - '<a href="landmark.php?action=map&gid='. - $objLandmark->gid.'" title=\"'. - _('Click this link to view the displayed landmark on the map.').'">', - '</a>')); - - if(('t' == $objUser->islandmarkeditor)&& - ((!isset($_REQUEST['action'])|| - ($_REQUEST['action'] != 'confirmDelete')))) { - $dcmPage->add(sprintf(_('%sDelete%s this landmark.'), - '<p><a href="landmark.php?action=confirmDelete&gid='.$objLandmark->gid. - '" title="'._('Click this link to delete the landmark.').'">','</a>'). - '</p>'); - } -} -$dcmPage->add($objLandmarkForm->toHtml()); -/** - * Landmark name translations. - * \todo Make translation possible for normal users. - */ -if($dcmPage->postgis->isAdministrator($_SESSION['UserName'])) { - $objTranslation = DB_DataObject::factory('Translation'); - $objTranslation->term = $objLandmarkForm->exportValue('name'); - $objTranslation->find(); - $objTranslationTable = $objTranslation->getTable('<a href="../'. - basename(__FILE__).'?gid='.$objLandmarkForm->exportValue('gid').'">'. - _('Back to landmark').'</a>', 'admin/'); - $dcmPage->add('<h2>'.sprintf(_('Translations of "%s"'), - _('Name')).'</h2>'); - $dcmPage->add($objTranslationTable->toHtml()); -} -$objHistory = DB_DataObject::factory('History'); -$objHistory->tablename = 'landmark'; -if(isset($objLandmark->gid)) { - $objHistory->recordoid = $objLandmark->gid; - $objHistory->find(); - $objHistoryTable = $objHistory->getTable($objLandmarkForm); - $dcmPage->add('<h2>'._('Update History').'</h2>'); - $dcmPage->add($objHistoryTable->toHtml()); -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); -?> Deleted: branches/ms4w/dcmms/logon.php =================================================================== --- branches/ms4w/dcmms/logon.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/logon.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,208 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * index.php - log on and off - * - * Copyright (C) 2003 - 2005 DORSCH Consult, NGWA - * Copyright (C) 2005 DORSCH Consult - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * Required by DB_DataObject - */ -define("DB_DATAOBJECT_NO_OVERLOAD", 0); - -$strMessage = ""; - -$strWebtest = ""; -if(array_key_exists("webtest", $_REQUEST) && - ($_REQUEST["webtest"] == "initialize")) { - $strWebtest = "&webtest=initialize"; -} - -/** - * Perform startup checks to make sure that the installation is complete. - */ -$arrExtensions = array("MapScript", "gettext", "zip", "pgsql", "gd"); - -foreach($arrExtensions as $strExtension) { - if(!extension_loaded($strExtension)) { - die(sprintf(_("FATAL ERROR: PHP extension '%s' is not loaded."), - $strExtension)); - } -} -$arrPearFiles = array("Log" => "Log.php", "HTML_Common" => "HTML/Common.php", - "HTML_QuickForm" => "HTML/QuickForm.php", "HTML_Table" => "HTML/Table.php", - "Pager" => "Pager/Pager.php", - 'HTML_QuickForm_SelectFilter' => 'HTML/QuickForm/SelectFilter.php', - 'DB_DataObject_FormBuilder' => 'DB/DataObject/FormBuilder.php', - 'Image_Graph' => 'Image/Graph.php'); -foreach($arrPearFiles as $strPearPackage => $strPearInclude) { - require_once($strPearInclude); -} - -$arrConfigurationFiles = array('include/dcmconfig.php', 'conf/dataobject.ini', - 'conf/identifyplugin.ini'); -foreach($arrConfigurationFiles as $strConfigurationFile) { - if(!file_exists($strConfigurationFile)) { - die(sprintf(_('FATAL ERROR: Configuration file "%s" is missing.'), - $strConfigurationFile)); - } -} -if(array_key_exists("action", $_REQUEST)) { - switch($_REQUEST["action"]) { - case "logon_failure" : - $strMessage = $strMessage._("Logon failed."); - break; - case "database_down" : - @include_once("include/header.php"); - $strMessage = $strMessage. - sprintf(_("Could not connect to database '%s'."), - $_SESSION["strDataBase"])." ". - _("Please contact your DCMMS administrator."); - break; - case "login" : - if((array_key_exists("UserName", $_POST)) && - (array_key_exists("Password", $_POST)) && - ($_POST["UserName"] != "")&&($_POST["Password"] != "")) { - session_start(); - $_SESSION["UserName"] = $_POST["UserName"]; - $_SESSION["Password"] = $_POST["Password"]; - /** - * Forward to webtest initialization page if requested - */ - if($strWebtest == "&webtest=initialize") { - header("Location: admin/initialize_webtest.php?PHPSESSID=". - session_id()); - exit(); - } - include("include/dcmpostgis.php"); - // check for PostGIS - $strQuery = "select x(GeometryFromText('POINT(1 1)',-1))"; - @$result = pg_query($strQuery); - if($result) { - $row = pg_fetch_row($result); - if($row[0] != 1) { - $strMessage = $strMessage._("PostGIS is not installed."); - } - } else { - $strMessage = $strMessage._("PostGIS is not installed."); - } - // check for fuzzystrmatch - $strQuery = "select levenshtein('test','test')"; - @$result = pg_query($strQuery); - if($result) { - $row = pg_fetch_row($result); - if($row[0] != 0) { - $strMessage = $strMessage._("Fuzzystrmatch is not installed."); - } - } else { - $strMessage = $strMessage._("Fuzzystrmatch is not installed."); - } - - /** - * Check for PostArabic if necessary - */ - if(array_key_exists("ar", $_SESSION["arrLanguages"])) { - $strQuery = "select shape_arabic('test')"; - @$result = pg_query($strQuery); - if($result) { - $row = pg_fetch_row($result); - if($row[0] != "test") { - $strMessage = $strMessage._("PostArabic is not installed."); - } - } else { - $strMessage = $strMessage._("PostArabic is not installed."); - } - } - /** - * Check register_globals setting in php.ini - */ - if(ini_get('register_globals') != 0) { - $strMessage = $strMessage. - _('Error: The variable "register_globals" in php.ini has to be set to "Off".'); - } - /** - * Check if PHP time == PostgreSQL time - */ - $strTimestamp = date('Y-M-d h:i', mktime()); - $strTimestamp24 = date('Y-M-d H:i', mktime()); - $strQuery = 'select \''.$strTimestamp.'\' - now() < \'1 minute\' and - \''.$strTimestamp.'\' - now() > \'-1 minute\''; - $strQuery24 = 'select \''.$strTimestamp24.'\' - now() < \'1 minute\' and - \''.$strTimestamp24.'\' - now() > \'-1 minute\''; - @$objResult = pg_query($strQuery); - @$objResult24 = pg_query($strQuery24); - if($objResult) { - $arrRow = pg_fetch_row($objResult); - if($arrRow[0] != 't') { - if($objResult24) { - $arrRow24 = pg_fetch_row($objResult24); - if($arrRow24[0] != 't') { - $strMessage .= _('Configuration Error: PHP Time != PostgreSQL time.'); - } - }else{ - $strMessage .= _('Error: Could not verify time configuration.'); - } - } - } - else{$strMessage .= _('Error: Could not verify time configuration.'); - } - if($strMessage == '') { - header("Location: index.php?PHPSESSID=". - session_id()); - exit(); - } - } else { - $strMessage = $strMessage._("Please provide username and password."); - } - break; - case "logoff" : - session_start(); - if(array_key_exists("UserName", $_SESSION)) { - $strMessage = $strMessage.sprintf(_("Logged off user '%s'."), - $_SESSION["UserName"]); - } - session_unset(); - session_destroy(); - break; - } -} - -require_once("include/header.php"); -$dcmPage = new DcmPage(basename(__FILE__)); -$dcmPage->header(_("Logon to DCMMS")); - -if($strMessage != "") { - echo("<p class=\"important\">".$strMessage."</p>"); -} -echo("<p>"._("Please login to the DC Maintenance Management System.")."</p>"); - ?> -<form name="login" method="post" action="logon.php?action=login<?= $strWebtest - ?>"> - <table summary="login"> - <?php $dcmPage->printTextInput("UserName", $_POST, "", - _("Your DCMMS user name."), _("User Name:"));?> - <?php $dcmPage->printTextInput("Password", $_POST, "", - _("Your DCMMS password."), _("Password:"), "password");?> - </table> - <button type="submit" name="submit" title="<?= - _('Click this button after having entered username and password.') ?>"><?= _("Login") ?></button> -</form><?php -$dcmPage->footer("$Date$Empty"); ?> - Deleted: branches/ms4w/dcmms/maintenance.php =================================================================== --- branches/ms4w/dcmms/maintenance.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/maintenance.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,171 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * maintenance.php - Enter and display maintenance records. - * - * Copyright (C) 2005 DORSCH Consult - * Copyright (C) 2006 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -/** - * \todo Delete action. - * \todo Value history. - * \todo Value changes in select fields are not recorded. - */ -require_once('include/dcmmspage.php'); -require_once('include/dcmmspear.php'); -require_once('DB/DataObject.php'); -require_once('DB/DataObject/FormBuilder.php'); -require_once('HTML/QuickForm/Renderer/Default.php'); - -/** - * Check for the ID - */ -$strID = NULL; -if(isset($_REQUEST['id']) && is_numeric($_REQUEST['id'])) { - $strID = $_REQUEST['id']; -} -if(!isset($_REQUEST['id'])) { - $dcmPage = new DcmmsPage('Maintenance'); - $dcmPage->addMessage(_('No Workorder ID provided')); - echo($dcmPage->toHtml()); - exit(); -} -$dcmPage = new WorkorderPage(_('Maintenance Details')); -$dcmPage->setIconImage('todo.png'); -$dcmPage->setPageName(basename(__FILE__)); - -$options = &PEAR::getStaticProperty('DB_DataObject', 'options'); -$config = parse_ini_file('conf/dataobject.ini', TRUE); -$options = $config['DB_DataObject']; -/** - * \todo The following statement can be removed as of FormBuilder 0.17.2 - */ -$_DB_DATAOBJECT_FORMBUILDER['CONFIG'] = - $config['DB_DataObject_FormBuilder']; -$options['database'] = 'pgsql://'.$_SESSION['UserName'].':'. - $_SESSION['Password'].'@'.'localhost/'.$_SESSION['strDataBase']; - -$objMaintenance = DB_DataObject::factory('maintenance'); -if(PEAR::isError($objMaintenance)or(NULL == $objMaintenance)) { - die($objMaintenance->getMessage()); -} -$firsttime=0; - -if(!$objMaintenance->get($_REQUEST['id'])){ - $dcmPage->addMessage(_('Could not retrieve maintenance record.')); -} -if(PEAR::isError($objMaintenance)or(NULL == $objMaintenance)) { - die($objMaintenance->getMessage()); -} -$objOriginalMaintenance = $objMaintenance; -/** - * \todo Use DcmmsDriver, SelectCombo classes. - */ -$objMaintenanceBuilder = DB_DataObject_FormBuilder::create($objMaintenance); -if(PEAR::isError($objMaintenanceBuilder)) { - die($objMaintenanceBuilder->getMessage()); -} -$objMaintenanceForm = $objMaintenanceBuilder->getForm(); - -if($objMaintenanceForm->validate()) { - $objHistory = DB_DataObject::factory('History');; - $objHistory->recordoid = $objMaintenance->id; - $objHistory->keys('recordoid'); - $numHistoryRecordCount = $objHistory->count(); - $objResult = $objMaintenanceForm->process(array(&$objMaintenanceBuilder, - 'processForm'), false); - if(PEAR::isError($objResult)) { - $dcmPage->addMessage(_('Failed to update the maintenance record.')); - } else { - $dcmPage->addMessage( - _('Successfully updated the maintenance record.')); - $objMaintenance->logUpdateHistory($objOriginalMaintenance); - } -} -$objLink = HTML_QuickForm::createElement('link', 'null_geometry', _('Location:'), - 'maintenance.php?x=null&y=null&id='.$_REQUEST['id'], _('Clear')); -$objMaintenanceForm->insertElementBefore($objLink, '__submit__'); -if(!isset($objMaintenance->completiondate)) { - $objMaintenanceForm->setDefaults( - array('completiondate' => $dcmPage->getTimestamp())); -} -if(!isset($objMaintenance->team)) { - $objWorkorder = DB_DataObject::factory('workorder'); -if(PEAR::isError($objWorkorder)or(NULL == $objWorkorder)) { - die($objWorkorder->getMessage()); -} - if(!$objWorkorder->get($_REQUEST['id'])){ - $dcmPage->addMessage(_('Could not retrieve workorder record.')); - } else { - $objMaintenanceForm->setDefaults(array('team' => $objWorkorder->team)); - } -} -$objRenderer =& new HTML_QuickForm_Renderer_Default(); -$objRenderer->setFormTemplate( - "\n<form{attributes}>\n<table class=\"tab_one_panel\">\n{content}\n</table></form>"); -$objMaintenanceForm->accept($objRenderer); - -/** - * \todo Complete links. - */ - $arreActions = array('Map' => - basename(__FILE__).'?PHPSESSID='. - session_id().'&action=map&WorkorderID=', - 'View' => 'workorderpage.php?'. - 'PHPSESSID='.session_id().'&action=view&id=', - 'Print' => 'print_workorder.php?PHPSESSID='.session_id(). - '&action=print&WorkorderID=', - 'Maintenance'=> 'maintenance.php?PHPSESSID='.session_id(). - '&id='.$_REQUEST['id'] - ); - $arrCompletedActions = array("Maintenance"=>"maintenance.php?". - "PHPSESSID=".session_id()."&id=".$_REQUEST['id'], - "Resource"=>"resource.php?table=Staff&PHPSESSID=".session_id(). - "&action=select_workorder&id=" - ); -/** - * \todo Avoid redirection through workorderlist.php when going to the map. - */ - - $dcmPage->add('<div class="tab_two_panel"> - <a href="workorderpage.php?PHPSESSID='.session_id(). - '&action=view&id='.$_REQUEST["id"].'" - class="tab_one_inactive">'._('Workorder').'</a> - <a href="workorderlist.php?PHPSESSID='. - session_id().'&action=map&WorkorderID='.$_REQUEST["id"]. - '" class="tab_one_inactive">'._('Map'). - '</a> <a href="print_workorder.php?PHPSESSID='.session_id(). - '&action=print&WorkorderID='.$_REQUEST["id"].'" class="tab_one_inactive">'. - _('Print').'</a> - <span class="tab_one">'._('Maintenance').'</span> - <a href="resource.php?table=Staff&PHPSESSID='.session_id(). - '&action=select_workorder&WorkorderID='.$_REQUEST["id"]. - '" class="tab_one_inactive">'._('Resource').'</a></div>'); - -$dcmPage->add($objRenderer->toHtml()); -$objHistory = DB_DataObject::factory('History'); -$objHistory->tablename = 'maintenance'; -$objHistory->recordoid = $objMaintenance->id; -$objHistory->find(); -$objHistoryTable = $objHistory->getTable(&$objMaintenanceForm); -$dcmPage->add('<h2>'._('Update History').'</h2>'); -$dcmPage->add($objHistoryTable->toHtml()); -$dcmPage->setCvsDate("$Date$Empty"); -$dcmPage->setId($_REQUEST['id']); -echo($dcmPage->toHtml()); -?> Deleted: branches/ms4w/dcmms/maintenance_by_team_report.php =================================================================== --- branches/ms4w/dcmms/maintenance_by_team_report.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/maintenance_by_team_report.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,123 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * maintenance_by_team_report.php - Information about maintenance by team - * - * Copyright (C) 2004 - 2006 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - */ - -require_once("include/dcmmspage.php"); -/** - * \todo Use PEAR DB. - */ -require_once("include/dcmpostgis.php"); -require_once("include/dcmmspear.php"); -require_once("HTML/QuickForm.php"); -require_once("HTML/QuickForm/select.php"); - -$dcmPage = new DcmmsPage(_("Maintenance by Team")); -$dcmPage->setIconImage("documents.png"); -$dcmPage->setPageName(basename(__FILE__)); - -$form = new HTML_QuickForm("QuantityForm"); -$form->setRequiredNote("<span style=".quote("font-size:80%; color:#ff0000;"). - ">*</span><span style=".quote("font-size:80%;")."> ". - _("denotes required field")."</span>"); -$form->setDefaults(array("interval" => "day", - "end_timestamp" => $dcmPage->getTimestamp(0,0), "count" => "7")); -$form->setDefaults(array("interval" => "day", - "start_timestamp" => $dcmPage->getTimestamp(0,1), "count" => "7")); - -$dcmPage->add("<p>".sprintf(_( - 'A %sReport%s listing completed workorders by the individual teams.'), - "<a href=\"reports.php\">", "</a>")."</p>"); - -$form->addElement("text", "start_timestamp", _("Start Date:"), - array("maxlength" => 16)); -$form->addElement("text", "end_timestamp", _("End Date:"), - array("maxlength" => 16)); -$form->addElement("submit", null, _("Create Report")); - -/** - * Validate input. - */ -$form->applyFilter("start_timestamp","trim"); -$form->applyFilter("end_timestamp", "trim"); -$form->addRule("start_timestamp", - _("Please provide the start date."), "required", null, - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("end_timestamp", - _("Please provide the end date."), "required", null, - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("start_timestamp", - _("Start date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("end_timestamp", - _("End date has to be entered in the following format: 2004-08-21 21:30."), - "regex", "/[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}/", - $_SESSION["strHtmlQuickFormValidation"]); -$form->addRule("administrativearea", - _("Administrative Area has to be a coded value."), "regex", "/[0-9]*/", - $_SESSION["strHtmlQuickFormValidation"]); -$dcmPage->add($form->toHtml()); - -/** - * Handle request - */ -if($form->validate()) { - /** - * \todo Mention Administrative Area where necessary. - */ - $dcmPage->add("<h2>".sprintf(_("Workorders closed between %s and %s"), - $form->exportValue("start_timestamp"), - $form->exportValue("end_timestamp")."</h2>")); - /** - * Add where clause if necessary. - */ - $numAdministrativeArea = $form->exportValue("administrativearea"); - $strWhere = ""; -/** - * Create the Quantity table. - */ - $strQuery = - 'select dcmmstranslation(\''.$_SESSION['language'] - .'\',team.description)as team , Workorder.ID' - .' from Team, Workorder left outer join Maintenance on - Maintenance.ID = Workorder.ID where (Maintenance.Status = 2) and ' - ."(workorder.receiveddate between '".$form->exportValue("start_timestamp")."'" - ." and '".$form->exportValue("end_timestamp")."')" - ."and (team.codedvalue=maintenance.team) order by description"; - //echo($strQuery); - $objTable = new DbTable($dcmPage->postgis->db, $strQuery); - $objTable->addRows(); - $numRowCount = $objTable->getRowCount(); - if(($numRowCount > 0) && - ($objTable->getCellContents($numRowCount-1, 0) == "00:00:00")) { - $objTable->setCellContents($numRowCount-1, 0, "< 1 ". - $form->exportValue("start_timestamp")); - } - for($intI = 1; $intI < $numRowCount; $intI++) { - $workOrderNum = $objTable->getCellContents($intI,1 ); - $objTable->setCellContents($intI,1, - '<a href="workorderpage.php?&action=view&id='.$workOrderNum.'">'. - $workOrderNum.'</a>' ); - } - $dcmPage->add($objTable->toHtml()); -} -$dcmPage->setCvsDate("$Date$Empty"); -echo($dcmPage->toHtml()); ?> Deleted: branches/ms4w/dcmms/map.php =================================================================== --- branches/ms4w/dcmms/map.php 2006-08-11 15:59:16 UTC (rev 1116) +++ branches/ms4w/dcmms/map.php 2006-08-11 16:02:16 UTC (rev 1117) @@ -1,808 +0,0 @@ -<?php -/* DCMMS -- DC Maintenance Management System - * - * map.php - Central DCMMS map page - * - * Copyright (C) 2000 DM Solutions Group Inc. - * Copyright (C) 2003,2004 DORSCH Consult, NGWA - * Copyright (C) 2005 DORSCH Consult - * - * 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 - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * - * Page actions represent tasks that may require the use of different map - * tools (i.e. zooming, panning that digitizing). - * This page supports the following actions passed through the request: - * updateWorkorder: called from map.php, allow the user to digitize the - * location maintenance - * moveLandmark Move a landmark to a new location. - * acceptedLandmarkMove The landmark move has been accepted by the user. - * - * - * CMD values correspond to map tool functionalities. - * This page supports the following CMD values in the request: - * NEW_WORKORDER: Digitize a new workorder aoi center, no center - * displayed - * NEW_WORKORDER_CENTER: Digitize a new workorder aoi center, old center and - * radius are displayed - * NEW_WORKODER_RADIUS: Digitize a new workorder aoi radius, old center - * displayed - * ADD_REPAIR: Digitize/update maintenance location - * LANDMARK: The landmark tool has been selected, there was no click - * on the map yet. - * ADD_LANDMARK: The landmark location has been selected and doesn't - * match an existing landmark location. - * EDIT_LANDMARK: The landmark tool has been clicked on an existing - * landmark location. - * MOVE_LANDMARK: After the selection of a landmark, a new location has - * been chosen. Available only to administrators. - */ - -require_once("include/dcmpostgis.php"); -require_once("include/dcmmaputil.php"); -@require_once("include/header.php"); - -$strMessages = ''; - -/** - * Convert pixel position to geographic position - * @param $nPixPos - * @param $dfPixMax - * @param $dfGeoMin - * @param $dfGeoMax - * @param $boolOrientation - * @return the geographic position - * \todo restructure (make class member), instead of $boolOrientation, use - * two functions (x and y) - */ -function dcmPix2Geo($nPixPos, $dfPixMax, $dfGeoMin, $dfGeoMax, - $boolOrientation) { - $dfWidthGeo = $dfGeoMax - $dfGeoMin; - $dfPixToGeo = $dfWidthGeo / $dfPixMax; - - $dfDeltaGeo = doubleval($nPixPos) * $dfPixToGeo; - if($boolOrientation) { - $dfPosGeo = $dfGeoMin + $dfDeltaGeo; - } else { - $dfPosGeo = $dfGeoMax - $dfDeltaGeo; - } - return ($dfPosGeo); -} - -$gszCommand = ""; - -if(array_key_exists("CMD", $_POST)) { - $gszCommand = $_POST["CMD"]; -} elseif(array_key_exists("CMD", $_REQUEST)) { - $gszCommand = $_REQUEST["CMD"]; -} - -$strAction = ""; -if(array_key_exists("action", $_POST)) { - $strAction = $_POST["action"]; -} elseif(array_key_exists("action", $_REQUEST)) { - $strAction = $_REQUEST["action"]; -} - -$strLandmarkID = ""; -if(array_key_exists("LandmarkID", $_REQUEST)) { - $strLandmarkID = $_REQUEST["LandmarkID"]; -} elseif(array_key_exists("LandmarkID", $_POST)) { - $strLandmarkID = $_POST["LandmarkID"]; -} - - -/** - * $strCmd is the command used in the form - */ -$strCmd = "ADD_REPAIR"; - -switch($strAction) { - case "moveLandmark" : - if($strLandmarkID != "") { - $strMessages = $strMessages.sprintf(_("Moving landmark %s."), - "<a href=\"landmark.php?action=edit&gid=".$strLandmarkID. - "\">#".$strLandmarkID."</a>"); - } - break; - case "acceptedLandmarkMove" : - if(($strLandmarkID != "")&& - (array_key_exists("LandmarkX", $_REQUEST))&& - (array_key_exists("LandmarkY", $_REQUEST))) { - /** - * Log the old Landmark coordinates in the History table. - */ - foreach(array('X', 'Y') as $strAxis) { - $strLogInsert = 'insert into History (RecordOID, TableName, Date, - DcmmsUserOID, Attribute, PreviousValue) values('.$strLandmarkID. - ', \'landmark\', now(), \''.$_SESSION['UserName'].'\', \''.$strAxis. - '\',(select '.$strAxis.'(the_geom) from Landmark where GID='. - $strLandmarkID.'))'; - error_log(date('Y-m-d H:i').' '.$_SESSION['UserName'].' '.$strLogInsert. - PHP_EOL, 3, $_SESSION['strLogFileLocation']); - /** - * \todo Check the query result. - */ - pg_query($strLogInsert); - } - $strUpdate = "update Landmark set the_geom=GeometryFromText('POINT(". - $_REQUEST["LandmarkX"]." ".$_REQUEST["LandmarkY"].")', -1) where GID=". - $strLandmarkID; - /** - * \todo Check the query result. - */ - error_log(date('Y-m-d H:i').' '.$_SESSION['UserName'].' '.$strUpdate. - PHP_EOL, 3, $_SESSION['strLogFileLocation']); - pg_query($strUpdate); - $strUpdate = "update landmark set administra = (select max(". - "administrativearea.codedvalue) from administrativearea, landmark ". - "where landmark.gid=$strLandmarkID and ". - "administrativearea.the_geom && 'BOX3D(".($_REQUEST["LandmarkX"]-1)." ". - ($_REQUEST["LandmarkY"]-1).",".($_REQUEST["LandmarkX"]+1)." ". - ($_REQUEST["LandmarkY"]+1).")'::box3d and ". - "distance(administrativearea.the_geom, landmark.the_geom) = 0 ". - "), village = (select max(". - "village.codedvalue) from village,landmark where ". - " landmark.gid=$strLandmarkID and ". - "administrativearea.the_geom && 'BOX3D(".($_REQUEST["LandmarkX"]-1)." ". - ($_REQUEST["LandmarkY"]-1).",".($_REQUEST["LandmarkX"]+1)." ". - ($_REQUEST["LandmarkY"]+1). - ")'::box3d and ". - "distance(village.the_geom, landmark.the_geom) = 0 ". - ") where ID=$strLandmarkID"; - error_log(date('Y-m-d H:i').' '.$_SESSION['UserName'].' '.$strUpdate. - PHP_EOL, 3, $_SESSION['strLogFileLocation']); - pg_query($strUpdate); - $gszCommand = "LANDMARK"; - $strMessages = $strMessages._("Moved Landmark."); - } - break; -} -$nClickPixX = NULL; -if(array_key_exists("mainmap_x", $_POST)) { - $nClickPixX = doubleval($_POST["mainmap_x"]); -} elseif((count($_POST) == 0)&&(array_key_exists("mainmap_x", $_REQUEST))) { - $nClickPixX = doubleval($_REQUEST["mainmap_x"]); -} -$nClickPixY = NULL; -if(array_key_exists("mainmap_y", $_POST)) { - $nClickPixY = doubleval($_REQUEST["mainmap_y"]); -} elseif((count($_POST) == 0)&&(array_key_exists("mainmap_y", $_REQUEST))) { - $nClickPixY = doubleval($_REQUEST["mainmap_y"]); -} -$dfMinX = NULL; -if(array_key_exists("minx", $_REQUEST)) { - $dfMinX = doubleval($_REQUEST["minx"]); -} -$dfMinY = NULL; -if(array_key_exists("miny", $_REQUEST)) { - $dfMinY = doubleval($_REQUEST["miny"]); -} -$dfMaxX = NULL; -if(array_key_exists("maxx", $_REQUEST)) { - $dfMaxX = doubleval($_REQUEST["maxx"]); -} -$dfMaxY = NULL; -$nClickGeoX = NULL; -$nClickGeoY = NULL; -if(array_key_exists("maxy", $_REQUEST)) { - $dfMaxY = doubleval($_REQUEST["maxy"]); -} -if($nClickPixX != NULL) { - $nClickGeoX = dcmPix2Geo($nClickPixX, doubleval($_REQUEST["imagewidth"]), - $dfMinX, $dfMaxX, TRUE); - $nClickGeoY = dcmPix2Geo($nClickPixY, doubleval($_REQUEST["imageheight"]), - $dfMinY, $dfMaxY, FALSE); -} -$toolLandmark = new LandmarkTool($_SESSION['UserName'], - $nClickGeoX, $nClickGeoY); -$toolLandmark->setValue("LANDMARK"); -$toolLandmark->setAction($strAction); - -if(array_key_exists("CMD", $_REQUEST)) { - - //TODO: add switch statement - switch($gszCommand) { - case "MOVE_LANDMARK": - if($strLandmarkID != "") { - $toolLandmark->setValue("MOVE_LANDMARK"); - $toolLandmark->setChecked(true); - $toolLandmark->setSelected($strLandmarkID); - } - break; - case "LANDMARK" : - $toolLandmark->setChecked(true); - /** - * Check if landmark exists at location, switch to ADD_LANDMARK or - * EDIT_LANDMARK - */ - $numImageWidth = doubleval($_REQUEST["imagewidth"]); - $numImageHeight = doubleval($_REQUEST["imageheight"]); - $numBoxMinX = dcmPix2Geo($nClickPixX-5, $numImageWidth, $dfMinX, $dfMaxX, - TRUE); - $numBoxMinY = dcmPix2Geo($nClickPixY-5, $numImageHeight, $dfMinY, $dfMaxY, - FALSE); - $numBoxMaxX = dcmPix2Geo($nClickPixX+5, $numImageWidth, $dfMinX, $dfMaxX, - TRUE); - $numBoxMaxY = dcmPix2Geo($nClickPixY+5, $numImageHeight, $dfMinY, $dfMaxY, - FALSE); - $wktPolygon = new WktPolygon($numBoxMinX, $numBoxMinY, $numBoxMaxX, - $numBoxMaxY, TRUE); - $strQuery = "select gid from Landmark where the_geom && GeometryFromText('". - $wktPolygon->toWkt()."', -1) limit 1"; - // echo($strQuery); - $objResult = pg_query($strQuery); - if(($objResult)&&(pg_numrows($objResult) > 0)) { - $arrRow = pg_fetch_row($objResult, 0); - $toolLandmark->setSelected($arrRow[0]); - } - else { - $gszCommand = "ADD_LANDMARK"; - } - break; - } - if(($_REQUEST["CMD"] == "NEW_WORKORDER_CENTER")|| - ($_REQUEST["CMD"] == "NEW_WORKORDER_RADIUS")) { - if((!array_key_exists("NewWorkorderID", $_SESSION)) || - ($_SESSION["NewWorkorderID"] == null)) { - /** - * Try to 'recycle' workorder IDs where the creation process was not - * fully completed. - */ - $strQuery = "select min(ID) from Workorder where Subtype is null". - " and now()-ReceivedDate > '8h'::interval"; - $objResult = pg_query($strQuery); - $numRows = pg_numrows($objResult); - if($numRows == 1) { - $row = pg_fetch_row($objResult, 0); - if($row[0] > 1) { - $strUpdate = 'update Workorder set ReceivedDate = date_trunc(\'second\', now()), - administrativearea=null,dcmmsuser=user,areaofinterest=null, - sh... [truncated message content] |
From: <sdt...@us...> - 2006-08-13 04:27:13
|
Revision: 1143 Author: sdteffen Date: 2006-08-12 21:26:57 -0700 (Sat, 12 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1143&view=rev Log Message: ----------- * etc/dcmms.pkg.html: Reference entry in MS4W start page Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog Added Paths: ----------- branches/ms4w/dcmms/etc/dcmms.pkg.html Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-12 16:21:35 UTC (rev 1142) +++ branches/ms4w/dcmms/ChangeLog 2006-08-13 04:26:57 UTC (rev 1143) @@ -1,3 +1,26 @@ +2006-08-13 Steffen Macke <Ste...@do...> + + * etc/dcmms.pkg.html: Reference entry in MS4W start page + +2006-08-11 Steffen Macke <Ste...@do...> + + * conf/dataobject.ini.default: + * conf/sample_en.map: + * htdocs/index.php: + * htdocs/landmark.php: + * htdocs/logon.php: + * htdocs/map.php: + * htdocs/print_workorder.php: + * htdocs/reports.php: + * htdocs/workorderlist.php: + * htdocs/zoom.php: + * include/dataobject/Landmark.php: + * include/dcmmap.php: + * include/dcmmspage.php: + * include/header.php: + * locale/*/LC_MESSAGES/dcmms.po: Adjusting to MS4W structure; + trying to track down crashbug that is mapfile/mapscript related. + 2006-07-09 Steffen Macke <Ste...@do...> * workorder_status_report.php: Proper localisation of type in Added: branches/ms4w/dcmms/etc/dcmms.pkg.html =================================================================== --- branches/ms4w/dcmms/etc/dcmms.pkg.html (rev 0) +++ branches/ms4w/dcmms/etc/dcmms.pkg.html 2006-08-13 04:26:57 UTC (rev 1143) @@ -0,0 +1,3 @@ +<h3>DC Maintenance Management System</h3> +<blockquote><p><a href="/dcmms/">DCMMS</a></p> +</blockquote> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-13 14:15:46
|
Revision: 1144 Author: sdteffen Date: 2006-08-13 07:15:22 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1144&view=rev Log Message: ----------- * conf/sample_*.map: Fixed reference image path (preventing crash), added TRANSPARENCY ALPHA for the aoihatch symbols Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/conf/sample_ar.map branches/ms4w/dcmms/conf/sample_en.map branches/ms4w/dcmms/conf/sample_fr.map branches/ms4w/dcmms/conf/sample_it.map branches/ms4w/dcmms/conf/sample_th.map branches/ms4w/dcmms/htdocs/logon.php Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/ChangeLog 2006-08-13 14:15:22 UTC (rev 1144) @@ -1,5 +1,7 @@ 2006-08-13 Steffen Macke <Ste...@do...> + * conf/sample_*.map: Fixed reference image path (preventing crash), added + TRANSPARENCY ALPHA for the aoihatch symbols * etc/dcmms.pkg.html: Reference entry in MS4W start page 2006-08-11 Steffen Macke <Ste...@do...> Modified: branches/ms4w/dcmms/conf/sample_ar.map =================================================================== --- branches/ms4w/dcmms/conf/sample_ar.map 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/conf/sample_ar.map 2006-08-13 14:15:22 UTC (rev 1144) @@ -34,13 +34,13 @@ WEB MINSCALE 20 MAXSCALE 500000000 - IMAGEPATH "/tmp/ms_tmp/" + IMAGEPATH "/ms4w/tmp/ms_tmp/" IMAGEURL "/ms_tmp/" END # Reference map REFERENCE - IMAGE ../images/dcmms_keymap.png + IMAGE "/ms4w/apps/dcmms/htdocs/images/dcmms_keymap.png" EXTENT 214578 200220 218073 202836 STATUS ON COLOR -1 -1 -1 @@ -105,6 +105,7 @@ OUTLINECOLOR 255 150 150 END END + TRANSPARENCY ALPHA METADATA "DESCRIPTION" "Pending Workorders" "RESULT_FIELDS" "id receiveddate complainant locationdescription" @@ -346,6 +347,7 @@ OUTLINECOLOR 255 255 0 END END + TRANSPARENCY ALPHA TOLERANCE 15 END # Layer Modified: branches/ms4w/dcmms/conf/sample_en.map =================================================================== --- branches/ms4w/dcmms/conf/sample_en.map 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/conf/sample_en.map 2006-08-13 14:15:22 UTC (rev 1144) @@ -19,73 +19,383 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -NAME "DCMMS" -SIZE 640 480 +NAME DCMMS STATUS ON -SYMBOLSET "/ms4w/apps/dcmms/etc/symbols.sym" +SIZE 600 450 +SYMBOLSET ../etc/symbols.sym EXTENT 214600 200230 218000 202835 UNITS METERS -SHAPEPATH "/ms4w/apps/dcmms/data/" +SHAPEPATH "c:/program files/dcmms/data/" +IMAGECOLOR 255 255 255 +FONTSET ../etc/fonts.txt +IMAGETYPE PNG +# Web interface definition WEB + MINSCALE 20 + MAXSCALE 500000000 IMAGEPATH "/ms4w/tmp/ms_tmp/" IMAGEURL "/ms_tmp/" END +# Reference map +REFERENCE + IMAGE "/ms4w/apps/dcmms/htdocs/images/dcmms_keymap.png" + EXTENT 214578 200220 218073 202836 + STATUS ON + COLOR -1 -1 -1 + OUTLINECOLOR 255 0 0 + SIZE 120 90 +END + +# Legend +LEGEND + KEYSIZE 18 12 + LABEL + TYPE BITMAP + SIZE MEDIUM + COLOR 0 0 89 + END + STATUS ON +END + +# Scalebar +SCALEBAR + IMAGECOLOR 255 255 255 + LABEL + COLOR 0 0 0 + SIZE SMALL + END + SIZE 150 5 + COLOR 0 0 0 + BACKGROUNDCOLOR -1 -1 -1 + OUTLINECOLOR 0 0 0 + UNITS kilometers + INTERVALS 5 + STATUS EMBED +END + +#Querymap +QUERYMAP + STYLE HILITE + COLOR 255 255 0 +END + +# Layers + +# PendingWorkorders LAYER - NAME "AreaOfInterest" + CONNECTIONTYPE postgis + NAME PendingWorkorders + maxscale 15000 TYPE POLYGON STATUS DEFAULT - DATA "administrativearea" + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "areaofinterest from workorder using unique id using SRID=-1" + filter "1=(select status from maintenance where maintenance.id=workorder.id)" CLASS + NAME 'PendingWorkorders' + TEMPLATE "dummy.html" STYLE - COLOR 110 50 100 - OUTLINECOLOR 200 200 200 - SYMBOL 0 + SYMBOL "aoihatch" + SIZE 8 + WIDTH 1 + ANGLE 315 + COLOR 255 150 150 + OUTLINECOLOR 255 150 150 END + END -END + TRANSPARENCY ALPHA + METADATA + "DESCRIPTION" "Pending Workorders" + "RESULT_FIELDS" "id receiveddate complainant locationdescription" + END + TOLERANCE 15 +END # Layer +# AdministrativeArea +layer + CONNECTIONTYPE postgis + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "the_geom from administrativearea" + type polygon + status default + minscale 15000 + labelitem "name" + class + color 255 255 200 + name 'West Sector' + expression ([CODEDVALUE] = 1) + outlinecolor 0 0 0 + end + class + color 200 255 255 + name 'North Sector' + expression ([CODEDVALUE] = 2) + outlinecolor 0 0 0 + end + class + color 255 200 200 + name 'South Sector' + expression ([CODEDVALUE] = 3) + outlinecolor 0 0 0 + end + METADATA + "DESCRIPTION" "AdministrativeArea" + "RESULT_FIELDS" "name" + END +end + +#AdministrativeArea Label +layer + name "AdministrativeAreaLabel" + CONNECTIONTYPE postgis + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "the_geom from administrativearea" + type polygon + status off + minscale 15000 + labelitem "name" + CLASS + NAME 'Label' + label + color 0 0 0 + position auto + font arial + type truetype + size 10 + end + END +end + +# Road +layer + NAME "Road" + data "c:/program files/dcmms/data/basemap/roadcenterlines" + type line + status default + class + template "ttt_query.html" + name "Road" + color 170 170 170 + end + maxscale 20000 + tolerance 1 + METADATA + "DESCRIPTION" "Road" + "RESULT_FIELDS" "NAME" + END +end + +layer + NAME "Building" + data "c:/program files/dcmms/data/basemap/building" + type polygon + status default + class + template "ttt_query.html" + name "Building" + color 170 170 170 + end + maxscale 20000 + tolerance 1 + METADATA + "DESCRIPTION" "Building" + "RESULT_FIELDS" "AREA" + END +end + LAYER - NAME "Maintenance" + maxscale 10000 + labelmaxscale 2000 + data "c:/program files/dcmms/data/sewer/gravitymain" + NAME gravitymain + METADATA + "DESCRIPTION" "Gravitymain" + "RESULT_FIELDS" "DIAMETER" + END + TYPE LINE + STATUS ON + #LABELITEM "diameter" + CLASS + NAME "sewer" + template "ttt_query.html" + SIZE 2 + symbol "circle" + COLOR 170 120 0 + overlaysymbol "arrow" + overlaycolor 170 120 0 + overlaysize 8 + label + color 170 120 0 + position auto + end + END + TOLERANCE 15 +END # Layer + +LAYER + NAME pressurizedmain + data "c:/program files/dcmms/data/water/pressurizedmain" + TYPE Line + STATUS ON + maxscale 20000 + labelmaxscale 5000 + labelitem "DIAMETER" + CLASS + NAME 'Pressurizedmain' + template "ttt_query.html" + SYMBOL "circle" + SIZE 2 + COLOR 0 0 255 + label + color 0 0 0 + position auto + font arial + type truetype + size 10 + end + END + METADATA + "DESCRIPTION" "Water Network" + "RESULT_FIELDS" "DIAMETER" + END + TOLERANCE 5 +END + +LAYER + CONNECTIONTYPE postgis + NAME Village TYPE POLYGON - STATUS DEFAULT - DATA "administrativearea" + STATUS on + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "the_geom from village" + labelmaxscale 10 + labelitem "name" + transparency 100 CLASS - STYLE - COLOR 110 50 100 - OUTLINECOLOR 200 200 200 - SYMBOL 0 - END + NAME 'Village' + template "ttt_query.html" + SYMBOL "circle" + SIZE 2 + OUTLINECOLOR 150 150 150 + label + color 0 0 0 + position auto + font arial + type truetype + size 15 + end END -END + + METADATA + "DESCRIPTION" "Village" + "RESULT_FIELDS" "gid name" + END + TOLERANCE 5 +END # Village Layer + +# LandMark Layer LAYER - NAME "pressurizedmain" - TYPE POLYGON + CONNECTIONTYPE postgis + NAME Landmark + maxscale 15000 + TYPE POINT STATUS DEFAULT - DATA "administrativearea" + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "the_geom from landmarkview using unique gid using SRID=-1" + labelitem "name" CLASS - STYLE - COLOR 110 50 100 - OUTLINECOLOR 200 200 200 - SYMBOL 0 - END + NAME 'LandMark' + template "ttt_query.html" + SYMBOL "square" + SIZE 12 + color 0 150 0 + label + color 38 119 38 + position uc + font arial + type truetype + size 15 + end END -END + METADATA + "DESCRIPTION" "Landmark" + "RESULT_FIELDS" "gid type name" + END + TOLERANCE 15 +END # Layer +# AreaOfInterest LAYER - NAME "gravitymain" + CONNECTIONTYPE postgis + NAME AreaOfInterest TYPE POLYGON - STATUS DEFAULT - DATA "administrativearea" + STATUS OFF + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "areaofinterest from workorder" + filter "id = -1" CLASS + NAME 'AreaOfInterest' STYLE - COLOR 110 50 100 - OUTLINECOLOR 200 200 200 - SYMBOL 0 + SYMBOL "aoihatch" + SIZE 10 + WIDTH 2 + ANGLE 45 + COLOR 255 255 0 + OUTLINECOLOR 255 255 0 END END -END + TRANSPARENCY ALPHA + TOLERANCE 15 +END # Layer -END \ No newline at end of file +# Empty layer, used for AreaOfInterest center points +layer + connectiontype PostGIS + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + name "center" + type POINT + status OFF + DATA "the_geom from center" + CLASS + NAME "Center Point" + #template "ttt_query.html" + SYMBOL "circle" + SIZE 8 + color 0 0 0 + outlinecolor 255 255 255 + END + METADATA + "DESCRIPTION" "Center Point" + "RESULT_FIELDS" "" + END + TOLERANCE 15 +END + +# Maintenance Layer +LAYER + CONNECTIONTYPE postgis + NAME Maintenance + TYPE POINT + STATUS ON + CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" + DATA "shape from maintenance" + CLASS + NAME "Maintenance" + template "ttt_query.html" + SYMBOL "square" + SIZE 8 + color 223 66 30 + END + METADATA + "DESCRIPTION" "Maintenance" + "RESULT_FIELDS" "id note" + END + TOLERANCE 15 +END + +END # Map File + Modified: branches/ms4w/dcmms/conf/sample_fr.map =================================================================== --- branches/ms4w/dcmms/conf/sample_fr.map 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/conf/sample_fr.map 2006-08-13 14:15:22 UTC (rev 1144) @@ -34,13 +34,13 @@ WEB MINSCALE 20 MAXSCALE 500000000 - IMAGEPATH "/tmp/ms_tmp/" + IMAGEPATH "/ms4w/tmp/ms_tmp/" IMAGEURL "/ms_tmp/" END # Reference map REFERENCE - IMAGE ../images/dcmms_keymap.png + IMAGE "/ms4w/apps/dcmms/htdocs/images/dcmms_keymap.png" EXTENT 214578 200220 218073 202836 STATUS ON COLOR -1 -1 -1 @@ -105,6 +105,7 @@ OUTLINECOLOR 255 150 150 END END + TRANSPARENCY ALPHA METADATA "DESCRIPTION" "Pending Workorders" "RESULT_FIELDS" "id receiveddate complainant locationdescription" @@ -346,6 +347,7 @@ OUTLINECOLOR 255 255 0 END END + TRANSPARENCY ALPHA TOLERANCE 15 END # Layer Modified: branches/ms4w/dcmms/conf/sample_it.map =================================================================== --- branches/ms4w/dcmms/conf/sample_it.map 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/conf/sample_it.map 2006-08-13 14:15:22 UTC (rev 1144) @@ -34,13 +34,13 @@ WEB MINSCALE 20 MAXSCALE 500000000 - IMAGEPATH "/tmp/ms_tmp/" + IMAGEPATH "/ms4w/tmp/ms_tmp/" IMAGEURL "/ms_tmp/" END # Reference map REFERENCE - IMAGE ../images/dcmms_keymap.png + IMAGE "/ms4w/apps/dcmms/htdocs/images/dcmms_keymap.png" EXTENT 214578 200220 218073 202836 STATUS ON COLOR -1 -1 -1 @@ -105,6 +105,7 @@ OUTLINECOLOR 255 150 150 END END + TRANSPARENCY ALPHA METADATA "DESCRIPTION" "Pending Workorders" "RESULT_FIELDS" "id receiveddate complainant locationdescription" @@ -347,6 +348,7 @@ OUTLINECOLOR 255 255 0 END END + TRANSPARENCY ALPHA TOLERANCE 15 END # Layer Modified: branches/ms4w/dcmms/conf/sample_th.map =================================================================== --- branches/ms4w/dcmms/conf/sample_th.map 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/conf/sample_th.map 2006-08-13 14:15:22 UTC (rev 1144) @@ -34,13 +34,13 @@ WEB MINSCALE 20 MAXSCALE 500000000 - IMAGEPATH "/tmp/ms_tmp/" + IMAGEPATH "/ms4w/tmp/ms_tmp/" IMAGEURL "/ms_tmp/" END # Reference map REFERENCE - IMAGE ../images/dcmms_keymap.png + IMAGE "/ms4w/apps/dcmms/htdocs/images/dcmms_keymap.png" EXTENT 214578 200220 218073 202836 STATUS ON COLOR -1 -1 -1 Modified: branches/ms4w/dcmms/htdocs/logon.php =================================================================== --- branches/ms4w/dcmms/htdocs/logon.php 2006-08-13 04:26:57 UTC (rev 1143) +++ branches/ms4w/dcmms/htdocs/logon.php 2006-08-13 14:15:22 UTC (rev 1144) @@ -39,7 +39,7 @@ /** * Perform startup checks to make sure that the installation is complete. */ -$arrExtensions = array("MapScript", "gettext", "pgsql", "gd"); +$arrExtensions = array("gettext", "pgsql", "gd"); foreach($arrExtensions as $strExtension) { if(!extension_loaded($strExtension)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-14 05:39:59
|
Revision: 1147 Author: sdteffen Date: 2006-08-13 22:39:44 -0700 (Sun, 13 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1147&view=rev Log Message: ----------- Restructured information on raster data a little bit, part added to troubleshooting section; added index terms Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-14 05:21:14 UTC (rev 1146) +++ branches/ms4w/dcmms/ChangeLog 2006-08-14 05:39:44 UTC (rev 1147) @@ -1,3 +1,15 @@ +2006-08-14 Steffen Macke <Ste...@do...> + + * doc/administration/dcmms_administration_guide.xml: Restructured + information on raster data a little bit, part added to troubleshooting + section; added index terms + +2006-08-14 Maher Abdel Karim <Mah...@do...> + + * doc/administration/dcmms_administration_guide.xml: update the + documentation to put the needed steps to add satellite images on the map + file. + 2006-08-13 Steffen Macke <Ste...@do...> * conf/sample_*.map: Fixed reference image path (preventing crash), added Modified: branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml =================================================================== --- branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-14 05:21:14 UTC (rev 1146) +++ branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-14 05:39:44 UTC (rev 1147) @@ -1373,7 +1373,11 @@ </sect3> <sect3 id="tiled_images"> <title>Tiled Images</title> - <para>Tiled images allow <command>mapserver</command> to maximize + <indexterm><primary>raster data</primary></indexterm> + <indexterm><primary>tiles</primary></indexterm> + <indexterm><primary>overview</primary></indexterm> + <indexterm><primary>performance</primary></indexterm> + <para>Tiled images allow mapserver to maximize performance for large raster datasets.</para> <para>The following steps are required to prepare the tiled images, and include them on the map file. @@ -1383,60 +1387,27 @@ <para>Use the <command>gdaltindex.exe</command> from the mapserver distribution to create tile indexes.</para> <para> Example of usage:</para> - <para> <command> gdaltindex sana_index.shp *.tif </command></para> + <programlisting>gdaltindex sana_index.shp *.tif</programlisting> <tip><para> In order to increase the display, and rendering performance of - the images it is prefered to create over views for these images using - the following command:</para> - <para><command>gdaladdo -r average imagename.tif 2 4 8 16 32 64 128 - </command> - </para></tip> - <para>You can add the tiled images on the map file using the following lines - <programlisting > + the images it is prefered to create over views for these images using + the following command:</para> + <programlisting + >gdaladdo -r average imagename.tif 2 4 8 16 32 64 128</programlisting> + </tip> + <para>You can add the tiled images on the map file using the following + statements:</para> + <programlisting> LAYER - NAME "sattelite" + NAME "satellite" STATUS default - #data "c:\program files\dcmms\data\tif\image1.tif" - TILEINDEX "c:\program files\dcmms\tiff\image_index.shp" + TILEINDEX "c:\ms4w\apps\dcmms\tiff\image_index.shp" TILEITEM "Location" TYPE RASTER END </programlisting> - <tip> - <para>The ImageType parameter in the mapfile should be specified as - <filename> JPEG </filename> for better quality output.</para> - </tip> - <tip><para> The AreaofInterest layer symbol definition should be - changed in order to display the workorder transparency correctly</para> - <programlisting> - # AreaOfInterest -LAYER - CONNECTIONTYPE postgis - NAME AreaOfInterest - TYPE POLYGON - STATUS OFF - CONNECTION "dbname=dcmms user=dummy password=dummy host=localhost" - DATA "areaofinterest from workorder" - filter "id = -1" - CLASS - NAME 'AreaOfInterest' - STYLE - SYMBOL "aoihatch" - SIZE 10 - WIDTH 2 - ANGLE 45 - COLOR 255 255 0 - OUTLINECOLOR 255 255 0 - END - - END - TRANSPARENCY alpha - TOLERANCE 15 -END # Layer - - </programlisting> - - </tip> - </para> + <tip><para>When using raster data, it is recommended to change the + IMAGETYPE parameter to "JPEG" as it offers good + compression for raster data.</para></tip> </sect3> </sect2> <sect2 id="plug-ins"> @@ -2551,8 +2522,23 @@ </orderedlist> </sect2> + <sect2 id="trobuleshooting_transparent_symbols"> + <title>Problems with Transparent Symbols</title> + <indexterm><primary>transparency</primary></indexterm> + <indexterm><primary>raster data</primary></indexterm> + <para>If symbols like the hatching of in the area of interest + symbol do not show transparent parts as expected, make sure + that you use the following configuration line in the LAYER + definition of your mapfiles:</para> + <programlisting>TRANSPARENCY ALPHA</programlisting> + <para>This applies especially when overlaying raster data with + partially transparent symbols.</para> + </sect2> + <sect2 id="troubleshooting_shapefile_loader"> <title>Shapefile Loader problems</title> + <indexterm><primary>loader</primary></indexterm> + <indexterm><primary>shapefile loader</primary></indexterm> <para>When encountering problems with the shapefile loader, use the DCMMS data model to double check that the required fields of all tables are in place.</para> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-29 09:49:50
|
Revision: 1148 Author: sdteffen Date: 2006-08-29 02:49:13 -0700 (Tue, 29 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1148&view=rev Log Message: ----------- Started with certification questions Modified Paths: -------------- branches/ms4w/dcmms/AUTHORS branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml branches/ms4w/dcmms/htdocs/workorder_status_report.php branches/ms4w/dcmms/script/create_dcmms_ddl.sql branches/ms4w/dcmms/script/update_dcmms_ddl.sql Modified: branches/ms4w/dcmms/AUTHORS =================================================================== --- branches/ms4w/dcmms/AUTHORS 2006-08-14 05:39:44 UTC (rev 1147) +++ branches/ms4w/dcmms/AUTHORS 2006-08-29 09:49:13 UTC (rev 1148) @@ -1,4 +1,4 @@ -Maher Karim <Mah...@do...> +Maher Abdel Karim <Mah...@do...> Abdulqader Jaradat <Abd...@ng...> Steffen Macke <Ste...@do...> Piero Cavalieri <pie...@he...> - Bug fixes, Italian translations Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-14 05:39:44 UTC (rev 1147) +++ branches/ms4w/dcmms/ChangeLog 2006-08-29 09:49:13 UTC (rev 1148) @@ -1,3 +1,19 @@ +2006-08-29 Steffen Macke <Ste...@do...> + + * doc/administration/dcmms_administration_guide.xml: Started with + certification information + +2006-08-23 Steffen Macke <Ste...@do...> + + * htdocs/workorder_status_report.php: Show "Type" instead of + "dcmmstranslation" in table header + +2006-08-22 Steffen Macke <Ste...@do...> + + * script/create_dcmms_ddl.sql: + * script/update_dcmms_ddl.sql: Added new material subtypes "socket" + and "90 degree elbow" + 2006-08-14 Steffen Macke <Ste...@do...> * doc/administration/dcmms_administration_guide.xml: Restructured Modified: branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml =================================================================== --- branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-14 05:39:44 UTC (rev 1147) +++ branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-29 09:49:13 UTC (rev 1148) @@ -73,6 +73,8 @@ <para>DCMMS Developer Guide and DCMMS User Guide provide additional information about the application.</para> + <para>Professional DCMMS administrators should go through the certification + process (See <xref linkend="certification" />).</para> <sect2 id="typographic_conventions"> <title>Typographic Conventions</title> <para>A "\" at the end of the line in program listings means @@ -157,7 +159,8 @@ <title>Component Diagram</title> <mediaobject> <imageobject role="fo"> - <imagedata format="SVG" fileref="figure/component_diagram.svg"/> + <!-- TODO: Add as SVG --> + <imagedata format="PNG" fileref="figure/component_diagram.png"/> </imageobject> <imageobject role="html"> <imagedata format="PNG" fileref="figure/component_diagram.png"/> @@ -2483,7 +2486,7 @@ <sect2 id="complete_uninstallation"> <title>Complete Uninstallation</title> <para>The uninstallation steps described below will completely remove - DCMMS and all of it's components.</para> + DCMMS and all of its components.</para> <warning><para>Make sure that you have backed up your DCMMS data.</para> </warning> <orderedlist> @@ -2658,6 +2661,10 @@ <sect2 id="troubleshooting_mapscript"> <title>FATAL ERROR: PHP extension 'MapScript' is not loaded</title> + <indexterm><primary>php_mapscript_46.dll</primary></indexterm> + <indexterm><primary>extension</primary><secondary + >mapscript</secondary></indexterm> + <indexterm><primary>MapScript</primary></indexterm> <para>Make sure that PHP mapscript is configured as an extension in <filename>php.ini</filename>.</para> <para>Make sure that <filename>php_mapscript_46.dll</filename> exists @@ -2671,6 +2678,7 @@ </sect2> <sect2 id="troubleshooting_map"> <title>Map Display</title> + <indexterm><primary>map display</primary></indexterm> <para>If map labels are not displayed properly (e.g. garbage diameters) and you're using tiled shapefiles, check that all your shapefiles have exactly the same table definition. Field name, type and order @@ -2679,6 +2687,7 @@ <sect2 id="troubleshooting_restore"> <title>Restore</title> + <indexterm><primary>restore</primary></indexterm> <para>Suppose you have problems restoring a <citetitle>DCMMS</citetitle> database and you are getting the following error message: <computeroutput><errortext>psql:dcmms-jerash-2004-01-19.sql.lib:34: @@ -2698,6 +2707,8 @@ <sect2 id="troubleshooting_upload"> <title>File Upload Fails</title> + <indexterm><primary>file upload</primary></indexterm> + <indexterm><primary>shapefile loader</primary></indexterm> <para>If the file upload in the <citetitle>Restore</citetitle> or <citetitle>Shapefile Loader</citetitle> pages fails, the following <filename>php.ini</filename> settings may have to be adjusted: @@ -2711,6 +2722,7 @@ <sect2 id="troubleshooting_dll"> <title>Unable to Load Dynamic Library</title> + <indexterm><primary>DLL</primary></indexterm> <para> When trying to open a page, the following message appears on the server: <errortext>Unknown(): Unable to load dynamic 'C:/Program Files/PHP/extensions\php_gettext.dll' - The specified module could not @@ -2730,10 +2742,13 @@ <filename>c:\winnt\system32</filename>.</para><para>The dll files can be found in the folder <filename>dlls</filename> of the <citetitle>PHP</citetitle> distribution</para></listitem> - </itemizedlist></para></sect2> + </itemizedlist></para> + <para>See also <xref linkend="troubleshooting_mapscript" />.</para> + </sect2> <sect2 id="log_files"> <title>Log Files</title> + <indexterm><primary>log files</primary></indexterm> <para>Apache, PostgreSQL, PHP and some of the installers write log files that are often helpful when troubleshooting.</para> <para>The level of verbosity of the server logs can often be @@ -2751,6 +2766,7 @@ </sect2> <sect2 id="maplab"> <title>MapLab</title> + <indexterm><primary>MapLab</primary></indexterm> <para>DCMMS requires a long maximum execution time for PHP scripts, MapLab requires a short one (30 seconds).</para> <para>In order to ovecome this problem, it may be required to use two @@ -2765,15 +2781,17 @@ </sect2> <sect2 id="htdig"> <title>Htdig</title> + <indexterm><primary>htdig</primary></indexterm> <para>Make sure that the DCMMS application is not indexed by - <citetitle>htdig</citetitle>. This will lead to an endless loop and - slow down your system.</para> + <citetitle>htdig</citetitle>. This will lead to an endless loop and + slow down your system.</para> <para>The <citetitle>htdig</citetitle> package offers as search engine for websites. Please check wether you're running - <citetitle>htdig</citetitle> before investigating further.</para> + <citetitle>htdig</citetitle> before investigating further.</para> </sect2> <sect2 id="cygwin_postgresql_update"> <title>Cygwin PostgreSQL Upgrade</title> + <indexterm><primary>Cygwin</primary></indexterm> <para>When upgrading from the Cygwin PostgreSQL version to the native Windows version, it could happen that some fields are too short while restoring because UNIX newlines (1 character) are converted @@ -2783,9 +2801,58 @@ field definitions.</para> <para>Note that <filename>dcmms.dump.ascii</filename> has the same encoding as the database (probably UTF-8).</para> + <note><para>This refers to rather old DCMMS versions.</para></note> </sect2> </sect1> </article> + <article id="certification"> + <title>Administrator Certification</title> + <indexterm><primary>certification</primary></indexterm> + <para>The stability of a DCMMS installation largely depends on sound + administration practises. The following questions shall help + DCMMS administrators to verify their understanding </para> + <para>Security relevant questions are marked with the caution icon and + count triple.</para> + <para>Contact the bmfo developers on <email + >bmf...@li...</email> if you wish to become a + certified DCMMS administrator.</para> + <para>It is recommended to renew the certification every two years. </para> + <sect1 id="certification_questions_2006"> + <title>2006 Certification Questions</title> + <qandaset> + <qandadiv><title>Security</title> + <qandaentry> + <question><para>Give an example of a strong password + (Note that you should <emphasis>never</emphasis> use this particular + password because it is revealed in this certification!): + </para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry> + <question><para>Give an example of a weak password:</para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry> + <question><para>Why are strong passwords important?</para></question> + <answer><para>...</para></answer></qandaentry> + </qandadiv> + <qandadiv> + <title>Engineering</title> + <qandaentry> + <question><para>Why does the <classname>Maintenance</classname> + table contain the <structfield>Diameter1</structfield> and + <structfield>Diameter2</structfield> fields? Is one + diameter field not sufficient? + </para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry> + <question><para>What is the difference between <structfield + >Diameter1</structfield> and <structfield + >Diameter2</structfield>.</para></question> + <answer><para>...</para></answer></qandaentry> + + </qandadiv> + </qandaset> + </sect1> + </article> <index> <title>Index</title> </index> Modified: branches/ms4w/dcmms/htdocs/workorder_status_report.php =================================================================== --- branches/ms4w/dcmms/htdocs/workorder_status_report.php 2006-08-14 05:39:44 UTC (rev 1147) +++ branches/ms4w/dcmms/htdocs/workorder_status_report.php 2006-08-29 09:49:13 UTC (rev 1148) @@ -36,7 +36,7 @@ if((array_key_exists("FromDate",$_POST))&&(array_key_exists("ToDate", $_POST))&&($_POST["FromDate"]!="")&&($_POST["ToDate"]!="")) { $query = 'select dcmmstranslation(\''.$_SESSION['language']. - '\', Workordersubtype.Description), 2*count(*)-sum(status) as '. + '\', Workordersubtype.Description) as Type, 2*count(*)-sum(status) as '. 'pending, sum(status)-count(*) as completed, count(*) from workorder left join WorkorderSubtype on Workorder.Subtype = WorkorderSubtype.Subtype left join Maintenance on Workorder.ID = Maintenance.ID where '. Modified: branches/ms4w/dcmms/script/create_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-14 05:39:44 UTC (rev 1147) +++ branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-29 09:49:13 UTC (rev 1148) @@ -433,6 +433,8 @@ insert into LandmarkSubtype values(16, 'Commercial'); insert into LandmarkSubtype values(17, 'Manufacturing'); insert into LandmarkSubtype values(18, 'Historic Site'); +-- Next subtype is used by AWC +-- insert into LandmarkSubtype values(26, 'Building'); insert into LandmarkSubtype values(100, 'Street'); insert into WorkorderSubtype(Subtype, Description) values(1, 'Leak'); @@ -583,6 +585,10 @@ (18, 'Ductile Cast Iron Pipe', 'meter'); insert into MaterialSubtype(Subtype, Description, Unit) values (19, 'Steel Pipe', 'meter'); +insert into MaterialSubtype(Subtype, Description, Unit) values + (25, 'Socket', 'piece'); +insert into MaterialSubtype(Subtype, Description, Unit) values + (26, '90° Elbow'); insert into MaterialSubtype (Subtype, Description, Unit) values (101, 'Black top excavation', 'square meter'); Modified: branches/ms4w/dcmms/script/update_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/update_dcmms_ddl.sql 2006-08-14 05:39:44 UTC (rev 1147) +++ branches/ms4w/dcmms/script/update_dcmms_ddl.sql 2006-08-29 09:49:13 UTC (rev 1148) @@ -1,6 +1,6 @@ -- DCMMS -- DC Maintenance Management System -- --- update_dcmms_ddl.sql - Update DCMMS data model from version 1.1.1 to 1.1.2 +-- update_dcmms_ddl.sql - Update DCMMS data model from version 1.1.2 to 2.0.0 -- -- Copyright (C) 2005 DORSCH Consult -- Copyright (C) 2006 DC Water and Environment @@ -26,145 +26,17 @@ -- run drop_views.sql before this script -- run create_views.sql after this script -update Workorder set ReceivedDate = date_trunc('second', ReceivedDate) - where ReceivedDate is not null; -update Maintenance set StartDate = date_trunc('second', StartDate) - where StartDate is not null; -update Maintenance set CompletionDate = date_trunc('second', CompletionDate) - where CompletionDate is not null; - -insert into MaintenanceSubtype (Subtype, Description) values(19, - 'Disconnection'); +-- TODO: translations for the following values +insert into MaterialSubtype(Subtype, Description, Unit) values + (25, 'Socket', 'piece'); +insert into MaterialSubtype(Subtype, Description, Unit) values + (26, '90° Elbow'); -create or replace function dcmmsTranslationUpdate(LanguageText text, - TermText text, TranslationText text) returns void as -$$ -begin - loop - update Translation set Translation = TranslationText - where language = languagetext and term = termtext; - if found then - return; - end if; - begin - insert into Translation(Language, Term, Translation) - values (LanguageText, TermText, TranslationText); - return; - exception when unique_violation then - -- do nothing - end; - end loop; -end; -$$ -language plpgsql; -comment on function dcmmsTranslationUpdate(text, text, text) is - 'Insert or update a translation to the Translation table. - @param LanguageText is the 2 or 5 letter ISO code of the language. - @param TermText is the term to be translated - @param TranslationText is the translation of LanguageText in the - specified language. - @returns Void.'; - -select dcmmsTranslationUpdate('en', 'Leak', 'Leak'); -select dcmmsTranslationUpdate('en', 'No Water', 'No Water'); -select dcmmsTranslationUpdate('en', 'Pollution', 'Pollution'); -select dcmmsTranslationUpdate('en', 'Other', 'Other'); -select dcmmsTranslationUpdate('en', 'Blockage', 'Blockage'); -select dcmmsTranslationUpdate('en', 'Flooding', 'Flooding'); -select dcmmsTranslationUpdate('en', 'Damaged Installation', 'Damaged Installation'); -select dcmmsTranslationUpdate('en', 'Illegal Use', 'Illegal Use'); -select dcmmsTranslationUpdate('en', 'Wrong Bill', 'Wrong Bill'); -select dcmmsTranslationUpdate('en', 'No Bill', 'No Bill'); -select dcmmsTranslationUpdate('en', 'Wrong Reading', 'Wrong Reading'); -select dcmmsTranslationUpdate('en', 'Subscription Change', 'Subscription Change'); -select dcmmsTranslationUpdate('en', 'Unregistered Payment', 'Unregistered Payment'); -select dcmmsTranslationUpdate('en', 'Low Pressure', 'Low Pressure'); -select dcmmsTranslationUpdate('ar', 'Leak', 'تسرب'); -select dcmmsTranslationUpdate('ar', 'No Water', 'انقطاع المياه'); -select dcmmsTranslationUpdate('ar', 'Pollution', 'تلوث'); -select dcmmsTranslationUpdate('ar', 'Other', 'أخرى'); -select dcmmsTranslationUpdate('ar', 'Blockage', 'انسداد'); -select dcmmsTranslationUpdate('ar', 'Flooding', 'فيضان'); -select dcmmsTranslationUpdate('ar', 'Damaged Installation', 'تمديدات تالفة'); -select dcmmsTranslationUpdate('ar', 'Illegal Use', 'استخدام غير شرعي'); -select dcmmsTranslationUpdate('ar', 'Wrong Bill', 'فاتورة خاطئة'); -select dcmmsTranslationUpdate('ar', 'No Bill', 'لا يوجد فاتورة'); -select dcmmsTranslationUpdate('ar', 'Wrong Reading', 'قراءة خاطئة'); -select dcmmsTranslationUpdate('ar', 'Subscription Change', 'تغيير الاشتراك'); -select dcmmsTranslationUpdate('ar', 'Unregistered Payment', 'دفعة غير مسجلة'); -select dcmmsTranslationUpdate('ar', 'Low Pressure', 'ضغط منخفض'); - -select dcmmsTranslationUpdate('ar_SY', 'Leak', 'تسرب'); -select dcmmsTranslationUpdate('ar_SY', 'No Water', 'انقطاع المياه'); -select dcmmsTranslationUpdate('ar_SY', 'Pollution', 'تلوث'); -select dcmmsTranslationUpdate('ar_SY', 'Other', 'أخرى'); -select dcmmsTranslationUpdate('ar_SY', 'Blockage', 'انسداد'); -select dcmmsTranslationUpdate('ar_SY', 'Flooding', 'تدفق'); -select dcmmsTranslationUpdate('ar_SY', 'Damaged Installation', 'تمديدات تالفة'); -select dcmmsTranslationUpdate('ar_SY', 'Illegal Use', 'استخدام غير شرعي'); -select dcmmsTranslationUpdate('ar_SY', 'Wrong Bill', 'فاتورة خاطئة'); -select dcmmsTranslationUpdate('ar_SY', 'No Bill', 'لا يوجد فاتورة'); -select dcmmsTranslationUpdate('ar_SY', 'Wrong Reading', 'قراءة خاطئة'); -select dcmmsTranslationUpdate('ar_SY', 'Subscription Change', 'تغيير الاشتراك'); -select dcmmsTranslationUpdate('ar_SY', 'Unregistered Payment', 'دفعة غير مسجلة'); -select dcmmsTranslationUpdate('ar_SY', 'Low Pressure', 'ضغط المياه ضعيف'); - -select dcmmsTranslationUpdate('fr', 'Leak', 'Fuite'); -select dcmmsTranslationUpdate('fr', 'No Water', 'Absence d''eau'); -select dcmmsTranslationUpdate('fr', 'Pollution', 'Pollution'); -select dcmmsTranslationUpdate('fr', 'Other', 'Autre'); -select dcmmsTranslationUpdate('fr', 'Blockage', 'Obstruction '); -select dcmmsTranslationUpdate('fr', 'Flooding', 'Innondation'); -select dcmmsTranslationUpdate('fr', 'Damaged Installation', 'Installation endommagée'); -select dcmmsTranslationUpdate('fr', 'Illegal Use', 'Utilisation illégale.'); -select dcmmsTranslationUpdate('fr', 'Wrong Bill', 'Faux effet'); -select dcmmsTranslationUpdate('fr', 'No Bill', 'Pas d''effet.'); -select dcmmsTranslationUpdate('fr', 'Wrong Reading', 'Fausse lecture'); -select dcmmsTranslationUpdate('fr', 'Subscription Change', 'Modification de la souscription.'); -select dcmmsTranslationUpdate('fr', 'Unregistered Payment', 'payement non enregistré'); -select dcmmsTranslationUpdate('fr', 'Low Pressure', 'faible pression'); - -select dcmmsTranslationUpdate('it', 'Leak', 'Perdita'); -select dcmmsTranslationUpdate('it', 'No Water', 'No acqua'); -select dcmmsTranslationUpdate('it', 'Pollution', 'Inquinamento'); -select dcmmsTranslationUpdate('it', 'Other', 'Altro'); - -select dcmmsTranslationUpdate('th', 'Leak', 'รอยรั่ว'); -select dcmmsTranslationUpdate('th', 'No Water', 'ไม่มีน้ำ'); -select dcmmsTranslationUpdate('th', 'Pollution', 'มลภาวะ'); -select dcmmsTranslationUpdate('th', 'Other', 'อื่นๆ'); -select dcmmsTranslationUpdate('th', 'Blockage', 'สิ่งกีดขวาง'); -select dcmmsTranslationUpdate('th', 'Flooding', 'น้ำท่วม'); -select dcmmsTranslationUpdate('th', 'Damaged Installation', 'การติดตั้งถูกทำลาย'); -select dcmmsTranslationUpdate('th', 'Illegal Use', 'การใช้ที่ผิดกฎหมาย'); -select dcmmsTranslationUpdate('th', 'Wrong Bill', 'ใบแจ้งหนี้ผิด'); -select dcmmsTranslationUpdate('th', 'No Bill', 'ไม่มีใบแจ้งหนี้'); -select dcmmsTranslationUpdate('th', 'Wrong Reading', 'บนรอยเชื่อม'); -select dcmmsTranslationUpdate('th', 'Subscription Change', 'เปลี่ยนแปลงสมาชิก'); - create or replace function dcmmsversion() returns text as $body$ begin - return '1.1.2'; + return '2.0.0'; end; $body$ language 'plpgsql' immutable; comment on function dcmmsversion() is 'Return the DCMMS version number.'; - -comment on column WorkorderSubtype.Description is - 'Translated using dcmmstranslation().'; -comment on column MaintenanceSubtype.Description is -'Translated using gettext.'; - --- Application now freezes links in workorderpage.php, if data is not filled. -insert into history (select nextval('history_seq'), Workorder.ID, 'workorder', - now(), user, 'subtype', '' from Workorder left outer join history on - Workorder.ID = History.RecordOID where History.ID is null); - -comment on column Team.Subtype is - 'Foreign key referencing the CodedValue field of the TeamSubype class.'; -comment on column TeamSubtype.Description is - 'Translated using gettext.'; -comment on column Team.Description is - 'Translated using dcmmstranslation().'; - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-30 05:15:37
|
Revision: 1149 Author: sdteffen Date: 2006-08-29 22:14:20 -0700 (Tue, 29 Aug 2006) ViewCVS: http://svn.sourceforge.net/dcmms/?rev=1149&view=rev Log Message: ----------- * include/i18n.php: * script/create_dcmms_ddl.sql: * script/update_dcmms_ddl.sql: Added leak location 'Manhole' * doc/administration/dcmms_administration_guide.xml: Started with certification information Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml branches/ms4w/dcmms/include/i18n.php branches/ms4w/dcmms/locale/ar/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/script/create_dcmms_ddl.sql branches/ms4w/dcmms/script/update_dcmms_ddl.sql Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-29 09:49:13 UTC (rev 1148) +++ branches/ms4w/dcmms/ChangeLog 2006-08-30 05:14:20 UTC (rev 1149) @@ -1,5 +1,8 @@ 2006-08-29 Steffen Macke <Ste...@do...> + * include/i18n.php: + * script/create_dcmms_ddl.sql: + * script/update_dcmms_ddl.sql: Added leak location 'Manhole' * doc/administration/dcmms_administration_guide.xml: Started with certification information Modified: branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml =================================================================== --- branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-29 09:49:13 UTC (rev 1148) +++ branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-30 05:14:20 UTC (rev 1149) @@ -2811,8 +2811,7 @@ <para>The stability of a DCMMS installation largely depends on sound administration practises. The following questions shall help DCMMS administrators to verify their understanding </para> - <para>Security relevant questions are marked with the caution icon and - count triple.</para> + <para>Security relevant questions count triple.</para> <para>Contact the bmfo developers on <email >bmf...@li...</email> if you wish to become a certified DCMMS administrator.</para> Modified: branches/ms4w/dcmms/include/i18n.php =================================================================== --- branches/ms4w/dcmms/include/i18n.php 2006-08-29 09:49:13 UTC (rev 1148) +++ branches/ms4w/dcmms/include/i18n.php 2006-08-30 05:14:20 UTC (rev 1149) @@ -177,6 +177,7 @@ _("Maintenance Team"); _("maintenanceoid"); _("MaintenanceSubtype"); +_("Manhole"); _("Manufacturing"); _("Material1"); _("material1"); Modified: branches/ms4w/dcmms/locale/ar/LC_MESSAGES/dcmms.po =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/script/create_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-29 09:49:13 UTC (rev 1148) +++ branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-30 05:14:20 UTC (rev 1149) @@ -526,6 +526,7 @@ insert into LeakLocation values(4, 'On valve'); insert into LeakLocation values(5, 'On welding'); insert into LeakLocation values(6, 'On plumbing'); +insert into LeakLocation values(7, 'Manhole'); insert into LeakLocation values(0, 'Other'); -- TODO: add more Diameters Modified: branches/ms4w/dcmms/script/update_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/update_dcmms_ddl.sql 2006-08-29 09:49:13 UTC (rev 1148) +++ branches/ms4w/dcmms/script/update_dcmms_ddl.sql 2006-08-30 05:14:20 UTC (rev 1149) @@ -31,8 +31,9 @@ (25, 'Socket', 'piece'); insert into MaterialSubtype(Subtype, Description, Unit) values (26, '90° Elbow'); + +insert into LeakLocation values(7, 'Manhole'); - create or replace function dcmmsversion() returns text as $body$ begin @@ -40,3 +41,4 @@ end; $body$ language 'plpgsql' immutable; comment on function dcmmsversion() is 'Return the DCMMS version number.'; + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-31 06:17:49
|
Revision: 1150 http://svn.sourceforge.net/dcmms/?rev=1150&view=rev Author: sdteffen Date: 2006-08-30 23:16:09 -0700 (Wed, 30 Aug 2006) Log Message: ----------- * doc/administration/dcmms_administration_guide.xml: Continued with FAQ * dcmms.nsi: * etc/DCMMS.url: Use logon.php directly to short startup time Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/dcmms.nsi branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml branches/ms4w/dcmms/etc/DCMMS.url branches/ms4w/dcmms/include/i18n.php branches/ms4w/dcmms/plugin/imageidentifyplugin.php branches/ms4w/dcmms/script/create_dcmms_ddl.sql Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/ChangeLog 2006-08-31 06:16:09 UTC (rev 1150) @@ -1,3 +1,15 @@ +2006-08-31 Steffen Macke <Ste...@do...> + + * doc/administration/dcmms_administration_guide.xml: Continued with FAQ + * dcmms.nsi: + * etc/DCMMS.url: Use logon.php directly to short startup time + +2006-08-30 Steffen Macke <Ste...@do...> + + * include/i18n.php: + * script/create_dcmms_ddl.sql: Reserved maintenance cause "Rubbish" + * plugin/imageidentifyplugin.php: Use target="_top" for the image link + 2006-08-29 Steffen Macke <Ste...@do...> * include/i18n.php: Modified: branches/ms4w/dcmms/dcmms.nsi =================================================================== --- branches/ms4w/dcmms/dcmms.nsi 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/dcmms.nsi 2006-08-31 06:16:09 UTC (rev 1150) @@ -485,8 +485,8 @@ default_port: StrCpy $R0 "81" found_port: - !insertmacro ReplaceInFile "$SMPROGRAMS\DCMMS\DCMMS.url" "http://localhost/dcmms/" "http://localhost:$R0/dcmms/" - !insertmacro ReplaceInFile "$DESKTOP\DCMMS.url" "http://localhost/dcmms/" "http://localhost:$R0/dcmms/" + !insertmacro ReplaceInFile "$SMPROGRAMS\DCMMS\DCMMS.url" "http://localhost/dcmms/logon.php" "http://localhost:$R0/dcmms/logon.php" + !insertmacro ReplaceInFile "$DESKTOP\DCMMS.url" "http://localhost/dcmms/logon.php" "http://localhost:$R0/dcmms/logon.php" SectionEnd Section "Apache/PHP Config" SecConf Modified: branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml =================================================================== --- branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-31 06:16:09 UTC (rev 1150) @@ -304,7 +304,8 @@ on a system with an English version of the Windows operating system. The folders will be created during the installation process described below.</para> - <para><filename>c:\Program Files\dcmms\config</filename> contains all + <para><indexterm><primary>configuration files</primary></indexterm> + <filename>c:\Program Files\dcmms\config</filename> contains all configuration files with the exception of <filename>c:\Program Files\dcmms\includedcmconfig.php</filename>.</para> <para><filename>c:\Program Files\dcmms\doc</filename> contains the @@ -327,7 +328,8 @@ Windows user administration, Windows services, GIS (e.g. ArcView), mailing lists - however such knowledge is not a requirement.</para> <para>Various support possibilities are available to support - new administrators.</para> + new administrators (See <xref linkend="support_tracker" />, + <xref linkend="mailing_lists" />).</para> </sect2> </sect1> <sect1 id="concepts"> @@ -1262,6 +1264,9 @@ after successfull installation.</para> <sect2 id="dcmconfig.php"> <title>Configuration Files</title> + <indexterm><primary>dcmconfig.php</primary></indexterm> + <indexterm><primary>configuration</primary></indexterm> + <indexterm><primary>php.ini</primary></indexterm> <para>The file <filename>include/dcmconfig.php</filename> contains the configuration of the DCMMS application.</para> <para>A default configuration file is stored under @@ -1270,6 +1275,8 @@ <para>The configuration file can be edited using any text editor.</para> <para>All other configuration files can be found in the <filename >conf</filename> folder: <filename>c:\Program Files\dcmms\conf</filename>.</para> + <para>The PHP configuration file <filename>php.ini</filename> is installed + by default under <filename>c:\windows</filename>.</para> </sect2> <sect2 id="custom_map"> <title>Custom Map</title> @@ -1456,6 +1463,22 @@ sections). See the "[Plugin1]", "[Plugin2]", ... sections for details.</para> </sect3> + </sect2> + <sect2 id="database_side_customization"> + <title>Database Side Customization</title> + <indexterm><primary>customization</primary><secondary + >database side</secondary></indexterm> + <indexterm><primary>coded value</primary></indexterm> + <indexterm><primary>translation</primary></indexterm> + <indexterm><primary>lookup table</primary></indexterm> + <para>Through modification of lookup table values in the database, DCMMS + can be customized to meet different needs. Please explore the DCMMS + data model and the DCMMS database for details.</para> + <caution><para>To prevent future DCMMS updates from overwriting your + customizations (or your customizations colliding with future DCMMS + coded values, you are strongly advised to coordinate your database-side + customizations with the developers, e.g. by sending an email to + <email>dcm...@li...</email>.</para></caution> </sect2> </sect1> <sect1 id="administration"> @@ -1815,6 +1838,22 @@ of the <citetitle>PostgreSQL Database Server 8.0</citetitle> service. </para></caution> </sect2> + <sect2 id="database_administration"> + <title>Database</title> + <indexterm><primary>database</primary></indexterm> + <indexterm><primary>pgAdmin</primary></indexterm> + <indexterm><primary>psql</primary></indexterm> + <para>Database administration can be performed e.g. using <command + >pgAdmin</command> which + is included in the PostgreSQL installation. The SQL language can be + used to perform those tasks that are not directly accessible through the + <command>pgAdmin</command> GUI.</para> + <para>See the PostgreSQL documentation for detailed information regarding + the PostgreSQL database and SQL commands.</para> + <tip><para>Experienced ORACLE administrators that are used to work with + <command>sqlplus</command> may prefer the <command>psql</command> + commandline environment over <command>pgAdmin</command>.</para></tip> + </sect2> </sect1> <sect1 id="analysis"> <title>Analysis</title> @@ -2451,6 +2490,15 @@ not been used during the data entry. Migrate those critical values to others first.</para></caution> </sect2> + <sect2 id="faq_how_to_add_material"> + <indexterm><primary>new material</primary></indexterm> + <indexterm><primary>add material</primary></indexterm> + <title>How to add e.g. a new material?</title> + <para>Materials in DCMMS are simple records in the <classname + >MaterialDomain</classname> table of the dcmms database. Adding a + material is as simple as adding a new record. See <xref + linkend="database_side_customization" /> for the details.</para> + </sect2> </sect1> <sect1 id="troubleshooting"> <title>Troubleshooting</title> @@ -2845,10 +2893,35 @@ <qandaentry> <question><para>What is the difference between <structfield >Diameter1</structfield> and <structfield - >Diameter2</structfield>.</para></question> + >Diameter2</structfield>?</para></question> <answer><para>...</para></answer></qandaentry> - </qandadiv> + <qandadiv> + <title>Customization</title> + <qandaentry><question><para>How can a new pipe material be added to the + DCMMS?</para></question> + <answer><para>...</para></answer></qandaentry> + </qandadiv> + <qandadiv> + <title>Technology</title> + <qandaentry><question><para>A DCMMS server with the start URL + http://www.dcmms.org/dcmms/logon.php has been changed to use port + 81. What is the new start URL?</para></question> + <answer><para>...</para></answer> + </qandaentry> + <qandaentry><question><para>What are the different components of + the URL https://www.dcmms.org:441/dcmms/logon.php?</para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry><question><para>What is the default port for the HTTP + protocol?</para></question><answer><para>...</para></answer> + </qandaentry> + <qandaentry><question><para>What is the default port for the HTTPS + protocol?</para></question><answer><para>...</para></answer> + </qandaentry> + <qandaentry><question><para>What is the difference between the HTTP + and HTTPS protocols?</para></question><answer><para>...</para></answer> + </qandaentry> + </qandadiv> </qandaset> </sect1> </article> Modified: branches/ms4w/dcmms/etc/DCMMS.url =================================================================== --- branches/ms4w/dcmms/etc/DCMMS.url 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/etc/DCMMS.url 2006-08-31 06:16:09 UTC (rev 1150) @@ -1,3 +1,3 @@ [InternetShortcut] -URL=http://localhost/dcmms/ +URL=http://localhost/dcmms/logon.php Modified=907505726940C301E9 Modified: branches/ms4w/dcmms/include/i18n.php =================================================================== --- branches/ms4w/dcmms/include/i18n.php 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/include/i18n.php 2006-08-31 06:16:09 UTC (rev 1150) @@ -46,7 +46,7 @@ _("Black top excavation"); _("Blockage Removal"); _("Blockage"); -_("Browse...") +_("Browse..."); _("Burying"); _("Car"); _("Cast Iron"); @@ -251,6 +251,7 @@ _("responsible"); _("responsibleteam"); _("Retired"); +_("Rubbish"); _("Seal"); _("Serial Number"); _("Serialnumber"); @@ -304,7 +305,7 @@ _("unsealed"); _("User management"); _("User"); -_("username") +_("username"); _("Utility"); _("Valve Replacement"); _("Valve replacement"); Modified: branches/ms4w/dcmms/plugin/imageidentifyplugin.php =================================================================== --- branches/ms4w/dcmms/plugin/imageidentifyplugin.php 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/plugin/imageidentifyplugin.php 2006-08-31 06:16:09 UTC (rev 1150) @@ -135,7 +135,7 @@ } $objTable->addRow(array('<a href="'. sprintf($this->arrConfiguration['ImageLocationURL'], $strValue). - $strFile.'">'.$strFile.'</a> ', $strComment)); + $strFile.'" target="_top">'.$strFile.'</a> ', $strComment)); } } closedir($handle); Modified: branches/ms4w/dcmms/script/create_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-30 05:14:20 UTC (rev 1149) +++ branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-31 06:16:09 UTC (rev 1150) @@ -507,6 +507,7 @@ insert into CauseDomain values(8, 'Substandard Installation'); insert into CauseDomain values(9, 'Municipality'); -- insert into CauseDomain values(10, 'High Water Table'); +-- insert into CauseDomain values(11, 'Rubbish'); insert into NetworkDomain (CodedValue, Description) values(1, 'Water Supply'); insert into NetworkDomain (CodedValue, Description) values(2, 'Sewerage'); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-08-31 08:44:07
|
Revision: 1151 http://svn.sourceforge.net/dcmms/?rev=1151&view=rev Author: sdteffen Date: 2006-08-31 01:42:51 -0700 (Thu, 31 Aug 2006) Log Message: ----------- * locale/ar_YE/LC_MESSAGES/dcmms.po: Added Yemeni Arabic translations Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog Added Paths: ----------- branches/ms4w/dcmms/locale/ar_YE/ branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/ branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-31 06:16:09 UTC (rev 1150) +++ branches/ms4w/dcmms/ChangeLog 2006-08-31 08:42:51 UTC (rev 1151) @@ -1,5 +1,6 @@ 2006-08-31 Steffen Macke <Ste...@do...> + * locale/ar_YE/LC_MESSAGES/dcmms.po: Added Yemeni Arabic translations * doc/administration/dcmms_administration_guide.xml: Continued with FAQ * dcmms.nsi: * etc/DCMMS.url: Use logon.php directly to short startup time Added: branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po =================================================================== --- branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po (rev 0) +++ branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po 2006-08-31 08:42:51 UTC (rev 1151) @@ -0,0 +1,4078 @@ +# SOME DESCRIPTIVE TITLE. +# Copyright (C) YEAR Free Software Foundation, Inc. +# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: DCMMS 1.2.0\n" +"POT-Creation-Date: 2003-07-03 14:07+0300\n" +"PO-Revision-Date: 2006-08-31 11:40+0200\n" +"Last-Translator: Steffen Macke <Ste...@do...>\n" +"Language-Team: ar <Ste...@do...>\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=utf-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Poedit-Basepath: .\n" +"X-Poedit-Language: Arabic\n" +"X-Poedit-Country: YEMEN\n" +"X-Poedit-SearchPath-0: ../../..\n" + +# c:\program +#: ../../../admin/analysis.php:32 +#: ../../../htdocs/index.php:129 +msgid "Analysis" +msgstr "التحليل" + +#: ../../../admin/analysis.php:36 +msgid "Maintenance Density" +msgstr "كثافة الصيانة" + +# c:\program +#: ../../../admin/analysis.php:37 +msgid "Per-pipe Density" +msgstr "الكثافة بحسب الانبوب" + +#: ../../../admin/analysis.php:38 +msgid "Per-connection Density" +msgstr "الكثافة بحسب الوصلة" + +# c:\program +#: ../../../admin/analysis.php:54 +#: ../../../admin/purge_workorder.php:34 +#: ../../../admin/setup.php:61 +#: ../../../htdocs/aging_report.php:63 +#: ../../../htdocs/broken_seals_report.php:45 +#: ../../../htdocs/excavation_report.php:44 +#: ../../../htdocs/full_report.php:45 +#: ../../../htdocs/maintenance_by_team_report.php:39 +#: ../../../htdocs/monthly_management_report.php:70 +#: ../../../htdocs/quantity_report.php:39 +#: ../../../htdocs/received_workorders_report.php:42 +#: ../../../htdocs/resource_report.php:38 +#: ../../../htdocs/zoom.php:47 +#: ../../../include/dataobject/Landmark.php:87 +#: ../../../include/dataobject/Maintenance.php:168 +#: ../../../include/dataobject/Seal.php:95 +#: ../../../include/dataobject/Team.php:126 +#: ../../../include/dataobject/Translation.php:89 +#: ../../../include/dataobject/Workorder.php:177 +msgid "denotes required field" +msgstr "ادخل الحقل المطلوب" + +# c:\program +#: ../../../admin/analysis.php:58 +msgid "Perform a spatial analysis of the DCMMS data." +msgstr "اجراء عملية التحليل المكاني للبيانات." + +#: ../../../admin/analysis.php:60 +#: ../../../htdocs/aging_report.php:86 +#: ../../../htdocs/zoom.php:79 +#: ../../../include/dataobject/Landmark.php:107 +#: ../../../include/dataobject/Maintenance.php:96 +#: ../../../include/dataobject/Team.php:105 +#: ../../../include/dataobject/Workorder.php:94 +msgid "Type:" +msgstr ":النوع" + +#: ../../../admin/analysis.php:63 +msgid " Workorder Type:" +msgstr "نوع امر العمل:" + +#: ../../../admin/analysis.php:67 +msgid "Resolution X:" +msgstr "Xالبعد الافقي:" + +#: ../../../admin/analysis.php:69 +msgid "Resolution Y:" +msgstr "Yالبعد العامودي:" + +# c:\program +#: ../../../admin/analysis.php:71 +msgid "Run" +msgstr "تنفيذ" + +#: ../../../admin/analysis.php:77 +msgid "Please select the analysis type." +msgstr ".الرجاء اختيار نوع التحليل" + +# c:\program +#: ../../../admin/analysis.php:80 +msgid "Please provide the resolution in x direction." +msgstr ".xالرجاء ادخال الابعاد بالمستوى الافقي " + +# c:\program +#: ../../../admin/analysis.php:83 +msgid "Please provide the resolution in y direction." +msgstr ".yالرجاء ادخال الابعاد بالمستوى العامودي " + +# c:\program +#: ../../../admin/analysis.php:86 +#: ../../../admin/analysis.php:89 +msgid "Resolution in x direction must be a positive integer." +msgstr ". الابعاد بالمستوى الافقي x يجب ان تكون ارقام صحيحة " + +# c:\program +#: ../../../admin/analysis.php:93 +msgid "Please be patient while the analysis is running." +msgstr ".يرجى الانتظار حتى يتم الانتهاء من عملية التحليل" + +# c:\program +#: ../../../admin/analysis.php:119 +#, php-format +msgid "Created %s x %s %s Raster" +msgstr "Created %s x %s %s Raster" + +# c:\program +#: ../../../admin/analysis.php:124 +#, php-format +msgid "Use the %sshapefile dumper%s to download the table '%s'." +msgstr " %sمن الجدول%s لتنزيل بيانات %sاستخدم " + +# c:\program +#: ../../../admin/analysis.php:129 +#, php-format +msgid "Failed to create %s x %s %s raster." +msgstr " صورة%s x %s %sفشل في انشاء " + +#: ../../../admin/initialize_webtest.php:29 +msgid "Webtest Initialization" +msgstr "تحضير فحص الموقع" + +#: ../../../admin/initialize_webtest.php:36 +msgid "WARNING: This will delete all records from the database!" +msgstr "تحذير : هذا سوف يلغي جميع البيانات" + +# c:\program +#: ../../../admin/initialize_webtest.php:37 +msgid "Delete All Records" +msgstr "شطب جميع البيانات" + +#: ../../../admin/initialize_webtest.php:39 +#: ../../../htdocs/resource.php:257 +#: ../../../include/dataobject/Landmark.php:113 +msgid "Delete" +msgstr "حذف" + +# c:\program +#: ../../../admin/initialize_webtest.php:43 +msgid "Please confirm the deletion." +msgstr ".الرجاء تاكيد الشطب" + +#: ../../../admin/initialize_webtest.php:61 +msgid "ERROR: Restarting sequence failed." +msgstr "خطأ:فشل في اعادة بدء التسلسل" + +# c:\program +#: ../../../admin/initialize_webtest.php:71 +msgid "Delete from History failed." +msgstr "لم تتم عملية حذف التاريخ بنجاح" + +#: ../../../admin/purge_workorder.php:27 +#: ../../../admin/purge_workorder.php:36 +#: ../../../htdocs/index.php:126 +msgid "Purge Workorder" +msgstr "ازالة امر العمل" + +#: ../../../admin/purge_workorder.php:35 +#: ../../../include/dataobject/Seal.php:63 +msgid "Workorder ID:" +msgstr "رقم امر العمل:" + +# c:\program +#: ../../../admin/purge_workorder.php:40 +msgid "Please enter the workorder ID." +msgstr "الرجاء ادخال رقم معرف لأمر العمل" + +# c:\program +#: ../../../admin/purge_workorder.php:42 +msgid "Workorder ID must be a positive integer." +msgstr "يجب أن يكون الرقم المعرف لأمر العمل رقما صحيحا موجبا" + +#: ../../../admin/purge_workorder.php:45 +msgid "Remove a workorder and all related records from the database." +msgstr ".ازالة امر العمل وجميع السجلات المرتبطة معه من قاعدة البيانات" + +#: ../../../admin/purge_workorder.php:54 +msgid "Database returned error:" +msgstr "خطأ معاد من قاعدة المعطيات:" + +#: ../../../admin/purge_workorder.php:65 +#, php-format +msgid "Deleted %d records related to workorder #%s." +msgstr "حذف %d سجل متعلق بأمر العمل %s" + +# c:\program +#: ../../../admin/remove_temporary_files.php:26 +#: ../../../admin/remove_temporary_files.php:31 +#: ../../../htdocs/index.php:123 +msgid "Remove Temporary Files" +msgstr "حذف الملفات المؤقتة" + +#: ../../../admin/remove_temporary_files.php:43 +msgid "Script Output" +msgstr "نص الخرج" + +# c:\program +#: ../../../admin/remove_temporary_files.php:50 +msgid "This will delete all files in c:\\tmp and c:\\tmp\\ms_tmp." +msgstr "C:\\tmp و C:\\tmp\\ms-tmp هذا سوف يقوم بحدف الملفات تحت" + +# c:\program +#: ../../../admin/remove_temporary_files.php:52 +msgid "All files that are older than one hour will be deleted." +msgstr ".جميع الملفات التي عمرها اكثر من ساعة سوف يتم حذفها." + +#: ../../../admin/setup.php:41 +msgid "DCMMS Setup" +msgstr "تنزيل نظام ادارة الصيانة" + +#: ../../../admin/setup.php:55 +#: ../../../admin/translation_management.php:58 +msgid "Adding the missing translations failed." +msgstr ".اظافة الترجمة المطلوبة فشل" + +#: ../../../admin/setup.php:65 +msgid "Languages in include/dcmconfig.php:" +msgstr "include/dcmconfig.php اللغات في:" + +#: ../../../admin/setup.php:68 +#: ../../../admin/setup.php:87 +msgid "ISO Code" +msgstr "ISO شيفرة " + +#: ../../../admin/setup.php:82 +#, php-format +msgid "Languages in the Language table of the %s database." +msgstr ".اللغات في جدول اللغات الموجود في %s قاعدة البيانات" + +# c:\program +#: ../../../admin/setup.php:88 +#: ../../../htdocs/landmark.php:246 +#: ../../../include/i18n.php:195 +msgid "Name" +msgstr "الاسم:" + +#: ../../../admin/setup.php:95 +msgid "Plug-Ins" +msgstr "مدخل" + +#: ../../../admin/setup.php:96 +msgid "Identify Plug-Ins" +msgstr "تعريف المدخلات" + +#: ../../../admin/setup.php:115 +msgid "PEAR Packages" +msgstr "حزمة Pear" + +#: ../../../admin/setup.php:120 +msgid "Package" +msgstr "الحزم" + +# c:\program +#: ../../../admin/setup.php:121 +msgid "Version" +msgstr "النسخة" + +# c:\program +#: ../../../admin/shapefile_dumper.php:33 +#: ../../../admin/shapefile_loader.php:35 +#: ../../../admin/user_management.php:43 +#: ../../../include/dcmmspage.php:462 +msgid "This page is for DCMMS administrators only." +msgstr ".هذه الصفحة للشخص المسؤول فقط" + +#: ../../../admin/shapefile_dumper.php:42 +msgid "ERROR: Zip program is missing." +msgstr "خطأ: برنامج ضغط الملفات مفقود" + +#: ../../../admin/shapefile_dumper.php:50 +msgid "ERROR: pgsql2shp program is missing." +msgstr "خطأ: البرنامج pgsql2shp مفقود" + +# c:\program +#: ../../../admin/shapefile_dumper.php:55 +msgid "Download shapefiles from dcmms geodatabase." +msgstr "تصدير البيانات من قاعدة بيانات DCMMS على شكل shapefile." + +#: ../../../admin/shapefile_dumper.php:128 +#, php-format +msgid "Successfully dumped table '%s' to a shapefile." +msgstr "to shapefile'%s' تمت عملية تحويل جدول " + +# c:\program +#: ../../../admin/shapefile_dumper.php:130 +msgid "Download " +msgstr "تنزيل" + +#: ../../../admin/shapefile_dumper.php:134 +#, php-format +msgid "Failed to dump table '%s' to a shapefile." +msgstr "to shapefile'%s' لم تتم عملية تحويل جدول " + +# c:\program +#: ../../../admin/shapefile_dumper.php:142 +msgid "Please select the table which you want to download." +msgstr "(الرجاء اختيار الجدول الذي تريد تصديره (تنزيله" + +#: ../../../admin/shapefile_dumper.php:156 +msgid "The table for download." +msgstr ".جدول التحميل" + +# c:\program +#: ../../../admin/shapefile_dumper.php:156 +msgid "Table Name:" +msgstr "اسم الجدول:" + +#: ../../../admin/shapefile_dumper.php:158 +msgid "Select this if fields like 'frlocation' or 'ardescript' should be updated." +msgstr " يجب ان يتم تعديله'frlocation' او 'ardescript' اختر هذا اذا كان" + +#: ../../../admin/shapefile_dumper.php:159 +msgid "Update Translations" +msgstr "تحديث الترجمة" + +# c:\program +#: ../../../admin/shapefile_dumper.php:162 +msgid "Press the button after selecting the table." +msgstr ".اضغط الزر بعد اختيار الجدول." + +# c:\program +#: ../../../admin/shapefile_dumper.php:163 +msgid "Dump File" +msgstr "استيراد جدول" + +# c:\program +#: ../../../admin/shapefile_loader.php:31 +#: ../../../htdocs/index.php:96 +msgid "Shapefile Loader" +msgstr "تحميل البيانات الى قاعدة البيانات" + +#: ../../../admin/shapefile_loader.php:49 +#, php-format +msgid "ERROR: shp2pgsql program (%sshp2pgsql.exe)is missing." +msgstr "خطأ: البرنامج shp2pgsql (%sshp2pgsql.exe) مفقود" + +# c:\program +#: ../../../admin/shapefile_loader.php:77 +#, php-format +msgid "Received file '%s'." +msgstr "استلام الملف '%s'" + +# c:\program +#: ../../../admin/shapefile_loader.php:80 +msgid "Unzipping" +msgstr "فك الضغط" + +# c:\program +#: ../../../admin/shapefile_loader.php:86 +msgid "Name: " +msgstr "الاسم:" + +# c:\program +#: ../../../admin/shapefile_loader.php:87 +msgid "Size: " +msgstr "الابعاد:" + +# c:\program +#: ../../../admin/shapefile_loader.php:107 +msgid "Uploaded file is not a zipfile." +msgstr ".الملف المراد تحميله ليس مضغوطا" + +# c:\program +#: ../../../admin/shapefile_loader.php:116 +#, php-format +msgid "Loading '%s'" +msgstr " '%s'تحميل" + +#: ../../../admin/shapefile_loader.php:135 +msgid "Dropping database views." +msgstr ".حذف واجهة في قاعدة البيانات" + +#: ../../../admin/shapefile_loader.php:166 +msgid "Output" +msgstr "الخرج" + +#: ../../../admin/shapefile_loader.php:174 +msgid "Warning: Loader might exceed memory limit." +msgstr "تحذير: التحميل قد يستهلك كامل الذاكرة" + +#: ../../../admin/shapefile_loader.php:180 +msgid "Errors" +msgstr "أخطاء" + +#: ../../../admin/shapefile_loader.php:187 +msgid "Failed to load shapefile." +msgstr ".shapefile لم تتم عملية استيراد " + +#: ../../../admin/shapefile_loader.php:194 +msgid "Creating database views." +msgstr ".انشاء واجهة في قاعدة البيانات" + +#: ../../../admin/shapefile_loader.php:243 +#, php-format +msgid "Failed to update translation '%s'." +msgstr "" + +# c:\program +#: ../../../admin/shapefile_loader.php:259 +msgid "Done." +msgstr ".تمت العملية" + +# c:\program +#: ../../../admin/shapefile_loader.php:261 +#, php-format +msgid "Load shapefiles to %s" +msgstr " shapefile الى '%s'تحميل" + +# c:\program +#: ../../../admin/shapefile_loader.php:264 +msgid "Please zip your shapefiles before loading. Upload the zipfile." +msgstr "الرجاء ضغط ال shapefile قبل تحميله" + +#: ../../../admin/shapefile_loader.php:265 +#, php-format +msgid "The maximum zipfile size is %d MB." +msgstr "الحجم الأعظمي للملف المضغوط %d MB" + +# c:\program +#: ../../../admin/shapefile_loader.php:270 +msgid "Load this file:" +msgstr "تحميل الملف:" + +# c:\program +#: ../../../admin/shapefile_loader.php:273 +msgid "The name of the geodatabase table to which the data will be loaded." +msgstr ".اسم الجدول في قاعدة البيانات الذي سوف يتم تحميل البيانات له" + +#: ../../../admin/shapefile_loader.php:275 +msgid "Select this if the translation table should be updated." +msgstr ".اختر هذا اذا كان جدول الترجمة ليعدل" + +# c:\program +#: ../../../admin/shapefile_loader.php:278 +#: ../../../include/i18n.php:169 +msgid "Load file" +msgstr "اعداد الملف:" + +# c:\program +#: ../../../admin/team_management.php:40 +#: ../../../htdocs/index.php:120 +msgid "Team Management" +msgstr "ادارة فرق الصيانة" + +#: ../../../admin/team_management.php:90 +msgid "Show All Teams" +msgstr "اظهار جميع الفرق" + +#: ../../../admin/team_management.php:99 +msgid "Successfully updated the team record." +msgstr ".تمت عملية تحديث معلومات الفريق بنجاح" + +#: ../../../admin/team_management.php:102 +msgid "Failed to update the team record." +msgstr ".لم تتم عملية تحديث معلومات الفريق بنجاح" + +# c:\program +#: ../../../admin/team_management.php:119 +msgid "Back to Team Management" +msgstr "عودة لادارة الفرق" + +#: ../../../admin/team_management.php:120 +#: ../../../htdocs/landmark.php:245 +#, php-format +msgid "Translations of "%s"" +msgstr ""%s"ترجمة ال " + +# c:\program +#: ../../../admin/team_management.php:121 +#: ../../../include/i18n.php:84 +#: ../../../plugin/imageidentifyplugin.php:111 +msgid "Description" +msgstr "الوصف" + +#: ../../../admin/team_management.php:128 +#: ../../../include/i18n.php:28 +msgid "Add Team" +msgstr "اضافة فريق" + +#: ../../../admin/team_management.php:136 +#: ../../../htdocs/seal.php:119 +#: ../../../htdocs/workorderlist.php:162 +msgid "ID" +msgstr "رقم التعريف" + +#: ../../../admin/team_management.php:137 +#: ../../../include/i18n.php:287 +msgid "Team" +msgstr "اسم الفريق" + +#: ../../../admin/team_management.php:138 +#: ../../../include/i18n.php:30 +msgid "AdministrativeArea" +msgstr "المنطقة التشغيلية" + +#: ../../../admin/team_management.php:139 +#: ../../../htdocs/workorderlist.php:164 +msgid "Type" +msgstr "النوع" + +#: ../../../admin/team_management.php:140 +#: ../../../admin/translation_management.php:130 +#: ../../../admin/user_management.php:306 +#: ../../../htdocs/seal.php:124 +#: ../../../htdocs/workorderlist.php:165 +#: ../../../include/header.php:430 +#: ../../../include/i18n.php:25 +#: ../../../include/dataobject/Translation.php:111 +msgid "Action" +msgstr "العملية" + +# c:\program +#: ../../../admin/team_management.php:153 +#: ../../../admin/translation_management.php:140 +#: ../../../admin/user_management.php:282 +#: ../../../admin/user_management.php:289 +#: ../../../htdocs/seal.php:130 +#: ../../../include/i18n.php:117 +msgid "Edit" +msgstr "تعديل" + +#: ../../../admin/translation_management.php:43 +#: ../../../admin/translation_management.php:129 +#: ../../../include/dataobject/Translation.php:110 +msgid "Translation" +msgstr "الترجمة" + +#: ../../../admin/translation_management.php:101 +msgid "Show All Translations" +msgstr "اظهار جميع الترجمة" + +#: ../../../admin/translation_management.php:108 +msgid "Successfully updated the translation." +msgstr ".تمت عملية تحديث معلومات الترجمة بنجاح" + +#: ../../../admin/translation_management.php:111 +msgid "Failed to update the translation." +msgstr ".لم تتم عملية تحديث معلومات الترجمة بنجاح" + +# c:\program +#: ../../../admin/translation_management.php:127 +#: ../../../include/dataobject/Translation.php:109 +msgid "Language" +msgstr "اللغة" + +#: ../../../admin/translation_management.php:128 +msgid "Term" +msgstr "المصطلح" + +# c:\program +#: ../../../admin/user_management.php:56 +msgid "The name of the DCMMS user to be created." +msgstr ".اسم المستخدم الذي سوف يتم انشاؤه" + +#: ../../../admin/user_management.php:56 +#: ../../../htdocs/logon.php:205 +msgid "User Name:" +msgstr "اسم المستخدم:" + +# c:\program +#: ../../../admin/user_management.php:59 +msgid "The password of the new user." +msgstr ".كلمة السر للمستخدم الجديد" + +#: ../../../admin/user_management.php:59 +#: ../../../admin/user_management.php:122 +#: ../../../htdocs/logon.php:207 +msgid "Password:" +msgstr "كلمة السر:" + +#: ../../../admin/user_management.php:70 +msgid "Select the Administrative area." +msgstr ".اختر المنطقة التشغيلية" + +#: ../../../admin/user_management.php:72 +msgid "Create user" +msgstr "انشاء مستخدم" + +# c:\program +#: ../../../admin/user_management.php:73 +msgid "Click this button to create the new user." +msgstr "اختر هذا الزر لانشاء مستخدم جديد" + +#: ../../../admin/user_management.php:96 +#, php-format +msgid "Successfully created user '%s'." +msgstr " %s تمت عملية اضافة المستخدم بنجاح" + +# c:\program +#: ../../../admin/user_management.php:100 +#: ../../../admin/user_management.php:106 +#, php-format +msgid "Failed to create user '%s'." +msgstr " '%s' لم تتم عملية انشاء المستخدم بنجاح" + +#: ../../../admin/user_management.php:113 +#, php-format +msgid "Edit User '%s'" +msgstr " %sتحرير المستخدم" + +# c:\program +#: ../../../admin/user_management.php:122 +msgid "The password of the user." +msgstr ".كلمة السر للمستخدم الجديد" + +#: ../../../admin/user_management.php:133 +msgid "Select the administrative area." +msgstr ".اختر المنطقة التشغيلية" + +#: ../../../admin/user_management.php:135 +#: ../../../htdocs/resource.php:260 +msgid "Save" +msgstr "حفظ" + +# c:\program +#: ../../../admin/user_management.php:136 +msgid "Click this button to save the information." +msgstr "اختر هذا الزر لحفظ المعلومات" + +#: ../../../admin/user_management.php:153 +#, php-format +msgid "Successfully updated the password of user '%s'." +msgstr " %s تمت عملية تحديث كلمة السر للمستخدم بنجاح" + +#: ../../../admin/user_management.php:157 +#, php-format +msgid "Failed to update the password of user '%s'." +msgstr " %s لم تتم عملية تحديث كلمة السر للمستخدم بنجاح" + +#: ../../../admin/user_management.php:170 +#, php-format +msgid "Successfully updated the administrative area of user '%s'." +msgstr " %s تمت عملية تحديث المنطقة التشغيلية للمستخدم بنجاح" + +#: ../../../admin/user_management.php:174 +#, php-format +msgid "Failed to update the administrative area of user '%s'." +msgstr " %s .لم تتم عملية تحديث المنطقة التشغيلية للمستخدم بنجاح" + +#: ../../../admin/user_management.php:198 +#, php-format +msgid "Successfully updated the priviledges of user '%s'." +msgstr "%s تمت عملية تحديث سماحيات المستخدم بنجاح " + +#: ../../../admin/user_management.php:202 +#, php-format +msgid "Failed to update the priviledges of user '%s'." +msgstr "%s لم تتم عملية تحديث سماحيات المستخدم بنجاح" + +#: ../../../admin/user_management.php:217 +#, php-format +msgid "Successfully removed user '%s'." +msgstr " %s تمت عملية ازالة المستخدم بنجاح" + +# c:\program +#: ../../../admin/user_management.php:222 +#, php-format +msgid "Failed to remove user '%s'." +msgstr "%s لم تتم عملية حذف المستخدم بنجاح" + +#: ../../../admin/user_management.php:239 +#, php-format +msgid "Successfully changed the landmark editor role of user "%s"." +msgstr "تمت عملية تحديث قاعدة محرر المعلمات للمستخدم بنجاح %s" + +#: ../../../admin/user_management.php:243 +#, php-format +msgid "Failed to change the landmark editor role of user "%s"." +msgstr " فشل في عملية تحديث قاعدة محرر المعلمات للمستخدم %s" + +# c:\program +#: ../../../admin/user_management.php:252 +msgid "Create a new DCMMS user." +msgstr ".انشاء مستخدم جديد" + +# c:\program +#: ../../../admin/user_management.php:253 +msgid "Add User" +msgstr ".اضافة مستخدم" + +#: ../../../admin/user_management.php:261 +#: ../../../htdocs/resource.php:282 +#: ../../../htdocs/workorderlist.php:130 +#: ../../../include/dcmmspear.php:146 +msgid "Next >>" +msgstr "التالي >>" + +#: ../../../admin/user_management.php:262 +#: ../../../htdocs/resource.php:283 +#: ../../../htdocs/workorderlist.php:131 +#: ../../../include/dcmmspear.php:147 +msgid "<< Back" +msgstr "<< السابق" + +#: ../../../admin/user_management.php:283 +#: ../../../admin/user_management.php:290 +msgid "Toggle Administrator" +msgstr "اضافة/ازالة سماحية المسؤول" + +# c:\program +#: ../../../admin/user_management.php:285 +#: ../../../admin/user_management.php:292 +msgid "Remove" +msgstr "حذف" + +#: ../../../admin/user_management.php:286 +#: ../../../admin/user_management.php:293 +msgid "Toggle Landmark Editor" +msgstr "عكس حالة محرر المعلمات" + +# c:\program +#: ../../../admin/user_management.php:289 +msgid "Edit DCMMS user attributes." +msgstr ".DCMMSتحرير معلومات مستخدم " + +# c:\program +#: ../../../admin/user_management.php:291 +msgid "Make the user a DCMMS administrator and vice versa." +msgstr ".جعل المستخدم له سماحيات مسؤول او حذفها منه" + +# c:\program +#: ../../../admin/user_management.php:292 +msgid "Delete a DCMMS user." +msgstr ".DCMMSحذف مستخدم " + +# c:\program +#: ../../../admin/user_management.php:294 +msgid "Make the user a landmark editor and vice versa." +msgstr "صنع محرر معلمات للمستخدم و بالعكس" + +#: ../../../admin/user_management.php:304 +msgid "Administrator" +msgstr "المسؤول" + +# c:\program +#: ../../../admin/user_management.php:321 +msgid "yes" +msgstr "نعم" + +# c:\program +#: ../../../admin/user_management.php:321 +msgid "no" +msgstr "لا" + +#: ../../../admin/user_management.php:336 +#: ../../../htdocs/resource.php:309 +#: ../../../include/dcmmspear.php:185 +#, php-format +msgid "Displaying [%s - %s] of %s" +msgstr " %s من[%s - %s] اظهار" + +#: ../../../htdocs/about.php:26 +msgid "About the DC Maintenance Management System" +msgstr "اهلا بكم في برنامج ادارة الصيانة من دورش" + +# c:\program +#: ../../../htdocs/about.php:31 +#, php-format +msgid "Please visit %shttp://dcmms.sourceforge.net%s for the latest news and updates." +msgstr " من اجل الاخبار و التحديث%shttp://sourceforge.net%sالرجاء زيارة الموقع ." + +#: ../../../htdocs/about.php:64 +#, php-format +msgid "DCMMS uses icons of the %sGNOME%s project." +msgstr " DCMMS يستخدم ايقونات مشروع %s GNOME %s ان نظام " + +#: ../../../htdocs/about.php:67 +#, php-format +msgid "DCMMS uses %sPostGIS%s." +msgstr " .%sPostGIS%s.نظام ادارة الصيانة يستخدم" + +#: ../../../htdocs/about.php:75 +#, php-format +msgid "DCMMS uses the %sPostgreSQL%s data base management system." +msgstr "نظام ادارة قواعد البيانات %sPostgreSQL%sنظام ادارة الصيانة يستخدم " + +#: ../../../htdocs/about.php:95 +msgid "Authors" +msgstr "المطورون" + +#: ../../../htdocs/aging_report.php:35 +#: ../../../htdocs/reports.php:49 +msgid "Aging Report" +msgstr "تقرير تعميري" + +#: ../../../htdocs/aging_report.php:40 +msgid "hour(s)" +msgstr "ساعات" + +#: ../../../htdocs/aging_report.php:41 +msgid "day(s)" +msgstr "ايام" + +#: ../../../htdocs/aging_report.php:42 +msgid "month(s)" +msgstr "اشهر" + +#: ../../../htdocs/aging_report.php:43 +msgid "year(s)" +msgstr "سنوات" + +#: ../../../htdocs/aging_report.php:69 +#, php-format +msgid "A DCMMS %sReport%s on workorder aging for a period of time." +msgstr "الشكاوى الموجودة خلال فترة %s تقرير%sنظام ادارة الصيانة " + +# c:\program +#: ../../../htdocs/aging_report.php:72 +msgid "Count:" +msgstr ":العدد" + +#: ../../../htdocs/aging_report.php:74 +msgid "Interval:" +msgstr "الفترة:" + +#: ../../../htdocs/aging_report.php:77 +#: ../../../htdocs/broken_seals_report.php:61 +#: ../../../htdocs/excavation_report.php:67 +#: ../../../htdocs/full_report.php:76 +#: ../../../htdocs/maintenance_by_team_report.php:51 +#: ../../../htdocs/quantity_report.php:57 +#: ../../../htdocs/received_workorders_report.php:70 +#: ../../../htdocs/resource_report.php:56 +msgid "End Date:" +msgstr ":تاريخ النهاية" + +#: ../../../htdocs/aging_report.php:80 +#: ../../../htdocs/broken_seals_report.php:57 +#: ../../../htdocs/excavation_report.php:59 +#: ../../../htdocs/excavation_report.php:63 +#: ../../../htdocs/full_report.php:62 +#: ../../../htdocs/quantity_report.php:53 +#: ../../../htdocs/received_workorders_report.php:52 +#: ../../../htdocs/resource_report.php:50 +#: ../../../include/i18n.php:34 +#: ../../../include/dataobject/Landmark.php:108 +#: ../../../include/dataobject/Team.php:104 +#: ../../../include/dataobject/Workorder.php:99 +msgid "Administrative Area:" +msgstr ":المنطقة التشغيلية" + +#: ../../../htdocs/aging_report.php:83 +#: ../../../htdocs/aging_report.php:89 +#: ../../../htdocs/quantity_report.php:50 +#: ../../../htdocs/received_workorders_report.php:53 +#: ../../../htdocs/resource_report.php:51 +#: ../../../htdocs/zoom.php:55 +#: ../../../htdocs/zoom.php:65 +#: ../../../htdocs/zoom.php:73 +#: ../../../htdocs/zoom.php:81 +#: ../../../include/header.php:299 +msgid "[Select One]" +msgstr "[اختيار]" + +#: ../../../htdocs/aging_report.php:92 +#: ../../../htdocs/broken_seals_report.php:63 +#: ../../../htdocs/complaint_pending_report.php:83 +#: ../../../htdocs/excavation_report.php:69 +#: ../../../htdocs/full_report.php:78 +#: ../../../htdocs/maintenance_by_team_report.php:53 +#: ../../../htdocs/monthly_management_report.php:76 +#: ../../../htdocs/quality_control_report.php:58 +#: ../../../htdocs/quantity_report.php:59 +#: ../../../htdocs/received_workorders_report.php:72 +#: ../../../htdocs/resource_report.php:58 +#: ../../../htdocs/response_time_report.php:46 +#: ../../../htdocs/workorder_status_report.php:92 +msgid "Create Report" +msgstr "انشاء التقرير" + +#: ../../../htdocs/aging_report.php:98 +msgid "Please select the interval." +msgstr "حدد الفترة " + +# c:\program +#: ../../../htdocs/aging_report.php:101 +msgid "Please provide the number of interval repetitions." +msgstr ".الرجاء تحديد عددد تكرارات الفترة" + +# c:\program +#: ../../../htdocs/aging_report.php:104 +#: ../../../htdocs/full_report.php:93 +#: ../../../htdocs/maintenance_by_team_report.php:64 +#: ../../../htdocs/quantity_report.php:70 +#: ../../../htdocs/received_workorders_report.php:83 +msgid "Please provide the end date." +msgstr "الرجاء تحديد وقت الانتهاء" + +#: ../../../htdocs/aging_report.php:107 +#: ../../../htdocs/broken_seals_report.php:88 +#: ../../../htdocs/excavation_report.php:94 +#: ../../../htdocs/full_report.php:100 +#: ../../../htdocs/maintenance_by_team_report.php:71 +#: ../../../htdocs/quantity_report.php:77 +#: ../../../htdocs/received_workorders_report.php:90 +#: ../../../htdocs/resource_report.php:84 +msgid "End date has to be entered in the following format: 2004-08-21 21:30." +msgstr "تاريخ النهايه يجب ان يدخل بالشكل التالي 30:21 21-08-2004" + +#: ../../../htdocs/aging_report.php:111 +#: ../../../htdocs/maintenance_by_team_report.php:75 +#: ../../../htdocs/quantity_report.php:81 +#: ../../../htdocs/received_workorders_report.php:94 +msgid "Administrative Area has to be a coded value." +msgstr "المنطقة الادارية يجب ان تكون قيمة مدخلة مسبقا" + +#: ../../../htdocs/aging_report.php:114 +msgid "Type has to be a coded value." +msgstr "يجب أن يكون النوع قيمة مرمزة" + +#: ../../../htdocs/aging_report.php:125 +#, php-format +msgid "Workorder aging report for %s %s(s) before %s" +msgstr " %sقبل %s %sتقرير الشكاوى المدخلة " + +#: ../../../htdocs/aging_report.php:181 +#, php-format +msgid "Average Turnaround Time For Closed Items (%ss)" +msgstr "(%s)معدل انجاز الشكوى" + +#: ../../../htdocs/aging_report.php:223 +msgid "Number of Items Submitted" +msgstr "عدد الشكاوى المدخله" + +#: ../../../htdocs/aging_report.php:257 +msgid "Number of Items Still Open" +msgstr "عدد الشكاوى المعلقه" + +#: ../../../htdocs/broken_seals_report.php:35 +#: ../../../htdocs/reports.php:68 +msgid "Broken Seals Report" +msgstr "تقرير العدادات المكسورة" + +# c:\program +#: ../../../htdocs/broken_seals_report.php:49 +#, php-format +msgid "A DCMMS %sReport%s on seals that were broken by maintenance activities." +msgstr "العدادات المكسورة نتيجة عمليات الصيانة%s تقرير%s نظام ادارة الصيانة" + +#: ../../../htdocs/broken_seals_report.php:59 +#: ../../../htdocs/excavation_report.php:65 +#: ../../../htdocs/full_report.php:74 +#: ../../../htdocs/maintenance_by_team_report.php:49 +#: ../../../htdocs/quantity_report.php:55 +#: ../../../htdocs/received_workorders_report.php:68 +#: ../../../htdocs/resource_report.php:54 +#: ../../../include/dataobject/Maintenance.php:104 +msgid "Start Date:" +msgstr ":تاريخ البدء" + +#: ../../../htdocs/broken_seals_report.php:75 +#: ../../../htdocs/excavation_report.php:81 +#: ../../../htdocs/resource_report.php:71 +msgid "Please select the administrative area." +msgstr "حدد المنطقة التشغيلية " + +# c:\program +#: ../../../htdocs/broken_seals_report.php:78 +#: ../../../htdocs/excavation_report.php:84 +#: ../../../htdocs/resource_report.php:74 +msgid "Please enter the start date." +msgstr ".الرجاء تحديد وقت البدء" + +# c:\program +#: ../../../htdocs/broken_seals_report.php:81 +#: ../../../htdocs/excavation_report.php:87 +#: ../../../htdocs/resource_report.php:77 +msgid "Please enter the end date." +msgstr ".الرجاء تحديد وقت الانتهاء" + +#: ../../../htdocs/broken_seals_report.php:84 +#: ../../../htdocs/excavation_report.php:90 +#: ../../../htdocs/full_report.php:96 +#: ../../../htdocs/maintenance_by_team_report.php:67 +#: ../../../htdocs/quantity_report.php:73 +#: ../../../htdocs/received_workorders_report.php:86 +#: ../../../htdocs/resource_report.php:80 +msgid "Start date has to be entered in the following format: 2004-08-21 21:30." +msgstr "تاريخ البدايه يجب ان يدخل بالشكل التالي 30:21 21-08-2004" + +#: ../../../htdocs/complaint_pending_report.php:29 +msgid "Pending Complaints" +msgstr "تقرير الشكاوي غير المنتهية" + +#: ../../../htdocs/complaint_pending_report.php:33 +#, php-format +msgid "A DCMMS %sReport%s listing workorder that are still pending." +msgstr " يعرض جميع الشكاوى القائمة %sتقرير%sنظام ادارة الصيانة " + +# c:\program +#: ../../../htdocs/complaint_pending_report.php:78 +#: ../../../htdocs/quality_control_report.php:56 +#: ../../../htdocs/workorder_status_report.php:82 +msgid "Query for landmarks in this region." +msgstr ".البحث عن المعالم في هذه المنطقة" + +# c:\program +#: ../../../htdocs/complaint_pending_report.php:84 +#: ../../../htdocs/response_time_report.php:47 +#: ../../../htdocs/workorder_status_report.php:93 +msgid "Click this button to create the report." +msgstr "اختر هذا الزر لانشاء التقرير" + +#: ../../../htdocs/excavation_report.php:34 +#: ../../../htdocs/reports.php:62 +msgid "Excavation Report" +msgstr "تقرير اعمال الحفريات" + +#: ../../../htdocs/excavation_report.php:50 +#, php-format +msgid "A %sReport%s summarizing excavations for a period of time." +msgstr "%sتقرير%s ملخص الحفر لفترة من الوقت" + +#: ../../../htdocs/excavation_report.php:56 +msgid "All Areas" +msgstr "جميع المناطق" + +#: ../../../htdocs/excavation_report.php:61 +msgid "Administrative Area Filter:" +msgstr "فلتر المنطقة الإدارية:" + +#: ../../../htdocs/full_report.php:38 +#: ../../../htdocs/reports.php:77 +msgid "Full Report" +msgstr "التقرير الشامل" + +#: ../../../htdocs/full_report.php:52 +#, php-format +msgid "A DCMMS %sReport%s that shows all of the recorded data for a period of time." +msgstr "ان تقرير %s يمثل %s جميع البيانات المخزنة خلال فترة من الزمن." + +#: ../../../htdocs/full_report.php:70 +#: ../../../include/dataobject/Workorder.php:102 +msgid "Network Type:" +msgstr "نوع الشبكة:" + +# c:\program +#: ../../../htdocs/full_report.php:90 +#: ../../../htdocs/maintenance_by_team_report.php:61 +#: ../../../htdocs/quantity_report.php:67 +#: ../../../htdocs/received_workorders_report.php:80 +msgid "Please provide the start date." +msgstr "الرجاء تحديد وقت البدء" + +#: ../../../htdocs/full_report.php:138 +msgid "Workorder #" +msgstr "#رقم امر العمل" + +#: ../../../htdocs/index.php:28 +msgid "DC Maintenance Management System" +msgstr "برنامج ادارة الصيانة(DCMMS)" + +#: ../../../htdocs/index.php:55 +msgid "Welcome to the DC Maintenance Management System." +msgstr ".اهلا بكم في برنامج ادارة الصيانة من دورش" + +#: ../../../htdocs/index.php:65 +msgid "Warning: Your data model might be outdated." +msgstr ".تحذير : قاعدة البيانات قديمة" + +#: ../../../htdocs/index.php:66 +msgid "Please contact your administrator." +msgstr ".اتصل بفني التشغيل" + +#: ../../../htdocs/index.php:70 +msgid "Zoom" +msgstr "تحديد موقع الشكوى" + +# c:\program +#: ../../../htdocs/index.php:71 +#: ../../../htdocs/map.php:547 +msgid "Click this link to zoom to a landmark." +msgstr ".انقر على الكلمة من اجل التكبير الى المعلم" + +#: ../../../htdocs/index.php:73 +#: ../../../htdocs/maintenance.php:151 +#: ../../../htdocs/workorderpage.php:137 +#: ../../../htdocs/workorderpage.php:148 +#: ../../../htdocs/zoom.php:198 +msgid "Map" +msgstr "الخريطة" + +# c:\program +#: ../../../htdocs/index.php:74 +msgid "Click this link to view the interactive DCMMS map." +msgstr ".انقر للذهاب الى الخريطة" + +#: ../../../htdocs/index.php:77 +msgid "Workorders" +msgstr "اوامر العمل" + +# c:\program +#: ../../../htdocs/index.php:78 +msgid "Click this link to manage pending and completed workorders." +msgstr "انقر للتعامل مع اوامر العمل المنتهية و غير المنتهية." + +#: ../../../htdocs/index.php:80 +#: ../../../htdocs/reports.php:30 +msgid "Reports" +msgstr "التقارير" + +# c:\program +#: ../../../htdocs/index.php:81 +msgid "Click this link to select one of the DCMMS reports." +msgstr "انقر لتختار واحدا من تقارير DCMMS." + +#: ../../../htdocs/index.php:83 +msgid "About" +msgstr ".حول نظام ادارة صيانة الشبكات" + +# c:\program +#: ../../../htdocs/index.php:84 +msgid "Click this link to view the DCMMS copyright information." +msgstr "انقر لمعرفة حقوق الملكية لبرنامج DCMMS" + +#: ../../../htdocs/index.php:91 +#: ../../../htdocs/index.php:92 +#: ../../../include/i18n.php:29 +msgid "Administration" +msgstr "ادوات ادارية" + +# c:\program +#: ../../../htdocs/index.php:97 +msgid "Load zipped files in shapefile format to the DCMMS geodatabase." +msgstr ".GISتحميل الملفات المضغوطة على شكل قاعدة بيانات الى قاعدة البيانات ال" + +# c:\program +#: ../../../htdocs/index.php:100 +msgid "Shapefile Dumper" +msgstr "تنزيل البيانات الى قاعدة البيانات" + +# c:\program +#: ../../../htdocs/index.php:101 +msgid "Download zipped shapefiles from the DCMMS geodatabase." +msgstr ".GISتحميل الملفات المضغوطة على شكل قاعدة بيانات الى قاعدة بيانات ال" + +# c:\program +#: ../../../htdocs/index.php:104 +msgid "Translation Management" +msgstr "ادارة الترجمة" + +#: ../../../htdocs/index.php:105 +msgid "Manage translations on the database side." +msgstr ".معالجة الترجمة من خلال قاعدة البيانات" + +#: ../../../htdocs/index.php:108 +msgid "Setup Information" +msgstr "معلومات التنزيل" + +#: ../../../htdocs/index.php:109 +msgid "Information about the DCMMS configuration." +msgstr ".معلومات عن اجراءات تنزيل نظام ادارة الصيانة" + +# c:\program +#: ../../../htdocs/index.php:116 +msgid "User Management" +msgstr "ادارة المستخدمين" + +# c:\program +#: ../../../htdocs/index.php:117 +msgid "Add or remove DCMMS users. Change passwords and access rights." +msgstr " .تغيير كلمات المرور و السماحياتDCMMS,اضافة وحذف المستخدمين ل" + +# c:\program +#: ../../../htdocs/index.php:120 +msgid "Add or edit maintenance teams." +msgstr ".اضافة او تعديل فرق الصيانة" + +#: ../../../htdocs/index.php:123 +msgid "Clean the temp directory." +msgstr "temp حذف مجلد " + +#: ../../../htdocs/index.php:126 +msgid "Delete a workorder." +msgstr ".حذف امر العمل" + +# c:\program +#: ../../../htdocs/index.php:129 +msgid "Analyze the data." +msgstr ".تحليل البيانات" + +#: ../../../htdocs/landmark.php:60 +#: ../../../htdocs/map.php:548 +#: ../../../include/dcmmaputil.php:172 +#: ../../../include/dcmmaputil.php:216 +#: ../../../include/dcmmaputil.php:217 +msgid "Landmark" +msgstr "معلم" + +#: ../../../htdocs/landmark.php:97 +msgid "FATAL ERROR: No gid provided in request." +msgstr "خطأ: لم يتم تزويد الرقم المعرف gid" + +#: ../../../htdocs/landmark.php:116 +#: ../../../htdocs/landmark.php:192 +msgid "Successfully updated the landmark record." +msgstr ".تمت عملية تحديث معلومات المعلم بنجاح." + +#: ../../../htdocs/landmark.php:141 +#, php-format +msgid "Failed to update the field '%s'." +msgstr "لم تتم عملية تحديث الحقل '%s'" + +#: ../../../htdocs/landmark.php:150 +#: ../../../htdocs/landmark.php:200 +msgid "Failed to update the landmark record." +msgstr ".لم تتم عملية تحديث تسجيل المعلم." + +#: ../../../htdocs/landmark.php:153 +msgid "Please select the landmark type." +msgstr ".اختر نوع المعلم" + +#: ../../../htdocs/landmark.php:161 +msgid "Successfully deleted the landmark." +msgstr ".تمت عملية حذف المعلم" + +# c:\program +#: ../../../htdocs/landmark.php:166 +msgid "Deleting the landmark failed." +msgstr ".لم تتم عملية حذف المعلم بنجاح" + +# c:\program +#: ../../../htdocs/landmark.php:218 +#, php-format +msgid "View this landmark on the %smap%s." +msgstr " %s الخريطة %sاظهار المعلم في" + +# c:\program +#: ../../../htdocs/landmark.php:221 +msgid "Click this link to view the displayed landmark on the map." +msgstr ".اضغط لاظهار هذا المعلم على الخريطة" + +# c:\program +#: ../../../htdocs/landmark.php:227 +#, php-format +msgid "%sDelete%s this landmark." +msgstr "%s حذف %s هذا المعلم" + +# c:\program +#: ../../../htdocs/landmark.php:229 +msgid "Click this link to delete the landmark." +msgstr "اضغط على الرابط لحذف المعلم" + +#: ../../../htdocs/landmark.php:244 +msgid "Back to landmark" +msgstr "العودة إلى المعلم" + +#: ../../../htdocs/landmark.php:255 +#: ../../../htdocs/maintenance.php:166 +#: ../../../htdocs/workorderpage.php:160 +msgid "Update History" +msgstr "تحديث التاريخ" + +#: ../../../htdocs/logon.php:46 +#, php-format +msgid "FATAL ERROR: PHP extension '%s' is not loaded." +msgstr "خطأ : ان توسع PHP %s لا يمكن تحميله." + +#: ../../../htdocs/logon.php:64 +#, php-format +msgid "FATAL ERROR: Configuration file \"%s\" is missing." +msgstr "خطأ : ملف الإعدادات /\"%s/\" مفقود" + +# c:\program +#: ../../../htdocs/logon.php:71 +msgid "Logon failed." +msgstr ".لم تتم عملية الدخول" + +#: ../../../htdocs/logon.php:76 +#, php-format +msgid "Could not connect to database '%s'." +msgstr "لا يمكن الربط مع قاعدة البيانات %s." + +#: ../../../htdocs/logon.php:78 +msgid "Please contact your DCMMS administrator." +msgstr ".الرجاء الاتصال بالشخص المسؤول" + +# c:\program +#: ../../../htdocs/logon.php:104 +#: ../../../htdocs/logon.php:107 +msgid "PostGIS is not installed." +msgstr "postGIS لم يتم تحميل توسع " + +# c:\program +#: ../../../htdocs/logon.php:117 +#: ../../../htdocs/logon.php:120 +msgid "Fuzzystrmatch is not installed." +msgstr ".Fuzzystrmztchلم يتم تحميل توسع " + +# c:\program +#: ../../../htdocs/logon.php:132 +#: ../../../htdocs/logon.php:135 +msgid "PostArabic is not installed." +msgstr ".postArabicلم يتم تحميل توسع " + +#: ../../../htdocs/logon.php:143 +msgid "Error: The variable \"register_globals\" in php.ini has to be set to \"Off\"." +msgstr "" + +#: ../../../htdocs/logon.php:162 +msgid "Configuration Error: PHP Time != PostgreSQL time." +msgstr "خطأ في الإعدادات: الوقت في PHP لا يوافق الوقت في PostgreSQL" + +#: ../../../htdocs/logon.php:165 +#: ../../../htdocs/logon.php:169 +msgid "Error: Could not verify time configuration." +msgstr "خطأ: لم يتمكن من تأكيد إعدادات التوقيت" + +# c:\program +#: ../../../htdocs/logon.php:177 +msgid "Please provide username and password." +msgstr ".الرجاء ادخال اسم و كلمة المرور" + +# c:\program +#: ../../../htdocs/logon.php:183 +#: ../../../include/i18n.php:173 +#, php-format +msgid "Logged off user '%s'." +msgstr "الخروج للمستخدم '%s'." + +#: ../../../htdocs/logon.php:194 +msgid "Logon to DCMMS" +msgstr "الدخول الى نظام ادارة الصيانة" + +#: ../../../htdocs/logon.php:199 +msgid "Please login to the DC Maintenance Management System." +msgstr ".الرجاء الدخول الى برنامج ادارة الصيانة من دورش" + +# c:\program +#: ../../../htdocs/logon.php:205 +msgid "Your DCMMS user name." +msgstr ".DCMMSاسم المستخدم ل " + +#: ../../../htdocs/logon.php:207 +msgid "Your DCMMS password." +msgstr ".كلمة السر الخاصة بالنظام" + +# c:\program +#: ../../../htdocs/logon.php:210 +msgid "Click this button after having entered username and password." +msgstr "اختر هذا الزر بعد ادخال اسم المستخدم وكلمة المرور" + +#: ../../../htdocs/logon.php:211 +msgid "Login" +msgstr "الدخول" + +#: ../../../htdocs/maintenance.php:44 +#: ../../../htdocs/workorderpage.php:43 +msgid "No Workorder ID provided" +msgstr "لم يتم تزويد رقم معرف لأمر العمل" + +#: ../../../htdocs/maintenance.php:48 +msgid "Maintenance Details" +msgstr "تفاصيل الصيانة" + +#: ../../../htdocs/maintenance.php:70 +msgid "Could not retrieve maintenance record." +msgstr "لم يتم العثور على سجل الصيانة" + +#: ../../../htdocs/maintenance.php:93 +msgid "Failed to update the maintenance record." +msgstr "لم تتم عملية تحديث سجل الصيانة" + +#: ../../../htdocs/maintenance.php:96 +msgid "Successfully updated the maintenance record." +msgstr "تم تحديث سجل الصيانة بنجاح" + +# c:\program +#: ../../../htdocs/maintenance.php:100 +#: ../../../include/dataobject/Landmark.php:109 +msgid "Location:" +msgstr "الموقع :" + +# c:\program +#: ../../../htdocs/maintenance.php:101 +msgid "Clear" +msgstr "مسح" + +#: ../../../htdocs/maintenance.php:113 +msgid "Could not retrieve workorder record." +msgstr "عدم امكانية استخراج سجل امر العمل" + +#: ../../../htdocs/maintenance.php:148 +#: ../../../htdocs/reports.php:31 +#: ../../../htdocs/workorderlist.php:35 +#: ../../../htdocs/workorderpage.php:136 +#: ../../../htdocs/workorderpage.php:146 +msgid "Workorder" +msgstr "امر العمل" + +# c:\program +#: ../../../htdocs/maintenance.php:154 +#: ../../../htdocs/workorderpage.php:138 +#: ../../../htdocs/workorderpage.php:150 +#: ../../../include/i18n.php:229 +msgid "Print" +msgstr "طباعة امر العمل" + +#: ../../../htdocs/maintenance.php:155 +#: ../../../htdocs/map.php:536 +#: ../../../htdocs/reports.php:52 +#: ../../../htdocs/workorderpage.php:140 +#: ../../../htdocs/workorderpage.php:153 +msgid "Maintenance" +msgstr "الصيانة" + +#: ../../../htdocs/maintenance.php:158 +#: ../../../htdocs/resource.php:56 +#: ../../../htdocs/workorderpage.php:141 +#: ../../../htdocs/workorderpage.php:156 +msgid "Resource" +msgstr "الموارد" + +#: ../../../htdocs/maintenance_by_team_report.php:32 +#: ../../../htdocs/received_workorders_report.php:33 +#: ../../../htdocs/reports.php:56 +msgid "Maintenance by Team" +msgstr "تقرير أوامر العمل المغلقة لكل فريق" + +#: ../../../htdocs/maintenance_by_team_report.php:46 +#, php-format +msgid "A %sReport%s listing completed workorders by the individual teams." +msgstr "%s تقرير %s يقوم بعرض أوامر العمل المغلقة لكل فريق على حدا" + +#: ../../../htdocs/maintenance_by_team_report.php:86 +#, php-format +msgid "Workorders closed between %s and %s" +msgstr "أوامر العمل التي تم إغلاقها ما بين %s و %s" + +#: ../../../htdocs/map.php:131 +#, php-format +msgid "Moving landmark %s." +msgstr " .%s تحريك المعلم " + +#: ../../../htdocs/map.php:185 +msgid "Moved Landmark." +msgstr ".تم نقل المعلم" + +#: ../../../htdocs/map.php:324 +msgid "Error: Could not obtain next workorder ID." +msgstr ".خطأ: لا يمكن تحديد رقم امر العمل التالي" + +#: ../../../htdocs/map.php:335 +#, php-format +msgid "Added center point of workorder #%s." +msgstr "#%sاضافة نقطة الوسط لامر العمل" + +#: ../../../htdocs/map.php:356 +msgid "The area of interest radius has to be smaller than 1 km." +msgstr ".ان منطقة العمل لا يجب ان يتجاوز قطرها ا كم" + +#: ../../../htdocs/map.php:359 +msgid "The area of interest radius has to be more than 1 m." +msgstr ".ان منطقة العمل يجب ان يتجاوز قطرها ا كم" + +#: ../../../htdocs/map.php:378 +#, php-format +msgid "Defined area of interest for workorder #%s." +msgstr "#%sتحديد منطقة العمل" + +#: ../../../htdocs/map.php:427 +#, php-format +msgid "Please locate the maintenance activity for workorder %s." +msgstr " %sالرجاء تحديد عملية الصيانة لامر العمل رقم" + +#: ../../../htdocs/map.php:482 +msgid "Legend" +msgstr "قائمة المصطلحات" + +#: ../../../htdocs/map.php:504 +msgid "Display the Water network" +msgstr "اعرض شيكة المياه" + +#: ../../../htdocs/map.php:505 +msgid "Water Network" +msgstr "شبكة المياه" + +#: ../../../htdocs/map.php:520 +msgid "Display the sewer network" +msgstr "اظهار شبكة الصرف الصحي" + +#: ../../../htdocs/map.php:521 +msgid "Sewer Network" +msgstr "شبكة الصرف الصحي" + +# c:\program +#: ../../../htdocs/map.php:535 +msgid "Display the repairs locations" +msgstr "اظهار موقع الصيانة" + +#: ../../../htdocs/map.php:556 +msgid "Refresh the map display" +msgstr "اعادة عرض الخارطة" + +#: ../../../htdocs/map.php:557 +msgid "Redraw Map" +msgstr "تحديث الخريطة" + +#: ../../../htdocs/map.php:565 +msgid "Quick View" +msgstr "نظرة سريعة" + +#: ../../../htdocs/map.php:588 +msgid "Full View" +msgstr "نظرة شاملة" + +# c:\program +#: ../../../htdocs/map.php:616 +msgid "Select the map size from the list." +msgstr ".اختر حجم الخارطة من القائمة" + +#: ../../../htdocs/map.php:617 +msgid "Map Size" +msgstr "ابعاد الخريطة" + +#: ../../../htdocs/map.php:654 +msgid "Keymap" +msgstr "مفتاح الخريطة" + +# c:\program +#: ../../../htdocs/map.php:658 +msgid "Click on the key map to view an area." +msgstr ".اضغط على مفتاح الخريطة لاظهار المنطقة" + +# c:\program +#: ../../../htdocs/map.php:669 +msgid "Zoom in further to display more detailed map information." +msgstr ".التكبير بشكل اكبر لاظهار المعلومات بشكل تفصيلي" + +#: ../../../htdocs/map.php:671 +msgid "Zoom In" +msgstr "تكبير" + +# c:\program +#: ../../../htdocs/map.php:679 +msgid "Zoom out to display a larger area of the map." +msgstr ".التصغير بشكل اكبر لاظهار منطقة اكبر" + +#: ../../../htdocs/map.php:681 +msgid "Zoom Out" +msgstr "تصغير" + +# c:\program +#: ../../../htdocs/map.php:689 +msgid "Move the map view without zooming in or out." +msgstr ".التحرك في الخريطة بدون تكبير او تصغير" + +#: ../../../htdocs/map.php:691 +msgid "Pan" +msgstr "التحريك" + +# c:\program +#: ../../../htdocs/map.php:699 +msgid "Display information about elements in the map." +msgstr ".اظهار معلومات حول العناصر في الخريطة" + +#: ../../../htdocs/map.php:701 +msgid "Identify" +msgstr "التعريف" + +#: ../../../htdocs/map.php:711 +msgid "Workorder (Center)" +msgstr "امر العمل (المركز)" + +# c:\program +#: ../../../htdocs/map.php:713 +msgid "Digitize the workorder area of interest center." +msgstr ".لضغط لرسم مركز المنطقة التقريبية لامر العمل." + +#: ../../../htdocs/map.php:718 +msgid "Workorder (Radius)" +msgstr "امر العمل (نصف القطر)" + +# c:\program +#: ../../../htdocs/map.php:720 +msgid "Digitize a point on the workorder area of interest radius." +msgstr ".الضغط لرسم نقطة تمثل نصف القطر للمنطقة التقريبية لامر العمل" + +#: ../../../htdocs/map.php:773 +#: ../../../htdocs/map.php:801 +msgid "Continue with data entry." +msgstr ".اكمال عملية الادخال" + +# c:\program +#: ../../../htdocs/map.php:774 +msgid "[Accept Area of Interest]" +msgstr "[قبول المنطقة التقريبية لامر العمل كما هو ظاهر]" + +#: ../../../htdocs/map.php:792 +msgid "Locate the repair as marked on the workorder sheet." +msgstr ".تحديد موقع الاصلاح كما هو وارد في ورقة امر العمل" + +#: ../../../htdocs/map.php:793 +msgid "Locate Maintenance" +msgstr "تحديد موقع الصيانة" + +# c:\program +#: ../../../htdocs/map.php:800 +msgid "Accept the repair location as displayed." +msgstr ".قبول موقع الصيانة كما هو ظاهر" + +# c:\program +#: ../../../htdocs/map.php:804 +msgid "Accept Maintenance Location" +msgstr "قبول موقع الصيانة" + +#: ../../../htdocs/monthly_management_report.php:31 +#: ../../../htdocs/reports.php:83 +msgid "Monthly Management Report" +msgstr "تقرير الادارة الشهري" + +#: ../../../htdocs/monthly_management_report.php:36 +msgid "January" +msgstr "كانون الثاني" + +#: ../../../htdocs/monthly_management_report.php:37 +msgid "February" +msgstr "شباط" + +#: ../../../htdocs/monthly_management_report.php:38 +msgid "March" +msgstr "آذار" + +#: ../../../htdocs/monthly_management_report.php:39 +msgid "April" +msgstr "نيسان" + +#: ../../../htdocs/monthly_management_report.php:40 +msgid "May" +msgstr "أيار" + +#: ../../../htdocs/monthly_management_report.php:41 +msgid "June" +msgstr "حزيران" + +#: ../../../htdocs/monthly_management_report.php:42 +msgid "July" +msgstr "تموز" + +#: ../../../htdocs/monthly_management_report.php:43 +msgid "August" +msgstr "آب" + +#: ../../../htdocs/monthly_management_report.php:44 +msgid "September" +msgstr "أيلول" + +#: ../../../htdocs/monthly_management_report.php:45 +msgid "October" +msgstr "تشرين الأول" + +#: ../../../htdocs/monthly_management_report.php:46 +msgid "November" +msgstr "تشرين الثاني" + +#: ../../../htdocs/monthly_management_report.php:47 +msgid "December" +msgstr "كانون الثاني" + +#: ../../../htdocs/monthly_management_report.php:57 +msgid "ERROR: Unable to query first year." +msgstr "خطأ: لا يمكن الاستفسار عن السنة الأولى" + +# c:\program +#: ../../../htdocs/monthly_management_report.php:71 +msgid "Month:" +msgstr "الشهر:" + +#: ../../../htdocs/monthly_management_report.php:73 +msgid "Year:" +msgstr "السنة:" + +#: ../../../htdocs/monthly_management_report.php:79 +#, php-format +msgid "A %sReport%s with an executive summary for a selected month." +msgstr "%sتقرير%s مع ملخص فعلي للشهر المختار" + +#: ../../../htdocs/monthly_management_report.php:85 +msgid "Please select the month." +msgstr "اختر الشهر" + +# c:\program +#: ../../../htdocs/monthly_management_report.php:88 +msgid "Please provide the year." +msgstr "اختر السنة" + +#: ../../../htdocs/monthly_management_report.php:100 +#, php-format +msgid "Monthly Management Report for %s %s" +msgstr "تقرير الادارة الشهري %s %s " + +#: ../../../htdocs/monthly_management_report.php:106 +#: ../../../htdocs/monthly_management_report.php:250 +msgid "Number of Workorders Received" +msgstr "عدد أوامر العمل المستلمة" + +#: ../../../htdocs/monthly_management_report.php:251 +msgid "Average Response Time in h" +msgstr "معدل زمن الاستجابة بالساعة" + +#: ../../../htdocs/monthly_management_report.php:252 +msgid "Average Response Time for "No Water" Workorders in h" +msgstr "معدل زمن استجابة "انقطاع مياه "أوامر العمل بالساعة" + +#: ../../../htdocs/monthly_management_report.php:253 +msgid "Number of Workorders Closed" +msgstr "عدد أوامر العمل المغلقة" + +#: ../../../htdocs/monthly_management_report.php:254 +msgid "Number of Workorders Closed Within 4 Days" +msgstr "عدد أوامر العمل المغلقة خلال اربع أيام" + +#: ../../../htdocs/monthly_management_report.php:255 +msgid "Number of "No Water" Workorders Closed" +msgstr "عدد شكاوي انقطاع المياه المغلقة" + +#: ../../../htdocs/monthly_management_report.php:256 +msgid "Number of "No Water" Workorders Closed Within 4 Days" +msgstr "عدد شكاوي انقطاع المياع المغلقة خلال اربع أيام" + +#: ../../../htdocs/monthly_management_report.php:257 +msgid "Number of Closed Workorders per Repair Team" +msgstr "عدد أوامر العمل المغلقة لكل فرقة صيانة" + +#: ../../../htdocs/monthly_management_report.php:258 +msgid "Number of Leak Repairs per Repair Team" +msgstr "عدد شكاوي التسرب لكل فريق صيانة" + +#: ../../../htdocs/monthly_management_report.php:259 +msgid "Number of Leak Repairs" +msgstr "عدد تصليحات التسرب" + +#: ../../../htdocs/monthly_management_report.php:260 +msgid "Number of Open Workorders" +msgstr "عدد أوامر العمل المفتوحة" + +#: ../../../htdocs/monthly_management_report.php:261 +msgid "Number of Open "No Water" Workorders" +msgstr "عدد شكاوي انقطاع المياه المفتوحه" + +#: ../../../htdocs/monthly_management_report.php:267 +msgid "ERROR: Database query failed." +msgstr "خطأ: فشل في الاستعلام" + +#: ../../../htdocs/monthly_management_report.php:277 +msgid "Percentage of Workorders Closed Within 4 Days" +msgstr "النسبة المئوية لأوامر العمل المغلقة خلال أربع أيام" + +#: ../../../htdocs/monthly_management_report.php:288 +msgid "Percentage of "No Water" Workorders Closed Within 4 Days" +msgstr "النسبة المئوية لعدد شكاوي المياه المغلقة خلال اربع أيام" + +#: ../../../htdocs/monthly_management_report.php:298 +msgid "Completion Ration Percentage" +msgstr "النسبة المئوية للانتهاء" + +#: ../../../htdocs/pending_by_team_report.php:35 +msgid "Pending Complaints by Team" +msgstr "الشكاوي غير المنتهية لكل فريق" + +# c:\program +#: ../../../htdocs/pending_by_team_report.php:54 +#, php-format +msgid "A %sReport%s listing workorders assigned to the teams as of %s." +msgstr "%s تقرير %s يعرض كل فرق الصيانة على شكل %s" + +#: ../../../htdocs/print_workorder.php:55 +msgid "DCMMS Workorder" +msgstr "امر العمل" + +#: ../../../htdocs/print_workorder.php:87 +#: ../../../include/dcmmspage.php:251 +#: ../../../include/dcmmspage.php:255 +#: ../../../include/header.php:150 +#: ../../../include/header.php:154 +msgid "DCMMS" +msgstr "برنامج ادارة الصيانة" + +#: ../../../htdocs/print_workorder.php:91 +#, php-format +msgid "%s %s Workorder # %s Created %s " +msgstr "%s %s </td><td align=\"center\"><span dir=\"ltr\"> <font size =\"+2\"><b> #أمر عمل %s </b></font> %s تم إنشاؤه </span>" + +# c:\program +#: ../../../htdocs/print_workorder.php:92 +msgid "strOrgName" +msgstr "اسم المؤسسة" + +#: ../../../htdocs/print_workorder.php:160 +msgid "Actual Team:" +msgstr "الفرقه المعنية:" + +#: ../../../htdocs/print_workorder.php:161 +msgid "Start Date and Time:" +msgstr "تاريخ و وقت بداية العمل:" + +#: ../../../htdocs/print_workorder.php:162 +msgid "Completion Date and Time:" +msgstr "تاريخ و وقت انتهاء العمل:" + +#: ../../../htdocs/print_workorder.php:163 +msgid "Excavation Area in m<sup>2</sup>:" +msgstr "<sup>2</sup>مساحة الحفر بالمتر " + +#: ../../../htdocs/print_workorder.php:164 +msgid "Supervisor Signature:" +msgstr "توقيع المراقب:" + +# c:\program +#: ../../../htdocs/quality_control_report.php:30 +#: ../../../htdocs/reports.php:80 +msgid "Quality Control Report" +msgstr "تقرير فحص الجودة" + +#: ../../../htdocs/quality_control_report.php:34 +#, php-format +msgid "A DCMMS %sReport%s checking the consistency of the recorded data." +msgstr " . تدقيق جميع البيانات المخزنة خلال فترة من الزمنDCMMS%s تقرير %s " + +# c:\program +#: ../../../htdocs/quality_control_report.php:72 +msgid "A note has to be entered when the leak location is 'Other'." +msgstr "'يجب ادخال ملاحظات في حال كون موقع التسرب هو 'أخرى" + +#: ../../../htdocs/quality_control_report.php:77 +msgid "The team that performed the maintenance differs from the originally assigned one." +msgstr ".ان الفريق الذي قام باجراء عملية الصيانة مختلف عن الفريق الذي تم اسنادها له" + +# c:\program +#: ../../../htdocs/quality_control_report.php:86 +msgid "'No action: No supply scheduled' is only allowed for 'No water' complaints." +msgstr "'بدون اجراء:لا يوجد توزيع ' مسموحة فقط في حالة شكاوي عدم وجود ماء" + +#: ../../../htdocs/quality_control_report.php:90 +msgid "The response time has to be positive." +msgstr ".زمن انتهاء الشكوى يجب ان يكون اكبر من زمن استلام الشكوى" + +# c:\program +#: ../../../htdocs/quality_control_report.php:120 +msgid "No records violate this rule." +msgstr ".لا توجد سجلات تخالف هذه القاعدة" + +# c:\program +#: ../../../htdocs/quality_control_report.php:122 +msgid "The following records violate this rule: " +msgstr "السجلات التالية تخالف هذه القاعدة:" + +# c:\program +#: ../../../htdocs/quality_control_report.php:129 +msgid "Check wether note was entered if Cause is 'other'" +msgstr "'التأكد من ان الملاحظات قد ادخلت في حال كون السبب هو 'أخرى" + +# c:\program +#: ../../../htdocs/quality_control_report.php:130 +msgid "Check if diameter and material are entered if an action was taken." +msgstr ".التأكد من ان القطر او المادة قد ادخلت في حال لم يتم اتخاذ اي اجراء" + +# c:\program +#: ../../../htdocs/quantity_report.php:32 +#: ../../../htdocs/reports.php:70 +msgid "Quantity Report" +msgstr "تقرير فحص الجودة " + +#: ../../../htdocs/quantity_report.php:46 +#, php-format +msgid "A DCMMS %sReport%s on PE pipe quantities for a period of time." +msgstr "%s تقرير %s عن كميات مواسير بولي إيتيلين خلال فترة من الزمن" + +#: ../../../htdocs/quantity_report.php:94 +#, php-format +msgid "PE Pipe Used in %s Between %s and %s" +msgstr "تم استعمال مواسير بولي ايتيلين في %s بين %s و %s" + +#: ../../../htdocs/quantity_report.php:99 +#, php-format +msgid "PE Pipe Used Between %s and %s" +msgstr "تم استعمال مواسير بولي ايتيلين بين %s و %s" + +#: ../../../htdocs/query_workorder_status.php:33 +#: ../../../htdocs/reports.php:47 +msgid "Query Workorder Status" +msgstr "الاستفسار عن وضع امر عمل" + +#: ../../../htdocs/query_workorder_status.php:37 +#, php-format +msgid "A DCMMS %sReport%s displaying the status of a single workorder." +msgstr " يظهر حالة الشكوى المطلوبة نظام ادارة الصيانة %sتقرير%s" + +#: ../../../htdocs/query_workorder_status.php:44 +msgid "Insert the workorder number." +msgstr ".الرجاء ادخال رقم امر العمل" + +# c:\program +#: ../../../htdocs/query_workorder_status.php:47 +msgid "Enter the complainant name." +msgstr ".ادخل اسم المشتكي" + +#: ../../../htdocs/query_workorder_status.php:49 +#: ../../../include/dcmmspage.php:260 +#: ../../../include/header.php:159 +msgid "Search" +msgstr "بحث" + +# c:\program +#: ../../../htdocs/query_workorder_status.php:50 +msgid "Click this button to search for the workorder." +msgstr "اختر هذا الزر للبحث عن امر العمل" + +#: ../../../htdocs/received_workorders_report.php:49 +#, php-format +msgid "A %sReport%s listing workorders received during a period of time" +msgstr "%s تقرير %s يقوم بعرض أوامر العمل المستلمة خلال فترة زمنية معينة" + +#: ../../../htdocs/received_workorders_report.php:105 +#, php-format +msgid "Workorders Recieved between %s and %s" +msgstr "أوامر العمل المستلمة ما بين %s و %s" + +#: ../../../htdocs/reports.php:34 +msgid "Create workorder status report" +msgstr "تجهير تقرير عن اوامر العمل" + +#: ../../../htdocs/reports.php:35 +#: ../../../htdocs/workorder_status_report.php:29 +msgid "Workorder Status Report" +msgstr "تقرير اوامر العمل" + +#: ../../../htdocs/reports.php:37 +msgid "Create workorders received within a period of time report" +msgstr "تجهير تقرير عن اوامر العمل المستلمة خلال فترة زمنية معينة" + +#: ../../../htdocs/reports.php:38 +msgid "Workorders Received" +msgstr "أوامر العمل المستلمة" + +#: ../../../htdocs/reports.php:40 +msgid "Create pending complaints report" +msgstr "عمل تقرير الشكاوي غير المنتهية" + +#: ../../../htdocs/reports.php:41 +msgid "Pending Complaints Report" +msgstr "تقرير الشكاوي غير المنتهية" + +#: ../../../htdocs/reports.php:43 +msgid "Displays all pending workorders of every team." +msgstr "يقوم بعرض أوامر العمل المفتوحة لكل فريق" + +#: ../../../htdocs/reports.php:44 +msgid "Pending Workorders by Team Report" +msgstr "تقرير أوامر العمل المفتوحة لكل فريق" + +#: ../../../htdocs/reports.php:46 +msgid "Create workorder query report" +msgstr "تجهيز تقرير اوامر العمل" + +#: ../../../htdocs/reports.php:49 +msgid "Create an workorder aging report." +msgstr ".تجهير تقرير عن اوامر العمل" + +#: ../../../htdocs/reports.php:55 +msgid "Create Report of Compleated workorders by team" +msgstr "إنشاء تقرير لأوامر العمل المغلقة لكل فريق" + +#: ../../../htdocs/reports.php:58 +msgid "Create response time report" +msgstr "تجهيز تقرير وقت الاستجابة" + +#: ../../../htdocs/reports.php:59 +#: ../../../htdocs/response_time_report.php:31 +msgid "Response Time Report" +msgstr "تقرير سرعة الاستجابة على الشكاوي" + +#: ../../../htdocs/reports.php:61 +msgid "Create excavation report" +msgstr ... [truncated message content] |
From: <sdt...@us...> - 2006-08-31 09:33:00
|
Revision: 1152 http://svn.sourceforge.net/dcmms/?rev=1152&view=rev Author: sdteffen Date: 2006-08-31 02:31:49 -0700 (Thu, 31 Aug 2006) Log Message: ----------- * script/update_dcmms_ddl.sql: * script/create_dcmms_ddl.sql: Fixed Arabic spelling for two workorder subtypes, reserved equipment subtype "Vacuum Sewer Truck" * include/dcmconfig.php.default: * locale/ar_YE/LC_MESSAGES/dcmms.po: Added Yemeni Arabic translations * doc/administration/dcmms_administration_guide.xml: Continued with FAQ * dcmms.nsi: * etc/DCMMS.url: Use logon.php directly to short startup time Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/include/dcmconfig.php.default branches/ms4w/dcmms/include/i18n.php branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po branches/ms4w/dcmms/script/create_dcmms_ddl.sql branches/ms4w/dcmms/script/update_dcmms_ddl.sql Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-31 08:42:51 UTC (rev 1151) +++ branches/ms4w/dcmms/ChangeLog 2006-08-31 09:31:49 UTC (rev 1152) @@ -1,5 +1,9 @@ 2006-08-31 Steffen Macke <Ste...@do...> + * script/update_dcmms_ddl.sql: + * script/create_dcmms_ddl.sql: Fixed Arabic spelling for two workorder + subtypes, reserved equipment subtype "Vacuum Sewer Truck" + * include/dcmconfig.php.default: * locale/ar_YE/LC_MESSAGES/dcmms.po: Added Yemeni Arabic translations * doc/administration/dcmms_administration_guide.xml: Continued with FAQ * dcmms.nsi: Modified: branches/ms4w/dcmms/include/dcmconfig.php.default =================================================================== --- branches/ms4w/dcmms/include/dcmconfig.php.default 2006-08-31 08:42:51 UTC (rev 1151) +++ branches/ms4w/dcmms/include/dcmconfig.php.default 2006-08-31 09:31:49 UTC (rev 1152) @@ -48,7 +48,7 @@ * Note that you will need gettext translations as well as data with the * necessary translations in order to use these languages */ -$_SESSION["arrLanguages"] = array('ar', 'ar_SY', 'en', 'fr', 'it', 'th'); +$_SESSION["arrLanguages"] = array('ar', 'ar_SY', 'ar_YE', 'en', 'fr', 'it', 'th'); // The codepage used for the creation of shapefiles - used by shapefile loader // and dumper - adjust if necessary Modified: branches/ms4w/dcmms/include/i18n.php =================================================================== --- branches/ms4w/dcmms/include/i18n.php 2006-08-31 08:42:51 UTC (rev 1151) +++ branches/ms4w/dcmms/include/i18n.php 2006-08-31 09:31:49 UTC (rev 1152) @@ -257,6 +257,7 @@ _("Serialnumber"); _("serialnumber"); _("Sewerage"); +_("Sewer Vacuum Truck"); _("Shapefile dumper"); _("Shapefile loader"); _("Social Service"); Modified: branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po =================================================================== --- branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po 2006-08-31 08:42:51 UTC (rev 1151) +++ branches/ms4w/dcmms/locale/ar_YE/LC_MESSAGES/dcmms.po 2006-08-31 09:31:49 UTC (rev 1152) @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: DCMMS 1.2.0\n" "POT-Creation-Date: 2003-07-03 14:07+0300\n" -"PO-Revision-Date: 2006-08-31 11:40+0200\n" +"PO-Revision-Date: 2006-08-31 12:28+0200\n" "Last-Translator: Steffen Macke <Ste...@do...>\n" "Language-Team: ar <Ste...@do...>\n" "MIME-Version: 1.0\n" @@ -502,7 +502,7 @@ msgstr "رقم التعريف" #: ../../../admin/team_management.php:137 -#: ../../../include/i18n.php:287 +#: ../../../include/i18n.php:288 msgid "Team" msgstr "اسم الفريق" @@ -2104,7 +2104,7 @@ msgstr "التجهيزات" #: ../../../htdocs/resource_report.php:161 -#: ../../../include/i18n.php:266 +#: ../../../include/i18n.php:267 msgid "Staff" msgstr "العمال" @@ -2159,7 +2159,7 @@ # c:\program #: ../../../htdocs/seal.php:32 -#: ../../../include/i18n.php:304 +#: ../../../include/i18n.php:305 msgid "Unsealed" msgstr "ختم مزال" @@ -3421,312 +3421,316 @@ msgid "Sewerage" msgstr "شبكة الصرف الصحي" +#: ../../../include/i18n.php:260 +msgid "Sewer Vacuum Truck" +msgstr "شفاط" + # c:\program -#: ../../../include/i18n.php:260 +#: ../../../include/i18n.php:261 msgid "Shapefile dumper" msgstr "تنزيل المعومات على شكل shapefile" # c:\program -#: ../../../include/i18n.php:261 +#: ../../../include/i18n.php:262 msgid "Shapefile loader" msgstr "تحميل البيانات الى قاعدة البيانات" # c:\program -#: ../../../include/i18n.php:262 +#: ../../../include/i18n.php:263 msgid "Social Service" msgstr "مركز اجتماعي" -#: ../../../include/i18n.php:263 +#: ../../../include/i18n.php:264 msgid "Soil excavation" msgstr "حفر التربة" -#: ../../../include/i18n.php:264 +#: ../../../include/i18n.php:265 msgid "Sport Facility" msgstr "مرفق رياضي" -#: ../../../include/i18n.php:265 +#: ../../../include/i18n.php:266 msgid "square meter" msgstr "متر مربع" -#: ../../../include/i18n.php:267 +#: ../../../include/i18n.php:268 msgid "StaffSubtype" msgstr "الموارد البشرية المستخدمه" -#: ../../../include/i18n.php:268 +#: ../../../include/i18n.php:269 msgid "Stainless Steel" msgstr "ستانلس" -#: ../../../include/i18n.php:269 +#: ../../../include/i18n.php:270 msgid "StartDate" msgstr "تاريخ البدء" -#: ../../../include/i18n.php:270 +#: ../../../include/i18n.php:271 msgid "Startdate" msgstr "تاريخ البدء" # c:\program -#: ../../../include/i18n.php:271 +#: ../../../include/i18n.php:272 msgid "Status" msgstr "الحالة" # c:\program -#: ../../../include/i18n.php:272 +#: ../../../include/i18n.php:273 msgid "status" msgstr "الحالة" -#: ../../../include/i18n.php:273 +#: ../../../include/i18n.php:274 msgid "Steel" msgstr "حديد" -#: ../../../include/i18n.php:274 +#: ../../../include/i18n.php:275 msgid "Steel Pipe" msgstr "مواسير حديد" -#: ../../../include/i18n.php:275 +#: ../../../include/i18n.php:276 msgid "Street" msgstr "شارع" # c:\program -#: ../../../include/i18n.php:276 +#: ../../../include/i18n.php:277 msgid "Subscriber ID" msgstr "رقم الاشتراك" # c:\program -#: ../../../include/i18n.php:277 +#: ../../../include/i18n.php:278 msgid "Subscriberoid" msgstr "رقم الاشتراك" # c:\program -#: ../../../include/i18n.php:278 +#: ../../../include/i18n.php:279 msgid "subscriberoid" msgstr "رقم الاشتراك" -#: ../../../include/i18n.php:279 +#: ../../../include/i18n.php:280 msgid "Subscription Change" msgstr "تغيير الاشتراك" -#: ../../../include/i18n.php:280 +#: ../../../include/i18n.php:281 msgid "Substandard Installation" msgstr "تنفيذ سيء" -#: ../../../include/i18n.php:281 +#: ../../../include/i18n.php:282 msgid "Subtype" msgstr "النوع" -#: ../../../include/i18n.php:282 +#: ../../../include/i18n.php:283 msgid "subtype" msgstr "النوع" -#: ../../../include/i18n.php:283 +#: ../../../include/i18n.php:284 msgid "Successfully inserted the landmark record." msgstr ".تمت عملية اضافة المعلم بنجاح" # c:\program -#: ../../../include/i18n.php:284 +#: ../../../include/i18n.php:285 msgid "Table" msgstr "الجدول" # c:\program -#: ../../../include/i18n.php:285 +#: ../../../include/i18n.php:286 msgid "TableName" msgstr "اسم الجدول" # c:\program -#: ../../../include/i18n.php:286 +#: ../../../include/i18n.php:287 msgid "Team leader" msgstr "رئيس الفرقة" -#: ../../../include/i18n.php:288 +#: ../../../include/i18n.php:289 msgid "team" msgstr "الفرقة:" # c:\program -#: ../../../include/i18n.php:289 +#: ../../../include/i18n.php:290 msgid "Tee" msgstr "الرمل" # c:\program -#: ../../../include/i18n.php:290 +#: ../../../include/i18n.php:291 msgid "Telephone" msgstr " الهاتف" # c:\program -#: ../../../include/i18n.php:291 +#: ../../../include/i18n.php:292 msgid "telephone" msgstr " الهاتف" -#: ../../../include/i18n.php:292 +#: ../../../include/i18n.php:293 msgid "Tile excavation" msgstr "كسر بلاط" -#: ../../../include/i18n.php:293 +#: ../../../include/i18n.php:294 msgid "To Date" msgstr "الى تاريخ" # c:\program -#: ../../../include/i18n.php:294 +#: ../../../include/i18n.php:295 msgid "ToDate" msgstr "الى تاريخ" # c:\program -#: ../../../include/i18n.php:295 +#: ../../../include/i18n.php:296 msgid "Totalcount" msgstr "المجموع الكلي" # c:\program -#: ../../../include/i18n.php:296 +#: ../../../include/i18n.php:297 msgid "totalcount" msgstr "المجموع الكلي" -#: ../../../include/i18n.php:297 +#: ../../../include/i18n.php:298 msgid "Truck" msgstr "شاحنة" -#: ../../../include/i18n.php:298 +#: ../../../include/i18n.php:299 msgid "type" msgstr "النوع" # c:\program -#: ../../../include/i18n.php:299 +#: ../../../include/i18n.php:300 msgid "Union" msgstr "قطع وصل" # c:\program -#: ../../../include/i18n.php:300 +#: ../../../include/i18n.php:301 msgid "Unit" msgstr "الوحدة" # c:\program -#: ../../../include/i18n.php:301 +#: ../../../include/i18n.php:302 msgid "unit" msgstr "الوحدة" # c:\program -#: ../../../include/i18n.php:302 +#: ../../../include/i18n.php:303 msgid "Unknown" msgstr "غير معروف" -#: ../../../include/i18n.php:303 +#: ../../../include/i18n.php:304 msgid "Unregistered Payment" msgstr "دفعة غير مسجلة" -#: ../../../include/i18n.php:305 +#: ../../../include/i18n.php:306 msgid "unsealed" msgstr "ختم مزال" # c:\program -#: ../../../include/i18n.php:306 +#: ../../../include/i18n.php:307 msgid "User management" msgstr "ادارة المستخدمين" -#: ../../../include/i18n.php:307 +#: ../../../include/i18n.php:308 #: ../../../include/dataobject/History.php:60 msgid "User" msgstr " مستخدم" -#: ../../../include/i18n.php:308 +#: ../../../include/i18n.php:309 msgid "username" msgstr "اسم المستخدم" -#: ../../../include/i18n.php:309 +#: ../../../include/i18n.php:310 msgid "Utility" msgstr "مرفق خدمي" -#: ../../../include/i18n.php:310 +#: ../../../include/i18n.php:311 msgid "Valve Replacement" msgstr "تغيير محبس" -#: ../../../include/i18n.php:311 +#: ../../../include/i18n.php:312 msgid "Valve replacement" msgstr "تغيير محبس" -#: ../../../include/i18n.php:312 +#: ../../../include/i18n.php:313 msgid "Valve" msgstr "محبس" -#: ../../../include/i18n.php:313 +#: ../../../include/i18n.php:314 msgid "Valve Operation" msgstr "فتح/إغلاق سكر" -#: ../../../include/i18n.php:314 +#: ../../../include/i18n.php:315 msgid "Vandalism" msgstr "تخريب" -#: ../../../include/i18n.php:315 +#: ../../../include/i18n.php:316 msgid "View" msgstr "نظرة سريعة" -#: ../../../include/i18n.php:316 +#: ../../../include/i18n.php:317 msgid "Village" msgstr "الحي" -#: ../../../include/i18n.php:317 +#: ../../../include/i18n.php:318 msgid "village" msgstr "الحي" # c:\program -#: ../../../include/i18n.php:318 +#: ../../../include/i18n.php:319 msgid "Water Supply" msgstr "مصدر مائي" -#: ../../../include/i18n.php:319 +#: ../../../include/i18n.php:320 msgid "Welder" msgstr "فني لحام" -#: ../../../include/i18n.php:320 +#: ../../../include/i18n.php:321 msgid "Welding Machine" msgstr "ماكينة لحام" -#: ../../../include/i18n.php:321 +#: ../../../include/i18n.php:322 msgid "Welding" msgstr " اللحام" -#: ../../../include/i18n.php:322 +#: ../../../include/i18n.php:323 msgid "Wood" msgstr "خشب" -#: ../../../include/i18n.php:323 +#: ../../../include/i18n.php:324 msgid "Wooden Plug" msgstr "زطمة خشبية" -#: ../../../include/i18n.php:324 +#: ../../../include/i18n.php:325 msgid "working hour" msgstr "ساعة عمل" -#: ../../../include/i18n.php:325 +#: ../../../include/i18n.php:326 msgid "Working hours" msgstr "ساعات عمل" -#: ../../../include/i18n.php:326 +#: ../../../include/i18n.php:327 msgid "Workorderid" msgstr "رقم امر العمل" -#: ../../../include/i18n.php:327 +#: ../../../include/i18n.php:328 msgid "workorderid" msgstr "رقم امر العمل" -#: ../../../include/i18n.php:328 +#: ../../../include/i18n.php:329 msgid "Workordertype" msgstr "نوع امر العمل" -#: ../../../include/i18n.php:329 +#: ../../../include/i18n.php:330 msgid "workordertype" msgstr "نوع امر العمل" -#: ../../../include/i18n.php:330 +#: ../../../include/i18n.php:331 msgid "Wrong Bill" msgstr "فاتورة خاطئة" # c:\program -#: ../../../include/i18n.php:331 +#: ../../../include/i18n.php:332 msgid "Wrong Reading" msgstr "قراءة خاطئة" -#: ../../../include/i18n.php:332 +#: ../../../include/i18n.php:333 msgid "year" msgstr "السنة" -#: ../../../include/i18n.php:333 +#: ../../../include/i18n.php:334 msgid "years" msgstr "السنوات" Modified: branches/ms4w/dcmms/script/create_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-31 08:42:51 UTC (rev 1151) +++ branches/ms4w/dcmms/script/create_dcmms_ddl.sql 2006-08-31 09:31:49 UTC (rev 1152) @@ -644,6 +644,8 @@ (9, 'Leak Detection Equipment', 'hour'); -- insert into EquipmentSubtype (Subtype, Description, Unit) values -- (10, 'Leak Detection Car', 'hour'); +-- insert into EquipmentSubtype (Subtype, Description, Unit) values +-- (11, 'Sewer Vacuum Truck', 'hour'); insert into CostCenter values('100', '100', '100', 1); insert into CostCenter values('101', '101', '101', 1); @@ -1049,10 +1051,10 @@ select dcmmsTranslationUpdate('ar', 'Pollution', 'تلوث'); select dcmmsTranslationUpdate('ar', 'Other', 'أخرى'); select dcmmsTranslationUpdate('ar', 'Blockage', 'انسداد'); -select dcmmsTranslationUpdate('ar', 'Flooding', 'يضان'); +select dcmmsTranslationUpdate('ar', 'Flooding', 'فيضان'); select dcmmsTranslationUpdate('ar', 'Damaged Installation', 'تمديدات تالفة'); select dcmmsTranslationUpdate('ar', 'Illegal Use', 'استخدام غير شرعي'); -select dcmmsTranslationUpdate('ar', 'Wrong Bill', 'اتورة خاطئة'); +select dcmmsTranslationUpdate('ar', 'Wrong Bill', 'فاتورة خاطئة'); select dcmmsTranslationUpdate('ar', 'No Bill', 'لا يوجد فاتورة'); select dcmmsTranslationUpdate('ar', 'Wrong Reading', 'قراءة خاطئة'); select dcmmsTranslationUpdate('ar', 'Subscription Change', 'تغيير الاشتراك'); @@ -1064,10 +1066,10 @@ select dcmmsTranslationUpdate('ar_SY', 'Pollution', 'تلوث'); select dcmmsTranslationUpdate('ar_SY', 'Other', 'أخرى'); select dcmmsTranslationUpdate('ar_SY', 'Blockage', 'انسداد'); -select dcmmsTranslationUpdate('ar_SY', 'Flooding', 'يضان'); +select dcmmsTranslationUpdate('ar_SY', 'Flooding', 'فيضان'); select dcmmsTranslationUpdate('ar_SY', 'Damaged Installation', 'تمديدات تالفة'); select dcmmsTranslationUpdate('ar_SY', 'Illegal Use', 'استخدام غير شرعي'); -select dcmmsTranslationUpdate('ar_SY', 'Wrong Bill', 'اتورة خاطئة'); +select dcmmsTranslationUpdate('ar_SY', 'Wrong Bill', 'فاتورة خاطئة'); select dcmmsTranslationUpdate('ar_SY', 'No Bill', 'لا يوجد فاتورة'); select dcmmsTranslationUpdate('ar_SY', 'Wrong Reading', 'قراءة خاطئة'); select dcmmsTranslationUpdate('ar_SY', 'Subscription Change', 'تغيير الاشتراك'); Modified: branches/ms4w/dcmms/script/update_dcmms_ddl.sql =================================================================== --- branches/ms4w/dcmms/script/update_dcmms_ddl.sql 2006-08-31 08:42:51 UTC (rev 1151) +++ branches/ms4w/dcmms/script/update_dcmms_ddl.sql 2006-08-31 09:31:49 UTC (rev 1152) @@ -34,6 +34,12 @@ insert into LeakLocation values(7, 'Manhole'); +select dcmmsTranslationUpdate('ar', 'Wrong Bill', 'فاتورة خاطئة'); +select dcmmsTranslationUpdate('ar', 'Flooding', 'فيضان'); +select dcmmsTranslationUpdate('ar_SY', 'Wrong Bill', 'فاتورة خاطئة'); +select dcmmsTranslationUpdate('ar_SY', 'Flooding', 'فيضان'); + + create or replace function dcmmsversion() returns text as $body$ begin This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-09-02 05:35:39
|
Revision: 1153 http://svn.sourceforge.net/dcmms/?rev=1153&view=rev Author: sdteffen Date: 2006-09-01 22:34:15 -0700 (Fri, 01 Sep 2006) Log Message: ----------- * doc/dcmms_uml.vsd: Fixed typo in component diagram * doc/administration/dcmms_administration_guide.xml: Continuing with certification questions Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml branches/ms4w/dcmms/doc/administration/figure/component_diagram.png branches/ms4w/dcmms/doc/dcmms_uml.vsd Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-08-31 09:31:49 UTC (rev 1152) +++ branches/ms4w/dcmms/ChangeLog 2006-09-02 05:34:15 UTC (rev 1153) @@ -1,3 +1,9 @@ +2006-09-02 Steffen Macke <Ste...@do...> + + * doc/dcmms_uml.vsd: Fixed typo in component diagram + * doc/administration/dcmms_administration_guide.xml: Continuing with + certification questions + 2006-08-31 Steffen Macke <Ste...@do...> * script/update_dcmms_ddl.sql: Modified: branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml =================================================================== --- branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-08-31 09:31:49 UTC (rev 1152) +++ branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-09-02 05:34:15 UTC (rev 1153) @@ -1162,15 +1162,24 @@ </sect2> <sect2 id="checklist"> <title>Checklist</title> + <indexterm><primary>passwords</primary></indexterm> + <indexterm><primary>checklist</primary></indexterm> + <indexterm><primary>security</primary></indexterm> + <indexterm><primary>firewall</primary></indexterm> + <indexterm><primary>timezone</primary></indexterm> + <indexterm><primary>postgresql.conf</primary></indexterm> <para>The following points should be checked before a <citetitle>DCMMS</citetitle> goes into production: <itemizedlist> + <listitem><para>Administrator passwords on the Windows and PostgreSQL + level</para></listitem> <listitem><para>System clock setting</para></listitem> <listitem><para>User rights</para></listitem> <listitem><para>Security updates</para></listitem> - <listitem><para>Network connections</para></listitem> + <listitem><para>Network connections including Firewall</para></listitem> <listitem><para>Eventually all removable media drives - should be disabled to prevent installation of software</para> + should be disabled to prevent installation of software (applies + to standalone systems that should be specially hardened).</para> </listitem> <listitem><para>The PostgreSQL timezone setting. If necessary, adjust <filename>postgresql.conf</filename>, e.g. by adding @@ -1705,6 +1714,9 @@ superuser "postgres".</para></listitem> </orderedlist> </para> + <tip><para>Remember to drop the database and create an empty + one before restoring your backup. Use "UTF-8" as + the database encoding when creating the database.</para></tip> </sect3> <sect3 id="merge"> <title>Merge DCMMS Databases</title> @@ -2491,10 +2503,10 @@ critical values to others first.</para></caution> </sect2> <sect2 id="faq_how_to_add_material"> - <indexterm><primary>new material</primary></indexterm> + <title>How to add e.g. a new material?</title> + <para><indexterm><primary>new material</primary></indexterm> <indexterm><primary>add material</primary></indexterm> - <title>How to add e.g. a new material?</title> - <para>Materials in DCMMS are simple records in the <classname + Materials in DCMMS are simple records in the <classname >MaterialDomain</classname> table of the dcmms database. Adding a material is as simple as adding a new record. See <xref linkend="database_side_customization" /> for the details.</para> @@ -2920,8 +2932,40 @@ </qandaentry> <qandaentry><question><para>What is the difference between the HTTP and HTTPS protocols?</para></question><answer><para>...</para></answer> - </qandaentry> + </qandaentry> + <qandaentry><question><para>What is your preferred backup media?</para> + </question><answer><para>...</para></answer></qandaentry> </qandadiv> + <qandadiv> + <title>Windows</title> + <qandaentry><question><para>Which tool can be used to track down DLL + problems?</para></question><answer><para>...</para></answer></qandaentry> + <qandaentry><question><para>Which tools can be used to identify the + program that occupies a port?</para></question><answer> + <para>...</para></answer></qandaentry> + </qandadiv> + <qandadiv> + <title>PostgreSQL</title> + <qandaentry><question><para>Which PostgreSQL tool do you use for + database administration?</para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry><question><para>In which file do you adjust the + PostgreSQL timezone setting?</para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry><question><para>Which are the two PostgreSQL backup + formats that are relevant for DCMMS?</para></question> + <answer><para>...</para></answer></qandaentry> + <qandaentry><question><para>How do you restore a DCMMS database + that has been backed up using <command>pgAdmin</command> (A + database dcmms already exists on the system) ?</para></question> + <answer><para>...</para></answer></qandaentry> + </qandadiv> + <qandadiv> + <title>Administration</title> + <qandaentry><question><para>Which files should be backed up besides + the DCMMS database?</para></question><answer><para>...</para> + </answer></qandaentry> + </qandadiv> </qandaset> </sect1> </article> Modified: branches/ms4w/dcmms/doc/administration/figure/component_diagram.png =================================================================== (Binary files differ) Modified: branches/ms4w/dcmms/doc/dcmms_uml.vsd =================================================================== (Binary files differ) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <sdt...@us...> - 2006-09-05 07:52:12
|
Revision: 1154 http://svn.sourceforge.net/dcmms/?rev=1154&view=rev Author: sdteffen Date: 2006-09-05 00:51:51 -0700 (Tue, 05 Sep 2006) Log Message: ----------- * doc/administration/dcmms_administration_guide.xml: More certification questions 2006-09-02 Steffen Macke <Ste...@do...> * doc/dcmms_uml.vsd: Fixed typo in component diagram * doc/administration/dcmms_administration_guide.xml: Continuing with certification questions Modified Paths: -------------- branches/ms4w/dcmms/ChangeLog branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml Modified: branches/ms4w/dcmms/ChangeLog =================================================================== --- branches/ms4w/dcmms/ChangeLog 2006-09-02 05:34:15 UTC (rev 1153) +++ branches/ms4w/dcmms/ChangeLog 2006-09-05 07:51:51 UTC (rev 1154) @@ -1,8 +1,13 @@ +2006-09-05 Steffen Macke <Ste...@do...> + + * doc/administration/dcmms_administration_guide.xml: More certification + questions + 2006-09-02 Steffen Macke <Ste...@do...> - * doc/dcmms_uml.vsd: Fixed typo in component diagram - * doc/administration/dcmms_administration_guide.xml: Continuing with - certification questions + * doc/dcmms_uml.vsd: Fixed typo in component diagram + * doc/administration/dcmms_administration_guide.xml: Continuing with + certification questions 2006-08-31 Steffen Macke <Ste...@do...> Modified: branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml =================================================================== --- branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-09-02 05:34:15 UTC (rev 1153) +++ branches/ms4w/dcmms/doc/administration/dcmms_administration_guide.xml 2006-09-05 07:51:51 UTC (rev 1154) @@ -2879,7 +2879,7 @@ <sect1 id="certification_questions_2006"> <title>2006 Certification Questions</title> <qandaset> - <qandadiv><title>Security</title> + <qandadiv id="cert_security"><title>Security</title> <qandaentry> <question><para>Give an example of a strong password (Note that you should <emphasis>never</emphasis> use this particular @@ -2893,7 +2893,7 @@ <question><para>Why are strong passwords important?</para></question> <answer><para>...</para></answer></qandaentry> </qandadiv> - <qandadiv> + <qandadiv id="cert_engineering"> <title>Engineering</title> <qandaentry> <question><para>Why does the <classname>Maintenance</classname> @@ -2908,13 +2908,13 @@ >Diameter2</structfield>?</para></question> <answer><para>...</para></answer></qandaentry> </qandadiv> - <qandadiv> + <qandadiv id="cert_customization"> <title>Customization</title> <qandaentry><question><para>How can a new pipe material be added to the DCMMS?</para></question> <answer><para>...</para></answer></qandaentry> </qandadiv> - <qandadiv> + <qandadiv id="cert_technology"> <title>Technology</title> <qandaentry><question><para>A DCMMS server with the start URL http://www.dcmms.org/dcmms/logon.php has been changed to use port @@ -2936,37 +2936,53 @@ <qandaentry><question><para>What is your preferred backup media?</para> </question><answer><para>...</para></answer></qandaentry> </qandadiv> - <qandadiv> + </qandaset> + <sect2 id="cert_windows"> <title>Windows</title> - <qandaentry><question><para>Which tool can be used to track down DLL - problems?</para></question><answer><para>...</para></answer></qandaentry> - <qandaentry><question><para>Which tools can be used to identify the - program that occupies a port?</para></question><answer> - <para>...</para></answer></qandaentry> - </qandadiv> - <qandadiv> + <orderedlist inheritnum="inherit"> + <listitem><para>Which tool can be used to track down DLL + problems?</para><para>...</para></listitem> + <listitem><para>Which tools can be used to identify the + program that occupies a port?</para> + <para>...</para></listitem> + </orderedlist> + </sect2> + <sect2 id="cert_postgresql"> <title>PostgreSQL</title> - <qandaentry><question><para>Which PostgreSQL tool do you use for - database administration?</para></question> - <answer><para>...</para></answer></qandaentry> - <qandaentry><question><para>In which file do you adjust the - PostgreSQL timezone setting?</para></question> - <answer><para>...</para></answer></qandaentry> - <qandaentry><question><para>Which are the two PostgreSQL backup - formats that are relevant for DCMMS?</para></question> - <answer><para>...</para></answer></qandaentry> - <qandaentry><question><para>How do you restore a DCMMS database + <orderedlist inheritnum="inherit"> + <listitem><para>There are different PostgreSQL tools. + Which one do you use for database administration tasks?</para> + <para>...</para></listitem> + <listitem><para>In which file do you adjust the + PostgreSQL timezone setting?</para><para>...</para></listitem> + <listitem><para>Which are the two PostgreSQL backup + formats that are relevant for DCMMS?</para><para>...</para></listitem> + <listitem><para>How do you restore a DCMMS database that has been backed up using <command>pgAdmin</command> (A - database dcmms already exists on the system) ?</para></question> - <answer><para>...</para></answer></qandaentry> - </qandadiv> - <qandadiv> + database dcmms already exists on the system) ?</para> + <para>...</para></listitem> + </orderedlist> + </sect2> + <sect2 id="cert_administration"> <title>Administration</title> - <qandaentry><question><para>Which files should be backed up besides - the DCMMS database?</para></question><answer><para>...</para> - </answer></qandaentry> - </qandadiv> - </qandaset> + <orderedlist inheritnum="inherit"> + <listitem><para>Which files should be backed up besides + the DCMMS database?</para><para>...</para></listitem> + <listitem><para>Please provide the link to one of your posts to the dcmms-info + mailing list:</para><para>...</para></listitem> + <listitem><para>Please provide the link to an RFE you have posted:</para> + <para>...</para></listitem> + </orderedlist> + </sect2> + <sect2 id="cert_mapserver"> + <title>Mapserver</title> + <orderedlist inheritnum="inherit"> + <listitem><para>Which configuration files contain information about + the keymap?</para><para>...</para></listitem> + <listitem><para>What is the name of your keymap image file?</para> + <para>...</para></listitem> + </orderedlist> + </sect2> </sect1> </article> <index> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |