[Dcmms-devel] SF.net SVN: dcmms:[1416] trunk/ms4w/apps/dcmms
Brought to you by:
maher_karim,
sdteffen
From: <mah...@us...> - 2010-01-04 12:00:04
|
Revision: 1416 http://dcmms.svn.sourceforge.net/dcmms/?rev=1416&view=rev Author: maher_karim Date: 2010-01-04 11:59:57 +0000 (Mon, 04 Jan 2010) Log Message: ----------- 2009-12-21 Maher Abdel Karim <Mah...@do...> * htdocs/complaint_pending_report.php: adjust code. * plugin/customersearchplugin.php: Add more validation code Modified Paths: -------------- trunk/ms4w/apps/dcmms/ChangeLog trunk/ms4w/apps/dcmms/htdocs/complaint_pending_report.php trunk/ms4w/apps/dcmms/plugin/customersearchplugin.php Modified: trunk/ms4w/apps/dcmms/ChangeLog =================================================================== --- trunk/ms4w/apps/dcmms/ChangeLog 2009-11-19 20:01:56 UTC (rev 1415) +++ trunk/ms4w/apps/dcmms/ChangeLog 2010-01-04 11:59:57 UTC (rev 1416) @@ -1,3 +1,8 @@ +2009-12-21 Maher Abdel Karim <Mah...@do...> + + * htdocs/complaint_pending_report.php: adjust code. + * plugin/customersearchplugin.php: Add more validation code + 2009-11-10 Maher Abdel Karim <Mah...@do...> * htdocs/quality_control_report.php: Add more checks for sewer pipe types Modified: trunk/ms4w/apps/dcmms/htdocs/complaint_pending_report.php =================================================================== --- trunk/ms4w/apps/dcmms/htdocs/complaint_pending_report.php 2009-11-19 20:01:56 UTC (rev 1415) +++ trunk/ms4w/apps/dcmms/htdocs/complaint_pending_report.php 2010-01-04 11:59:57 UTC (rev 1416) @@ -20,7 +20,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - + require '../include/dcmmspage.php'; require '../include/dcmmspear.php'; require 'HTML/QuickForm.php'; @@ -33,14 +33,14 @@ $dcmPage->add('<p>'.sprintf( _('A DCMMS %sReport%s listing workorders that are still pending.') , '<a href="reports.php">', '</a>').'</p>'); -$dcmPage->add('<table width=90%><tr><td></td><td width=30%><font color=red >'._('Date: ').date('d-M-Y h:i').'</font></td></tr></table>'); +$dcmPage->add('<table width=90%><tr><td></td><td width=30%><font color=red >'._('Date: ').date('d-M-Y h:i').'</font></td></tr></table>'); $form = new HTML_QuickForm('PendingWorkordersForm'); - -$objAdministrativeArea =& new HTML_QuickForm_select('administrativearea', + +$objAdministrativeArea =& new HTML_QuickForm_select('administrativearea', _('Administrative Area:')); $objAdministrativeArea->addOption(_('[Select One]'), 0); $strQuery ='select dcmmstranslation(\''.$_SESSION['language']. - '\',Name),codedvalue from administrativearea'; + '\',Name),codedvalue from administrativearea'; $objResult =& $objDb->query($strQuery); if(DB::isError($objResult)) { die($objResult->getMessage); @@ -50,7 +50,7 @@ } $form->addElement($objAdministrativeArea); -$objResponsibile =& new HTML_QuickForm_select('responsible', +$objResponsibile =& new HTML_QuickForm_select('responsible', _('Responsible:')); $objResponsibile->addOption(_('[Select One]'), 0); $objResponsibile->addOption(_('Inspector'), _('Inspector')); @@ -59,9 +59,9 @@ $form->addElement($objResponsibile); $form->addElement("submit", null, _("Create Report")); -$form->addRule("administrativearea", - _("Administrative Area has to be a coded value."), "regex", "/[0-9]*/", - $_SESSION["strHtmlQuickFormValidation"]); +$form->addRule("administrativearea", + _("Administrative Area has to be a coded value."), "regex", "/[0-9]*/", + $_SESSION["strHtmlQuickFormValidation"]); $dcmPage->add($form->toHtml()); /** * Default values. @@ -79,59 +79,60 @@ if($arrRow[1] == $intAdministrativeArea) { $strAdministrativeArea = $arrRow[0]; break; - } - $intRow++; + } + $intRow++; } - + } -} +} /** * Prepare query. */ $dcmPage->add('<h2>'.sprintf(_('Pending workorders for %s')." "._(' Up to Date: %s'), - $strAdministrativeArea,date("d-m-Y g:i")).'</h2>'); + $strAdministrativeArea,date("d-m-Y g:i")).'</h2>'); if ($_POST['responsible']!=''){ $dcmPage->add('<h2>'.sprintf(_('Daily shift list for %s with newly received complaints'), - _($_POST['responsible'])).'</h2>'); + _($_POST['responsible'])).'</h2>'); } -$strQuery ='select subtype,description from workordersubtype order by subtype'; +$strQuery ='select subtype,description from workordersubtype order by subtype'; $objResultsubtype =& $objDb->query($strQuery); if(DB::isError($objResultsubtype)) { die($objResultsubtype->getMessage); } -//print_r($objResult->numrows()); -for ($i=1;$i<$objResultsubtype->numrows();$i++){ -//while($arrRow =& $objResult->fetchRow()) { - +for ($i=0;$i<$objResultsubtype->numrows();$i++){ +//while($arrRow =& $objResultsubtype->fetchRow()) { + + + /** * Execute query. */ $intType=3; if ($_POST['responsible']== _('Inspector')){ -$intType=1; +$intType=1; } /** * Create table. * \todo Refactor to avoid dummy query. - */ - if ($objResultsubtype->numrows()!=0){ + */ + if ($objResultsubtype->numrows()!=0){ $rowType = $objResultsubtype->fetchRow(); //print_r($rowType[0].'<br>'); if (array_key_exists($rowType[0],$_SESSION['arrSubtype'])){ +//print_r($rowType[0].'<br>'); - $strQuery = 'select Workorder.ID as WorkorderID, Complainant, '. 'dcmmstranslation(?, WorkorderSubtype.Description) as Description, Telephone, '. 'Workorder.LocationDescription, '. $dcmPage->postgis->formatTimestamp('Workorder.ReceivedDate'). - ' as ReceivedDate, Workorder.Note || \' \' || Maintenance.Note as Note from '. + ' as ReceivedDate, Workorder.Note as Note from '. 'Workorder, WorkorderSubtype, Maintenance where Workorder.Subtype = '. 'WorkorderSubtype.Subtype and Workorder.ID = Maintenance.ID '. - ' and (AdministrativeArea = ? or ? = 0) and + ' and (AdministrativeArea = ? or ? = 0) and workorder.subtype=? and Maintenance.Status=? order by workorder.id asc'; //echo $strQuery; $objQuery =& $objDb->prepare($strQuery); @@ -146,9 +147,9 @@ die($objResult->getMessage()); } $dcmPage->add('<h2>'.sprintf(_('%s').'<br>'._(' Number of Open workorders is: %s'), - _($rowType[1]),$objResult->numrows()).'</h2>'); + _($rowType[1]),$objResult->numrows()).'</h2>'); -$objTable =& new DbTable(&$objDb, +$objTable =& new DbTable(&$objDb, 'select 1 as WorkorderID,1 as complainant, 1 as Description, 1 as Telephone, ' . '1 as LocationDescription, 1 as ReceivedDate, 1 as Note'); $objTable->addResult(&$objResult); Modified: trunk/ms4w/apps/dcmms/plugin/customersearchplugin.php =================================================================== --- trunk/ms4w/apps/dcmms/plugin/customersearchplugin.php 2009-11-19 20:01:56 UTC (rev 1415) +++ trunk/ms4w/apps/dcmms/plugin/customersearchplugin.php 2010-01-04 11:59:57 UTC (rev 1416) @@ -201,15 +201,19 @@ $maxx=$maxx+50; $maxy=$maxy+50; + } +if ($GISPK!=''){ header("location: map.php?&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+" . "View&minx=$minx&miny=$miny&maxx=$maxx&maxy=$maxy&imagewidth=400&" . "imageheight=300&CMD=HIGHLIGHT" . "&KEYMAPXSIZE=120&KEYMAPYSIZE=90&MapSize=400%2C300&PREVIOUS_MODE=1&GISPK=".$row[0]); exit (); - } + +}else{ - $strMessage = sprintf(_('Customer search for "%s"returned no results.'), $strSearchTerm); + $strMessage = sprintf(_('Customer search returned no results.'), $strSearchTerm); throw new Exception($strMessage); +} } } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |