[Rapc-commit] SF.net SVN: rapc: [59] trunk/rapc

[<mah...@us...>]

Revision: 59
          http://svn.sourceforge.net/rapc/?rev=59&view=rev
Author:   maher_karim
Date:     2007-03-18 06:28:05 -0700 (Sun, 18 Mar 2007)

Log Message:
-----------
2007-03-18  Maher Abdel karim <mah...@do...>

	* script/create_view.sql:add panel.id to the view.
	* local/ar/LC_MESSAGES/rapc.po:update transaltions.
	* panelinstallation_report.php:adjust report based on MPWH request.
	* include/i18n.php:adjust translation.
	* authorized_panel_report.php:adjust report based on MPWH request.
	* contract_panel_report.php:
	* detailed_panelinstallation_report.php:
	* illegal_panelinstallation_report.php:
	* public_panel.php:
	* reports.php:adjust based on MPWH requests.

Modified Paths:
--------------
    trunk/rapc/contract_panel_report.php
    trunk/rapc/illegal_panelinstallation_report.php
    trunk/rapc/include/dcmmaputil.php
    trunk/rapc/map.php
    trunk/rapc/script/create_rapc_ddl.sql

Modified: trunk/rapc/contract_panel_report.php
===================================================================
--- trunk/rapc/contract_panel_report.php	2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/contract_panel_report.php	2007-03-18 13:28:05 UTC (rev 59)
@@ -88,7 +88,7 @@
 Main, count(CASE routetype WHEN 2 THEN 1 END) as Secondary,
 count(CASE routetype WHEN 3 THEN 1 END) as Village,companyname,registerno,
 paneldimension.description as dimension,
-facecount,count(*) as totalpanels,sum(totalfees) as fees,
+facecount,count(*) as totalpanels,sum(totalfees) as totalfees,
 sum(contractunitprice) as pedding, ((sum(totalfees)+ sum(contractunitprice))) as total
 
 from panel left outer join paneldimension on (paneldimension.codedvalue=panel.paneldimension) ".$strWhere."

Modified: trunk/rapc/illegal_panelinstallation_report.php
===================================================================
--- trunk/rapc/illegal_panelinstallation_report.php	2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/illegal_panelinstallation_report.php	2007-03-18 13:28:05 UTC (rev 59)
@@ -109,10 +109,10 @@
 routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
 insurancereceiptdate,boolrow";
 */
-$strQuery="select id,companyname,panelsubject,routetype,routename,boolrow,dimension, 
-sum(totalfees),facecount,count(*),usefees,verificationreceiptno,
+$strQuery="select id,x,y,companyname,panelsubject,routetype,routename,boolrow,dimension, 
+facecount,count(*), usefees,sum(totalfees),verificationreceiptno,
   verificationreceiptdate from panelinformation ".$strWhere." group by companyname,routename,panelsubject, 
-routetype,dimension,facecount,insurance,usefees,verificationreceiptno,verificationreceiptdate,boolrow,id";
+routetype,dimension,facecount,insurance,usefees,verificationreceiptno,verificationreceiptdate,boolrow,id,x,y";
 //print_r($strQuery);
 
  $objTable = new DbTable($DccssPage->postgis->db, $strQuery);
@@ -125,6 +125,9 @@
       $_POST['district'].'</B>');
 $DccssPage->add($objTable->toHtml());
 
-
+$DccssPage->add('<br><table width=100%><tr><td>'._('Responsible Engineer').'</td><td>
+</td><td>'.
+_('Public Works Office for:')._($_POST['district']).'</td></tr><tr><td>'._('Date:').
+'</td><td></td><td>'._('Date:').'</td></tr></table>');
 echo $DccssPage->toHTML();
 ?>
\ No newline at end of file

Modified: trunk/rapc/include/dcmmaputil.php
===================================================================
--- trunk/rapc/include/dcmmaputil.php	2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/include/dcmmaputil.php	2007-03-18 13:28:05 UTC (rev 59)
@@ -361,16 +361,7 @@
 	    "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
 	    "&PointID=".$this->intSelectedID."&action=movePoint".
             "&id=".$this->intSelectedID."\">".
-	    _("Move")."</a> ][ ".
-	    "<a href=\"map.php?PHPSESSID=".session_id().
-	    "&gravitymain=Y&pressurizedmain=Y&ViewRegion=Quick+".
-	    "View&minx=".$_REQUEST["minx"]."&miny=".$_REQUEST["miny"]."&maxx=".
-	    $_REQUEST["maxx"]."&maxy=".$_REQUEST["maxy"]."&imagewidth=400&".
-	    "imageheight=300&CMD=MOVE_Point".
-	    "&KEYMAPXSIZE=120&KEYMAPYSIZE=66&MapSize=400%2C300&PREVIOUS_MODE=1".
-	    "&PointID=".$this->intSelectedID."&action=deletePoint".
-            "&id=".$this->intSelectedID."\">".
-	    _("Delete")."</a> ]";
+	    _("Move")."</a> ]";
 	}
 	
       } else {

Modified: trunk/rapc/map.php
===================================================================
--- trunk/rapc/map.php	2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/map.php	2007-03-18 13:28:05 UTC (rev 59)
@@ -181,8 +181,8 @@
 	$objLayer->open();
 	$Shape=$objLayer->getShape(0,$Risultato);
 	//$newbuffered = $Shape->buffer(20);
-       print_r ($Shape->values);
-       print_r('Maher');
+     //  print_r ($Shape->values);
+       //print_r('Maher');
        
 
 
@@ -198,7 +198,7 @@
 $buffered_shape = $Shape->buffer(200);
 $layer = $gpoMap->getLayerByName('buffer');
 $layer->set("status", MS_ON);
-print_r($buffered_shape);
+//print_r($buffered_shape);
 //$layer->addFeature($buffered_shape);
     
       
@@ -242,7 +242,7 @@
 	   $strMessages = $strMessages._("Deleted Point."." "."PointID:".$_REQUEST['id']);
  break;
   case "acceptedPointMove" :
-  print_r('Accepted');
+  //print_r('Accepted');
     /**
      * \todo Update GeoCode in DeliveryPoint and related Subscriber objects.
      */
@@ -252,20 +252,7 @@
       /**
        * Log the old DeliveryPoint coordinates in the History table.
        */
-      foreach(array('X', 'Y') as $strAxis) {
-        $strLogInsert = 'insert into History (RecordOID, TableName, Date,
-          DccssUserOID, Attribute, PreviousValue) values('.$PointID.
-	  ', \'panel\', now(), \''.$_SESSION['UserName'].'\', \''.$strAxis.
-	  '\',(select '.$strAxis.'(the_geom) from panel where id='.
-	  $PointID.'))';
-
-
-	/**
-         * \todo Check the query result.
-	 */
-        pg_query($strLogInsert);
-      }
-
+      
       //start checking of deliverypoint values
       $objPoint = DB_DataObject::factory('public.panel');
 	  if(PEAR::isError($objPoint)or(NULL == $objPoint)) {

Modified: trunk/rapc/script/create_rapc_ddl.sql
===================================================================
--- trunk/rapc/script/create_rapc_ddl.sql	2007-03-18 09:27:53 UTC (rev 58)
+++ trunk/rapc/script/create_rapc_ddl.sql	2007-03-18 13:28:05 UTC (rev 59)
@@ -183,6 +183,7 @@
 -- History table
 
 create table History (
+roecordoid integer,
   companyname integer,
   routename varchar(10),
   x float,


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.