[Dccss-commit] SF.net SVN: dccss:[371] branches/ms4w/apps/dccss

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

Revision: 371
          http://dccss.svn.sourceforge.net/dccss/?rev=371&view=rev
Author:   maher_karim
Date:     2009-02-11 16:16:31 +0000 (Wed, 11 Feb 2009)

Log Message:
-----------
2009-02-11  Maher Abdel karim <mah...@do...>

	* print_ac.php: Handle deliverypoints with many subscribers
	* include/dataobject/public_subscriber.php: Add the id to be
	passed with the table actions.
	* etc/fonts.txt: add more fonts to be used
	* etc/symbols.sym: add new symbol to be used.
	

Modified Paths:
--------------
    branches/ms4w/apps/dccss/changelog
    branches/ms4w/apps/dccss/etc/fonts.txt
    branches/ms4w/apps/dccss/etc/symbols.sym
    branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php
    branches/ms4w/apps/dccss/print_ac.php

Modified: branches/ms4w/apps/dccss/changelog
===================================================================
--- branches/ms4w/apps/dccss/changelog	2009-01-28 08:12:25 UTC (rev 370)
+++ branches/ms4w/apps/dccss/changelog	2009-02-11 16:16:31 UTC (rev 371)
@@ -1,3 +1,11 @@
+2009-02-11  Maher Abdel karim <mah...@do...>
+
+	* print_ac.php: Handle deliverypoints with many subscribers
+	* include/dataobject/public_subscriber.php: Add the id to be
+	passed with the table actions.
+	* etc/fonts.txt: add more fonts to be used
+	* etc/symbols.sym: add new symbol to be used.
+	
 2009-01-19  Maher Abdel karim <mah...@do...>
 
 	* query.php: add the possiblity to search with like option

Modified: branches/ms4w/apps/dccss/etc/fonts.txt
===================================================================
--- branches/ms4w/apps/dccss/etc/fonts.txt	2009-01-28 08:12:25 UTC (rev 370)
+++ branches/ms4w/apps/dccss/etc/fonts.txt	2009-02-11 16:16:31 UTC (rev 371)
@@ -2,3 +2,4 @@
 esri_0  c:/windows/fonts/esri_0.ttf
 marvosym c:/windows/fonts/marvosym.ttf
 civil c:/windows/fonts/civil.ttf
+esri_1 c:/windows/fonts/esri_1.ttf

Modified: branches/ms4w/apps/dccss/etc/symbols.sym
===================================================================
--- branches/ms4w/apps/dccss/etc/symbols.sym	2009-01-28 08:12:25 UTC (rev 370)
+++ branches/ms4w/apps/dccss/etc/symbols.sym	2009-02-11 16:16:31 UTC (rev 371)
@@ -42,4 +42,11 @@
   TYPE HATCH
 END   
 
-
+SYMBOL
+  NAME "flag"
+  TYPE TRUETYPE
+  FONT esri_1
+  FILLED true
+  ANTIALIAS true
+  CHARACTER "c"
+END

Modified: branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php
===================================================================
--- branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php	2009-01-28 08:12:25 UTC (rev 370)
+++ branches/ms4w/apps/dccss/include/dataobject/Public_subscriber.php	2009-02-11 16:16:31 UTC (rev 371)
@@ -223,7 +223,7 @@
 	      '&action=map&geocode='.  $this->geocode.'">'.
 	      _('[View on Map]').'</a>';
 	      $ref=$ref.'<a href="print_ac.php?PHPSESSID='.session_id().
-	      '&action=map&geocode='.  $this->geocode.'">'.
+	      '&action=map&id='.$this->id.'&geocode='.  $this->geocode.'">'.
 	      _('[Print]').'</a>';
 	      $showadd=false;
 	    }

Modified: branches/ms4w/apps/dccss/print_ac.php
===================================================================
--- branches/ms4w/apps/dccss/print_ac.php	2009-01-28 08:12:25 UTC (rev 370)
+++ branches/ms4w/apps/dccss/print_ac.php	2009-02-11 16:16:31 UTC (rev 371)
@@ -83,7 +83,7 @@
 	  (css_to_billing.customerlocation=deliverypoint.sequence) left outer 
 	  join metercabinet 
 	  on (css_to_billing.meterlocation=metercabinet.id) 
-	  where deliverypoint.geocode=".$_REQUEST['geocode'];
+	  where deliverypoint.geocode=".$_REQUEST['geocode']." and css_to_billing.id=".$_REQUEST['id'];
     //echo ($query);
     $result = pg_query($query);
     $numfields = pg_numfields($result);


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