dccss-commit — DCCSS commit messages

[Dccss-commit] dccss changelog,1.184,1.185

[Steffen M. <sdt...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13214

Modified Files:
	changelog 
Log Message:
formatting

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.184
retrieving revision 1.185
diff -C2 -d -r1.184 -r1.185
*** changelog	29 Jan 2006 06:41:33 -0000	1.184
--- changelog	29 Jan 2006 07:14:05 -0000	1.185
***************
*** 1,6 ****
  2006-01-28  Maher Abdel karim <mah...@do...>
  
!     * script/create_views.sql:
!     * status_report.php: adjust the meter cabinet subscriber view.
      
  2006-01-28  Steffen Macke <Ste...@do...>
--- 1,10 ----
+ 2006-01-29  Steffen Macke <Ste...@do...>
+ 
+ 	* changelog: formatting
+ 
  2006-01-28  Maher Abdel karim <mah...@do...>
  
! 	* script/create_views.sql:
! 	* status_report.php: adjust the meter cabinet subscriber view.
      
  2006-01-28  Steffen Macke <Ste...@do...>
***************
*** 220,224 ****
  	* reports.php: add link for the meter query report.
  	
- 
  2005-11-15  Steffen Macke <Ste...@do...>
  
--- 224,227 ----

[Dccss-commit] dccss/script create_views.sql,1.7,1.8

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4944/script

Modified Files:
	create_views.sql 
Log Message:
2006-01-28  Maher Abdel karim <mah...@do...>

    * script/create_views.sql:
    * status_report.php: adjust the meter cabinet subscriber view.

Index: create_views.sql
===================================================================
RCS file: /cvsroot/dccss/dccss/script/create_views.sql,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** create_views.sql	25 Jan 2006 10:02:37 -0000	1.7
--- create_views.sql	29 Jan 2006 06:41:34 -0000	1.8
***************
*** 307,314 ****
  insert into geometry_columns values ('', 'public', 'subscriber_notlinked', 
    'the_geom', 2, -1, 'POINT');
  
-  
  -- user access rights
  grant all on LandmarkView to public;
  grant all on TermView to public;
  grant all on RequiredTranslationView to public;
--- 307,330 ----
  insert into geometry_columns values ('', 'public', 'subscriber_notlinked', 
    'the_geom', 2, -1, 'POINT');
+ -- Analtical view
+ create or replace view deliverypoint_fromcabinetes as
+ select * from deliverypoint where deliverypoint.cabinetid <> '' and
+ deliverypoint.cabinetid<>'0' and subscriber.geocode=deliverypoint.geocode and
+ subscriber.cabinetid=''
+ Union
+ select * from deliverypoint where (deliverypoint.cabinetid = '' or 
+ deliverypoint.cabinetid='0') and subscriber.geocode=deliverypoint.geocode and 
+ subscriber.cabinetid<>''
+ Union
+ select * from deliverypoint where deliverypoint.cabinetid <> '' and 
+ deliverypoint.cabinetid<>'0' and subscriber.geocode=deliverypoint.geocode and 
+ subscriber.cabinetid<>'';
+ 
+  insert into geometry_columns values ('', 'public', 'deliverypoint_fromcabinetes', 
+   'the_geom', 2, -1, 'POINT');
  
  -- user access rights
  grant all on LandmarkView to public;
+ grant all on deliverypoint_fromcabinetes to public;
  grant all on TermView to public;
  grant all on RequiredTranslationView to public;

[Dccss-commit] dccss changelog,1.183,1.184 status_report.php,1.4,1.5

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4944

Modified Files:
	changelog status_report.php 
Log Message:
2006-01-28  Maher Abdel karim <mah...@do...>

    * script/create_views.sql:
    * status_report.php: adjust the meter cabinet subscriber view.

Index: status_report.php
===================================================================
RCS file: /cvsroot/dccss/dccss/status_report.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** status_report.php	25 Jan 2006 10:02:36 -0000	1.4
--- status_report.php	29 Jan 2006 06:41:33 -0000	1.5
***************
*** 137,141 ****
  
  //Subscribers having there meters in cabinets
! $strQuery[19]="select count(*) from subscribers_fromcabinetes";
  
  //Subscribers not linked to property .No link was done
--- 137,141 ----
  
  //Subscribers having there meters in cabinets
! $strQuery[19]="select sum(count) from subscribers_fromcabinetes";
  
  //Subscribers not linked to property .No link was done

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** changelog	28 Jan 2006 11:54:21 -0000	1.183
--- changelog	29 Jan 2006 06:41:33 -0000	1.184
***************
*** 1,2 ****
--- 1,7 ----
+ 2006-01-28  Maher Abdel karim <mah...@do...>
+ 
+     * script/create_views.sql:
+     * status_report.php: adjust the meter cabinet subscriber view.
+     
  2006-01-28  Steffen Macke <Ste...@do...>
  

[Dccss-commit] dccss changelog,1.182,1.183

[Steffen M. <sdt...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10567

Modified Files:
	changelog 
Log Message:
	* changelog: formatting
	* script/create_css_ddl.sql: Added comment on purgesubscriber() function

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.182
retrieving revision 1.183
diff -C2 -d -r1.182 -r1.183
*** changelog	28 Jan 2006 06:07:12 -0000	1.182
--- changelog	28 Jan 2006 11:54:21 -0000	1.183
***************
*** 1,7 ****
  2006-01-26  Maher Abdel karim <mah...@do...>
  
!     * script/create_css_ddl.sql:Add purgesubscriber().
!     * admin/purge_subscriber.php: user purgesubscriber().
!     * script/create_views.sql:adjust view query.
      
  2006-01-25  Steffen Macke <Ste...@do...>
--- 1,12 ----
+ 2006-01-28  Steffen Macke <Ste...@do...>
+ 
+ 	* changelog: formatting
+ 	* script/create_css_ddl.sql: Added comment on purgesubscriber() function
+ 
  2006-01-26  Maher Abdel karim <mah...@do...>
  
! 	* script/create_css_ddl.sql:Add purgesubscriber().
! 	* admin/purge_subscriber.php: user purgesubscriber().
! 	* script/create_views.sql:adjust view query.
      
  2006-01-25  Steffen Macke <Ste...@do...>

[Dccss-commit] dccss/script create_css_ddl.sql,1.50,1.51

[Steffen M. <sdt...@us...>]

Update of /cvsroot/dccss/dccss/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10567/script

Modified Files:
	create_css_ddl.sql 
Log Message:
	* changelog: formatting
	* script/create_css_ddl.sql: Added comment on purgesubscriber() function

Index: create_css_ddl.sql
===================================================================
RCS file: /cvsroot/dccss/dccss/script/create_css_ddl.sql,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** create_css_ddl.sql	28 Jan 2006 06:07:12 -0000	1.50
--- create_css_ddl.sql	28 Jan 2006 11:54:21 -0000	1.51
***************
*** 500,504 ****
    specified language or the orginal term.';
  
! create or replace function purgeSubscriber(integer) returns 
  varchar as '
  declare
--- 500,504 ----
    specified language or the orginal term.';
  
! create or replace function purgeSubscriber(id integer) returns 
  varchar as '
  declare
***************
*** 506,521 ****
  begin
    i := 0;
!   i := i +count(*) from subscriber_meterstatus where subscriberid = $1;
!   delete from subscriber_meterstatus where subscriberid = $1;
!   i := i + count(*) from subscriber_meterposition where subscriberid = $1;
!   delete from subscriber_meterposition where subscriberid = $1;
!   i := i + count(*) from subscriber_usetype where subscriberid = $1;
!   delete from subscriber_usetype where subscriberid = $1;
!   i := i + count(*) from subscriber where id = $1;
!   delete from subscriber where id = $1;
    return ''deleted ''|| i || '' records'';
  end;'
  language 'plpgsql';
!   
    
  -- Grants and user rights.
--- 506,523 ----
  begin
    i := 0;
!   i := i +count(*) from subscriber_meterstatus where subscriberid = id;
!   delete from subscriber_meterstatus where subscriberid = id;
!   i := i + count(*) from subscriber_meterposition where subscriberid = id;
!   delete from subscriber_meterposition where subscriberid = id;
!   i := i + count(*) from subscriber_usetype where subscriberid = id;
!   delete from subscriber_usetype where subscriberid = id;
!   i := i + count(*) from subscriber where subscriber.id = id;
!   delete from subscriber where subscriber.id = id;
    return ''deleted ''|| i || '' records'';
  end;'
  language 'plpgsql';
! comment on function purgeSubscriber(integer) is
!   'Delete a subscriber and all related records.
!   @param id is the subscriber ID. @returns a text like ''deleted 10 records''';
    
  -- Grants and user rights.

[Dccss-commit] dccss changelog,1.181,1.182

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9631

Modified Files:
	changelog 
Log Message:
2006-01-26  Maher Abdel karim <mah...@do...>

    * script/create_css_ddl.sql:Add purgesubscriber().
    * admin/purge_subscriber.php: user purgesubscriber().
    * script/create_views.sql:adjust view query.

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.181
retrieving revision 1.182
diff -C2 -d -r1.181 -r1.182
*** changelog	25 Jan 2006 11:13:50 -0000	1.181
--- changelog	28 Jan 2006 06:07:12 -0000	1.182
***************
*** 1,2 ****
--- 1,8 ----
+ 2006-01-26  Maher Abdel karim <mah...@do...>
+ 
+     * script/create_css_ddl.sql:Add purgesubscriber().
+     * admin/purge_subscriber.php: user purgesubscriber().
+     * script/create_views.sql:adjust view query.
+     
  2006-01-25  Steffen Macke <Ste...@do...>
  

[Dccss-commit] dccss/script create_css_ddl.sql,1.49,1.50

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9631/script

Modified Files:
	create_css_ddl.sql 
Log Message:
2006-01-26  Maher Abdel karim <mah...@do...>

    * script/create_css_ddl.sql:Add purgesubscriber().
    * admin/purge_subscriber.php: user purgesubscriber().
    * script/create_views.sql:adjust view query.

Index: create_css_ddl.sql
===================================================================
RCS file: /cvsroot/dccss/dccss/script/create_css_ddl.sql,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** create_css_ddl.sql	14 Jan 2006 13:57:38 -0000	1.49
--- create_css_ddl.sql	28 Jan 2006 06:07:12 -0000	1.50
***************
*** 500,503 ****
--- 500,522 ----
    specified language or the orginal term.';
  
+ create or replace function purgeSubscriber(integer) returns 
+ varchar as '
+ declare
+   i integer;
+ begin
+   i := 0;
+   i := i +count(*) from subscriber_meterstatus where subscriberid = $1;
+   delete from subscriber_meterstatus where subscriberid = $1;
+   i := i + count(*) from subscriber_meterposition where subscriberid = $1;
+   delete from subscriber_meterposition where subscriberid = $1;
+   i := i + count(*) from subscriber_usetype where subscriberid = $1;
+   delete from subscriber_usetype where subscriberid = $1;
+   i := i + count(*) from subscriber where id = $1;
+   delete from subscriber where id = $1;
+   return ''deleted ''|| i || '' records'';
+ end;'
+ language 'plpgsql';
+   
+   
  -- Grants and user rights.
  -- TODO: More permissions to be added, still give unsufficient permission.

[Dccss-commit] dccss/admin purge_subscriber.php,1.1,1.2

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9631/admin

Modified Files:
	purge_subscriber.php 
Log Message:
2006-01-26  Maher Abdel karim <mah...@do...>

    * script/create_css_ddl.sql:Add purgesubscriber().
    * admin/purge_subscriber.php: user purgesubscriber().
    * script/create_views.sql:adjust view query.

Index: purge_subscriber.php
===================================================================
RCS file: /cvsroot/dccss/dccss/admin/purge_subscriber.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** purge_subscriber.php	25 Jan 2006 10:02:37 -0000	1.1
--- purge_subscriber.php	28 Jan 2006 06:07:12 -0000	1.2
***************
*** 71,75 ****
    $Queryform->process($Queryform, false);
    //$objSubscriber->orderBy('sequence,subsequence');
!   
    $strQuery='delete from subscriber_meterstatus where subscriberid='.
      $Queryform->exportvalue('searchvalue').';delete from subscriber_meterposition 
--- 71,75 ----
    $Queryform->process($Queryform, false);
    //$objSubscriber->orderBy('sequence,subsequence');
!   /*
    $strQuery='delete from subscriber_meterstatus where subscriberid='.
      $Queryform->exportvalue('searchvalue').';delete from subscriber_meterposition 
***************
*** 77,81 ****
      subscriber_usetype where subscriberid='.$Queryform->exportvalue('searchvalue')
      .';delete from subscriber where id='.$Queryform->exportvalue('searchvalue');
!    
      $result = pg_query($strQuery);
      $ObjTextElmt =& $Queryform->getElement('searchvalue');
--- 77,82 ----
      subscriber_usetype where subscriberid='.$Queryform->exportvalue('searchvalue')
      .';delete from subscriber where id='.$Queryform->exportvalue('searchvalue');
!    */
!    $strQuery='select purgesubscriber('.$Queryform->exportvalue('searchvalue').')';
      $result = pg_query($strQuery);
      $ObjTextElmt =& $Queryform->getElement('searchvalue');

[Dccss-commit] dccss changelog,1.180,1.181

[Steffen M. <sdt...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15524

Modified Files:
	changelog 
Log Message:
formatting; adjusted year

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.180
retrieving revision 1.181
diff -C2 -d -r1.180 -r1.181
*** changelog	25 Jan 2006 10:02:36 -0000	1.180
--- changelog	25 Jan 2006 11:13:50 -0000	1.181
***************
*** 1,20 ****
! 2005-01-25  Maher Abdel karim <mah...@do...>
  
!     * script/create_views.sql:adjust the no bill available views, and subscribers
!     from meter cabinet.
!     * status_report.php: Adjust the no bill query.
  
! 2005-01-19  Maher Abdel karim <mah...@do...>
  
!     * admin/purge_subscriber.php:Add the functionality to remove a subscriber,
!     and all related records.
!     * admin/move_subscriber.php:Add the functionality to move all subscriber, or
!     a specific subscriber from deliverypoint to another.
!     * index.php: Add links to the new pages.
!     * ar/LC_MESSAGES/dccss.po: Add translations
!     * images/remove_temporary_files.png
!     * images/stock_refresh.png: added images to be used.
!     * status_report.php: fix the status report table creation, not to include the
!     subtypes queries.
      
  2006-01-19  Steffen Macke <Ste...@do...>
--- 1,24 ----
! 2006-01-25  Steffen Macke <Ste...@do...>
  
! 	* changelog: formatting
  
! 2006-01-25  Maher Abdel karim <mah...@do...>
  
! 	* script/create_views.sql:adjust the no bill available views, and subscribers
! 	from meter cabinet.
! 	* status_report.php: Adjust the no bill query.
! 
! 2006-01-19  Maher Abdel karim <mah...@do...>
! 
! 	* admin/purge_subscriber.php:Add the functionality to remove a subscriber,
! 	and all related records.
! 	* admin/move_subscriber.php:Add the functionality to move all subscriber, or
! 	a specific subscriber from deliverypoint to another.
! 	* index.php: Add links to the new pages.
! 	* ar/LC_MESSAGES/dccss.po: Add translations
! 	* images/remove_temporary_files.png
! 	* images/stock_refresh.png: added images to be used.
! 	* status_report.php: fix the status report table creation, not to include the
! 	subtypes queries.
      
  2006-01-19  Steffen Macke <Ste...@do...>
***************
*** 1177,1181 ****
  	* include/dccss.links.ini: Adjust subtype lookups.
  	
- 	
  2005-09-07  Steffen Macke <Ste...@do...>
  
--- 1181,1184 ----
***************
*** 1202,1205 ****
  	* include/dataobject/public_subscriber.php: Using this file name to be
  	 on the DCMMS translation getTable() function. More fields to be added to this
- ???????>>>>>>> 1.11
- >>>>>>> 1.12
--- 1205,1206 ----

[Dccss-commit] dccss/script create_views.sql,1.6,1.7

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15314/script

Modified Files:
	create_views.sql 
Log Message:
2005-01-25  Maher Abdel karim <mah...@do...>

    * script/create_views.sql:adjust the no bill available views, and subscribers
    from meter cabinet.
    * status_report.php: Adjust the no bill query.

Index: create_views.sql
===================================================================
RCS file: /cvsroot/dccss/dccss/script/create_views.sql,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** create_views.sql	18 Jan 2006 06:04:59 -0000	1.6
--- create_views.sql	25 Jan 2006 10:02:37 -0000	1.7
***************
*** 72,80 ****
  --No bill available Point 4 in status
  create or replace view subscriber_noyesno as 
!   select count(distinct subscriber.id) from subscriber right outer join 
!   subscriber_meterstatus on (subscriber.id=subscriberid) where (upper(subscription)
!   like '%A%' 
!   or upper(subscription) like '%B%') and serialnumber<>'' 
!   and subscriber_meterstatus.codedvalue<>4 and subscriber.note not like '%مغلق%';
  
  
--- 72,86 ----
  --No bill available Point 4 in status
  create or replace view subscriber_noyesno as 
!  select count(distinct subscriber.id) from subscriber where (upper(subscription)
!  like '%A%' 
! or upper(subscription) like '%B%') and serialnumber<>'' 
! and id not in (select subscriberid from subscriber_meterstatus)
! --Added this case
! union
! select count(distinct subscriber.id) from subscriber right outer 
! join subscriber_meterstatus on (subscriber.id=subscriberid) where
! (upper(subscription) like '%A%' 
! or upper(subscription) like '%B%') and serialnumber<>'' and 
! subscriber_meterstatus.codedvalue<>4 and subscriber.note not like '%مغلق%';
  
  
***************
*** 198,210 ****
    where logbook is null;
  
  --Clean up cases views
  
  --No bill available Point 4 in status
  create or replace view nobillavailable as 
  select * from deliverypoint  where geocode=subscriber.geocode and 
  subscriber.id=subscriber_meterstatus.subscriberid and  
  (upper(subscriber.subscription) like '%A%' or upper(subscriber.subscription) 
  like '%B%') and subscriber.serialnumber<>'' and 
! subscriber_meterstatus.codedvalue<>4 and subscriber.note not like '%مغلق%';
  
  insert into geometry_columns values ('', 'public', 'nobillavailable', 
--- 204,244 ----
    where logbook is null;
  
+ -- Subscribers Their meters in cabinet
+ create or replace view subscribers_fromcabinetes as
+ select * from subscriber where deliverypoint.cabinetid <> '' and
+ deliverypoint.cabinetid<>'0' and subscriber.geocode=deliverypoint.geocode and
+ subscriber.cabinetid=''
+ Union
+ select * from subscriber where (deliverypoint.cabinetid = '' or 
+ deliverypoint.cabinetid='0') and subscriber.geocode=deliverypoint.geocode and 
+ subscriber.cabinetid<>''
+ Union
+ select * from subscriber where deliverypoint.cabinetid <> '' and 
+ deliverypoint.cabinetid<>'0' and subscriber.geocode=deliverypoint.geocode and 
+ subscriber.cabinetid<>'';
+ 
+ 
  --Clean up cases views
  
  --No bill available Point 4 in status
  create or replace view nobillavailable as 
+ --select * from deliverypoint  where geocode=subscriber.geocode and 
+ --subscriber.id=subscriber_meterstatus.subscriberid and  
+ --(upper(subscriber.subscription) like '%A%' or upper(subscriber.subscription) 
+ --like '%B%') and subscriber.serialnumber<>'' and 
+ --subscriber_meterstatus.codedvalue<>4 and subscriber.note not like '%مغلق%';
  select * from deliverypoint  where geocode=subscriber.geocode and 
  subscriber.id=subscriber_meterstatus.subscriberid and  
  (upper(subscriber.subscription) like '%A%' or upper(subscriber.subscription) 
  like '%B%') and subscriber.serialnumber<>'' and 
! subscriber_meterstatus.codedvalue<>4 and subscriber.note not like '%مغلق%'
! Union
! select * from deliverypoint  where geocode=subscriber.geocode and 
! (upper(subscriber.subscription) like '%A%' 
! or upper(subscriber.subscription) like '%B%') and subscriber.serialnumber<>'' 
! and subscriber.id not in (select subscriberid from subscriber_meterstatus);
! 
! 
! 
  
  insert into geometry_columns values ('', 'public', 'nobillavailable', 
***************
*** 260,270 ****
    'the_geom', 2, -1, 'POINT');
  
- grant all on nobillavailable to group dccssuser;
- grant all on disconnectwithbill to group dccssuser;
- grant all on disconnectwithnobbill to group dccssuser;
- grant all on closed to group dccssuser;
- grant all on illegalconnection to group dccssuser;
  
!   --Subscriber in bad location
  create or replace view subscribers_badlocation as
  select * from deliverypoint where geocode=subscriber.geocode and subscriber.meterlocationdeliverypointseq<>0
--- 294,299 ----
    'the_geom', 2, -1, 'POINT');
  
  
! --Subscriber in bad location
  create or replace view subscribers_badlocation as
  select * from deliverypoint where geocode=subscriber.geocode and subscriber.meterlocationdeliverypointseq<>0
***************
*** 306,309 ****
--- 335,345 ----
  grant all on subscribers_badlocation to public;
  grant all on subscriber_notlinked to public;
+ grant all on nobillavailable to group dccssuser;
+ grant all on disconnectwithbill to group dccssuser;
+ grant all on disconnectwithnobbill to group dccssuser;
+ grant all on closed to group dccssuser;
+ grant all on illegalconnection to group dccssuser;
+ grant all on subscribers_fromcabinetes to public;
+ 
  
  -- administrator access rights

[Dccss-commit] dccss/admin purge_subscriber.php,NONE,1.1

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15314/admin

Added Files:
	purge_subscriber.php 
Log Message:
2005-01-25  Maher Abdel karim <mah...@do...>

    * script/create_views.sql:adjust the no bill available views, and subscribers
    from meter cabinet.
    * status_report.php: Adjust the no bill query.

--- NEW FILE: purge_subscriber.php ---
<?php
/* CSS -- DC Comprehensive Subscribers Survey
 *
 * Purge_subscriber.php - Deletes a subscriber and it's related records
 *
 * 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/dccsspage.php');
require_once('../include/dcmmspear.php');
//Required for database connection
require_once('../include/dcmpostgis.php');
// Required for quick form building.
require_once('HTML/QuickForm.php');
require_once('DB/DataObject.php');

$DccssPage = new DccssPage('Purge Subscriber Information','../');

$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'];



$tablename='public.subscriber';
$Queryform = new HTML_QuickForm('printForm');
// Add some elements to the form
$Queryform->addElement('header', null, _('Delete Subscriber Information'));
$Queryform->addElement('text', 'searchvalue', _('Enter Subscriber ID:'),
array('size' => 5, 'maxlength' => 5));
$Queryform->addElement('submit', null, _('Delete Subscriber'));

// Define filters and validation rules
$Queryform->applyFilter('searchvalue', 'trim');
$Queryform->addRule('searchvalue',
  _('Please enter the Subscriber ID.'), 'required', null, 'client');
$Queryform->addRule('searchvalue',
  _('Please enter the Subscriber ID as Numbere.'), numeric,null,'client');
$Queryform->setRequiredNote('<span style="font-size:80%; color:#ff0000;"
  >*</span><span style="font-size:80%;"> '.
  _('denotes required field').'</span>');
$DccssPage->add($Queryform->toHTML());
$strWhere='';
$ObjTextElmt =& $Queryform->getElement('searchvalue');

if($Queryform->validate()) {
  
  
  $Queryform->process($Queryform, false);
  //$objSubscriber->orderBy('sequence,subsequence');
  
  $strQuery='delete from subscriber_meterstatus where subscriberid='.
    $Queryform->exportvalue('searchvalue').';delete from subscriber_meterposition 
    where subscriberid='.$Queryform->exportvalue('searchvalue').';delete from
    subscriber_usetype where subscriberid='.$Queryform->exportvalue('searchvalue')
    .';delete from subscriber where id='.$Queryform->exportvalue('searchvalue');
   
    $result = pg_query($strQuery);
    $ObjTextElmt =& $Queryform->getElement('searchvalue');
    $ObjTextElmt->setValue('');
    $DccssPage->add('<B>'.
	  _("Subscriber information for ID: ").$Queryform->exportvalue('searchvalue').
     ' '. _('Was deleted successfully').'</B>');
   
  
   
}  else {
  $ObjTextElmt->setValue('');
}
 


echo $DccssPage->toHTML();
?>

[Dccss-commit] dccss query.php,NONE,1.1 changelog,1.179,1.180 status_report.php,1.3,1.4

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15314

Modified Files:
	changelog status_report.php 
Added Files:
	query.php 
Log Message:
2005-01-25  Maher Abdel karim <mah...@do...>

    * script/create_views.sql:adjust the no bill available views, and subscribers
    from meter cabinet.
    * status_report.php: Adjust the no bill query.

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.179
retrieving revision 1.180
diff -C2 -d -r1.179 -r1.180
*** changelog	20 Jan 2006 11:22:56 -0000	1.179
--- changelog	25 Jan 2006 10:02:36 -0000	1.180
***************
*** 1,2 ****
--- 1,8 ----
+ 2005-01-25  Maher Abdel karim <mah...@do...>
+ 
+     * script/create_views.sql:adjust the no bill available views, and subscribers
+     from meter cabinet.
+     * status_report.php: Adjust the no bill query.
+ 
  2005-01-19  Maher Abdel karim <mah...@do...>
  

Index: status_report.php
===================================================================
RCS file: /cvsroot/dccss/dccss/status_report.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** status_report.php	20 Jan 2006 11:22:56 -0000	1.3
--- status_report.php	25 Jan 2006 10:02:36 -0000	1.4
***************
*** 63,67 ****
  */
  //No Bill Availabe
! $strQuery[5]='SELECT subscriber_noyesno.count FROM subscriber_noyesno';
  /*
  select count(*) from subscriber where (upper(subscription) like '%A%' 
--- 63,67 ----
  */
  //No Bill Availabe
! $strQuery[5]='SELECT sum(count) FROM subscriber_noyesno';
  /*
  select count(*) from subscriber where (upper(subscription) like '%A%' 
***************
*** 137,143 ****
  
  //Subscribers having there meters in cabinets
! $strQuery[19]="select count(*) from subscriber,deliverypoint where
! (deliverypoint.cabinetid <> 0 or subscriber.cabinetid <> 0) and 
! subscriber.geocode = deliverypoint.geocode";
  
  //Subscribers not linked to property .No link was done
--- 137,141 ----
  
  //Subscribers having there meters in cabinets
! $strQuery[19]="select count(*) from subscribers_fromcabinetes";
  
  //Subscribers not linked to property .No link was done

--- NEW FILE: query.php ---
<?php
/* CSS -- DC Comprehensive Subscribers Survey
 *
 * Query_report.php - print survey forms for a Query
 *
 * 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/dccsspage.php');
require_once('include/dcmmspear.php');
//Required for database connection
require_once('include/dcmpostgis.php');
// Required for quick form building.
require_once('HTML/QuickForm.php');
require_once('DB/DataObject.php');

$DccssPage = new DccssPage('Query Using Subscriber Information');
$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'];



$tablename='public.subscriber';
$arrTable=array('bill'=>_('Bill'),'subscriber'=>_('Subscriber'));
$Queryform = new HTML_QuickForm('printForm');
// Add some elements to the form
$Queryform->addElement('header', null, _('Query Using Subscriber Information'));
$Queryform->addElement('select', 'Table', _('Table:'),$arrTable);
$Queryform->addElement('text', 'searchvalue', _('Enter Search Value:'),
array('size' => 50, 'maxlength' => 128));
$Queryform->addElement('radio', 'query',_('Query Meter Number'),'',1);
$Queryform->addElement('radio', 'query',_('Query Subscriber Number'),'',2);
$Queryform->addElement('radio', 'query',_('Query Subscriber name'),'',3);
$Queryform->addElement('submit', null, _('Search The Database'));

// Define filters and validation rules
$Queryform->applyFilter('searchvalue', 'trim');
$Queryform->addRule('searchvalue',
  _('Please enter the Query number.'), 'required', null, 'client');
$Queryform->setRequiredNote('<span style="font-size:80%; color:#ff0000;"
  >*</span><span style="font-size:80%;"> '.
  _('denotes required field').'</span>');
$DccssPage->add($Queryform->toHTML());
$strWhere='';

if($Queryform->validate()) {
  if($Queryform->exportValue('Table')=='bill'){
    $tablename='public.'.$Queryform->exportValue('Table');
    $strQuery="select logbook,sequence,subsequence,name,subscribernumber,
    meternumber from ".$Queryform->exportValue('Table')." where ";
      if ($Queryform->exportValue('query')==1){
	$strWhere="meternumber=".$Queryform->exportValue('searchvalue'); 
      } elseif ($Queryform->exportValue('query')==2){
	$strWhere="subscribernumber='".$Queryform->exportValue('searchvalue')."'";
      } elseif ($Queryform->exportValue('query')==3){
	$strWhere="name='".$Queryform->exportValue('searchvalue')."'";
      }
  }else{
    $tablename='public.'.$Queryform->exportValue('Table');
    $strQuery="select deliverypoint.sequence,subscriber.logbooknumber,subscriber.name,subscriber.id,
    subscriber.geocode,subscriber.serialnumber,subscriber.subscription
    from deliverypoint,subscriber where
    subscriber.geocode=deliverypoint.geocode";
    if ($Queryform->exportValue('query')==1){
      $strWhere=" and serialnumber='".$Queryform->exportValue('searchvalue')."'"; 
    } elseif ($Queryform->exportValue('query')==2){
      $strWhere=" and subscription='".$Queryform->exportValue('searchvalue')."'";
    } elseif ($Queryform->exportValue('query')==3){
      $strWhere=" and name='".$Queryform->exportValue('searchvalue')."'";
    }
  }
  
  $objTable = DB_DataObject::factory($tablename);
  if(PEAR::isError($objTable)or(NULL == $objTable)) {
    die(_($objTable->getMessage()));
  }
  
  $Queryform->process($Queryform, false);
  //$objSubscriber->orderBy('sequence,subsequence');
  
  if ($Queryform->exportValue('query')!=0){
    $result = pg_query($strQuery.$strWhere);
    $numrows = pg_numrows($result);
    $objTable->Query($strQuery.$strWhere);
 
    if (($numrows > 0)){
    $objSubscriberTable = $objTable->getTable('<a href="'.
    basename(__FILE__).'?PHPSESSID='.session_id().'&geocode=1">'.
    _('Back to delivery point').'</a>','','view');
     $DccssPage->add($objSubscriberTable->tohtml());
    }
  }
}

echo $DccssPage->toHTML();
?>

Re: [Dccss-commit] dccss changelog,1.178,1.179 index.php,1.13,1.14 status_report.php,1.2,1.3

[Maher K. <Mah...@do...>]

Dear Steffen,
I will add the page again.
>>Did you implement a purge_subscriber() function in PL/SQL? This is
useful, especially if you want to purge a selection
No. I am using plain stacked query. I will start work on the function as
the time will help.

Thanks for comment

Regards
Maher



|---------+---------------------------------------->
|         |           Ste...@do...  |
|         |           Sent by:                     |
|         |           dcc...@li...|
|         |           ceforge.net                  |
|         |                                        |
|         |                                        |
|         |           01/22/2006 11:49 AM          |
|---------+---------------------------------------->
  >------------------------------------------------------------------------------------------------------------------------------|
  |                                                                                                                              |
  |        To:      dcc...@li...                                                                           |
  |        cc:                                                                                                                   |
  |        Subject: Re: [Dccss-commit] dccss changelog,1.178,1.179 index.php,1.13,1.14 status_report.php,1.2,1.3                 |
  >------------------------------------------------------------------------------------------------------------------------------|




Hi Maher,

admin/purge_subscriber.php seems to be missing from the commit.

Did you implement a purge_subscriber() function in PL/SQL? This is useful,
especially if you want to purge a selection
of subscribers based on a query.

Regards,

Steffen

Re: [Dccss-commit] dccss changelog,1.178,1.179 index.php,1.13,1.14 status_report.php,1.2,1.3

[<Ste...@do...>]

Hi Maher,

admin/purge_subscriber.php seems to be missing from the commit.

Did you implement a purge_subscriber() function in PL/SQL? This is useful, 
especially if you want to purge a selection
of subscribers based on a query.

Regards,

Steffen

[Dccss-commit] dccss/locale/ar/LC_MESSAGES dccss.po,1.27,1.28

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/locale/ar/LC_MESSAGES
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26458/locale/ar/LC_MESSAGES

Modified Files:
	dccss.po 
Log Message:
2005-01-19  Maher Abdel karim <mah...@do...>

    * admin/purge_subscriber.php:Add the functionality to remove a subscriber,
    and all related records.
    * admin/move_subscriber.php:Add the functionality to move all subscriber, or
    a specific subscriber from deliverypoint to another.
    * index.php: Add links to the new pages.
    * ar/LC_MESSAGES/dccss.po: Add translations
    * images/remove_temporary_files.png
    * images/stock_refresh.png: added images to be used.
    * status_report.php: fix the status report table creation, not to include the
    subtypes queries.

Index: dccss.po
===================================================================
RCS file: /cvsroot/dccss/dccss/locale/ar/LC_MESSAGES/dccss.po,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** dccss.po	13 Dec 2005 15:36:56 -0000	1.27
--- dccss.po	20 Jan 2006 11:22:57 -0000	1.28
***************
*** 3,7 ****
  "Project-Id-Version: DCCSS\n"
  "POT-Creation-Date: \n"
! "PO-Revision-Date: 2005-12-13 16:33+0200\n"
  "Last-Translator: Maher Abdel Karim <mah...@do...>\n"
  "Language-Team: Dorsch <mah...@do...>\n"
--- 3,7 ----
  "Project-Id-Version: DCCSS\n"
  "POT-Creation-Date: \n"
! "PO-Revision-Date: 2005-12-27 07:57+0200\n"
  "Last-Translator: Maher Abdel Karim <mah...@do...>\n"
  "Language-Team: Dorsch <mah...@do...>\n"
***************
*** 49,52 ****
--- 49,110 ----
  msgstr "المحررون"
  
+ # c:\program
+ #: Files\dccss\dccss/dataentry_performance_report.php:34
+ #: Files\dccss\dccss/dataentry_performance_report.php:35
+ #: Files\dccss\dccss/dataentry_report.php:34
+ #: Files\dccss\dccss/dataentry_report.php:35
+ #, fuzzy
+ msgid "Data Entry Performance Report"
+ msgstr "تقرير اداء المساحين"
+ 
+ # C:\Program
+ #: Files\dccss\dccss/dataentry_performance_report.php:36
+ #: Files\dccss\dccss/dataentry_report.php:36
+ #: Files\dccss\dccss/surveyor_report.php:35
+ msgid "Select From Date"
+ msgstr "اختر بداية الفتره"
+ 
+ # e:\program
+ #: Files\dccss\dccss/dataentry_performance_report.php:37
+ #: Files\dccss\dccss/dataentry_report.php:37
+ #: Files\dccss\dccss/surveyor_report.php:36
+ msgid "Select To Date"
+ msgstr "اختر تاريخ نهاية الفتره"
+ 
+ # c:\program
+ #: Files\dccss\dccss/dataentry_performance_report.php:51
+ #: Files\dccss\dccss/dataentry_report.php:51
+ #, fuzzy
+ msgid "Data Entry performance report for the period from"
+ msgstr "تقرير اداء المساحين للفترة من"
+ 
+ # C:\Program
+ #: Files\dccss\dccss/dataentry_performance_report.php:52
+ #: Files\dccss\dccss/dataentry_report.php:52
+ #: Files\dccss\dccss/surveyor_report.php:51
+ msgid "\t\t"
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/dataentry_performance_report.php:52
+ #: Files\dccss\dccss/dataentry_report.php:52
+ #: Files\dccss\dccss/surveyor_report.php:51
+ msgid "To"
+ msgstr ""
+ 
+ # e:\program
+ #: Files\dccss\dccss/dataentry_performance_report.php:137
+ #: Files\dccss\dccss/dataentry_report.php:137
+ #, fuzzy
+ msgid "Entered delivery Point"
+ msgstr "النقاط الممسوحة"
+ 
+ # e:\program
+ #: Files\dccss\dccss/dataentry_performance_report.php:138
+ #: Files\dccss\dccss/dataentry_report.php:138
+ #, fuzzy
+ msgid "Entred Subscribers"
+ msgstr "المشتركين الممسوحين"
+ 
  # e:\program
  #: Files\dccss\dccss/deliverypointpage.php:37
***************
*** 58,62 ****
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:98
  msgid "FATAL ERROR: No id provided in request."
  msgstr "خطأ نظام: لا يوجد  رقم وصول في الطلب"
--- 116,120 ----
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:116
  msgid "FATAL ERROR: No id provided in request."
  msgstr "خطأ نظام: لا يوجد  رقم وصول في الطلب"
***************
*** 64,80 ****
  # D:\dccss\dccss/deliverypointpage.php:107
  # D:\dccss\dccss/deliverypointpage.php:138
! #: Files\dccss\dccss/deliverypointpage.php:119
! #: Files\dccss\dccss/deliverypointpage.php:128
! #: Files\dccss\dccss/deliverypointpage.php:174
  msgid "View on Map"
  msgstr "اظهار على الخريطة"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:125
  msgid "Delivery Point #"
  msgstr "رمز العنوان# :"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:144
  msgid ""
  "FATAL ERROR: No Record found for the provided Deliverypoint in the\n"
--- 122,138 ----
  # D:\dccss\dccss/deliverypointpage.php:107
  # D:\dccss\dccss/deliverypointpage.php:138
! #: Files\dccss\dccss/deliverypointpage.php:137
! #: Files\dccss\dccss/deliverypointpage.php:146
! #: Files\dccss\dccss/deliverypointpage.php:196
  msgid "View on Map"
  msgstr "اظهار على الخريطة"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:143
  msgid "Delivery Point #"
  msgstr "رمز العنوان# :"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:162
  msgid ""
  "FATAL ERROR: No Record found for the provided Deliverypoint in the\n"
***************
*** 83,88 ****
  
  # c:\program
! #: Files\dccss\dccss/deliverypointpage.php:151
! #: Files\dccss\dccss/subscriberpage.php:190
  #: Files\dccss\dccss/include/dataobject/Public_deliverypoint.php:165
  #: Files\dccss\dccss/include/dataobject/Public_subscriber.php:112
--- 141,146 ----
  
  # c:\program
! #: Files\dccss\dccss/deliverypointpage.php:169
! #: Files\dccss\dccss/subscriberpage.php:223
  #: Files\dccss\dccss/include/dataobject/Public_deliverypoint.php:165
  #: Files\dccss\dccss/include/dataobject/Public_subscriber.php:112
***************
*** 91,113 ****
  
  # c:\program
! #: Files\dccss\dccss/deliverypointpage.php:163
! #: Files\dccss\dccss/subscriberpage.php:106
  msgid "Failed to save record(s)."
  msgstr "لم تتم عملية حفظ السجل/السجلات بنجاح"
  
  # c:\program
! #: Files\dccss\dccss/deliverypointpage.php:168
  msgid "Record(s) successfully saved."
  msgstr "تمت عملية حفظ السجل/السجلات بنجاح"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:170
  msgid "Add Subscriber"
  msgstr "اضافة مشترك"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:199
  #: Files\dccss\dccss/query.php:109
! #: Files\dccss\dccss/subscriberpage.php:160
  msgid "Back to delivery point"
  msgstr "البحث عن نقطة المدخل باستخدام رقم التعريف"
--- 149,171 ----
  
  # c:\program
! #: Files\dccss\dccss/deliverypointpage.php:181
! #: Files\dccss\dccss/subscriberpage.php:110
  msgid "Failed to save record(s)."
  msgstr "لم تتم عملية حفظ السجل/السجلات بنجاح"
  
  # c:\program
! #: Files\dccss\dccss/deliverypointpage.php:190
  msgid "Record(s) successfully saved."
  msgstr "تمت عملية حفظ السجل/السجلات بنجاح"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:192
  msgid "Add Subscriber"
  msgstr "اضافة مشترك"
  
  # e:\program
! #: Files\dccss\dccss/deliverypointpage.php:222
  #: Files\dccss\dccss/query.php:109
! #: Files\dccss\dccss/subscriberpage.php:185
  msgid "Back to delivery point"
  msgstr "البحث عن نقطة المدخل باستخدام رقم التعريف"
***************
*** 950,954 ****
  #: Files\dccss\dccss/logbook_report_subscriber.php:52
  msgid "Enter logbook Number:"
! msgstr " ادخل رقم العداد:"
  
  # C:\Program
--- 1008,1012 ----
  #: Files\dccss\dccss/logbook_report_subscriber.php:52
  msgid "Enter logbook Number:"
! msgstr " ادخل رقم المجلد:"
  
  # C:\Program
***************
*** 1517,1575 ****
  msgstr "تقرير الحالة ل DCCSS"
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:108
  msgid "Has connection before- illegal connection"
  msgstr "يوجد وصلة قبل العداد-وصلة غير شرعية"
  
  # e:\program
! #: Files\dccss\dccss/status_report.php:109
  msgid "Number of survayed deliverypoints"
  msgstr "عدد النقاط الممسوحة"
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:110
  msgid "Number of subscriber"
  msgstr "عدد المشتركين الممسوحين"
  
  # D:\dccss\dccss/logbook_report.php:75
! #: Files\dccss\dccss/status_report.php:111
  msgid "Number of Unsealed meters"
  msgstr "عدد العدادات غير المختومة"
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:112
  msgid "Subscriber with Full Information"
  msgstr "عدد المشتركين ذوي المعلومات الكاملة"
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:113
  msgid "Subscriber with No Bill Availabe"
  msgstr "عدد المشتركين بدون فاتورة"
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:114
  msgid "Subscriber with Disconnected Water Meter with no bill available"
  msgstr ""
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:115
  msgid "Subscriber with Disconnected Water Meter"
  msgstr ""
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:116
  msgid "Number of Supplyed from neighboor"
  msgstr "عدد المشتركين المتزودين من الجوار"
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:117
  msgid "Number of Surveyed logbook"
  msgstr "عدد المجلدات الممسوحة"
  
  # D:\dccss\dccss/logbook_report.php:75
! #: Files\dccss\dccss/status_report.php:118
  msgid "Number of Is owner"
  msgstr "عدد المشتركين المالكين"
  
  # c:\program
  #: Files\dccss\dccss/subscriberpage.php:42
--- 1575,1677 ----
  msgstr "تقرير الحالة ل DCCSS"
  
+ # c:\program
+ #: Files\dccss\dccss/reports.php:67
+ #: Files\dccss\dccss/reports.php:68
+ #, fuzzy
+ msgid "DCCSS Data Entry Performance Report"
+ msgstr "تقرير اداء المساحين"
+ 
  # C:\Program
! #: Files\dccss\dccss/status_report.php:247
  msgid "Has connection before- illegal connection"
  msgstr "يوجد وصلة قبل العداد-وصلة غير شرعية"
  
  # e:\program
! #: Files\dccss\dccss/status_report.php:248
  msgid "Number of survayed deliverypoints"
  msgstr "عدد النقاط الممسوحة"
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:249
  msgid "Number of subscriber"
  msgstr "عدد المشتركين الممسوحين"
  
  # D:\dccss\dccss/logbook_report.php:75
! #: Files\dccss\dccss/status_report.php:250
  msgid "Number of Unsealed meters"
  msgstr "عدد العدادات غير المختومة"
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:251
  msgid "Subscriber with Full Information"
  msgstr "عدد المشتركين ذوي المعلومات الكاملة"
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:252
  msgid "Subscriber with No Bill Availabe"
  msgstr "عدد المشتركين بدون فاتورة"
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:253
  msgid "Subscriber with Disconnected Water Meter with no bill available"
  msgstr ""
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:254
  msgid "Subscriber with Disconnected Water Meter"
  msgstr ""
  
  # c:\program
! #: Files\dccss\dccss/status_report.php:255
  msgid "Number of Supplyed from neighboor"
  msgstr "عدد المشتركين المتزودين من الجوار"
  
  # C:\Program
! #: Files\dccss\dccss/status_report.php:256
  msgid "Number of Surveyed logbook"
  msgstr "عدد المجلدات الممسوحة"
  
  # D:\dccss\dccss/logbook_report.php:75
! #: Files\dccss\dccss/status_report.php:257
  msgid "Number of Is owner"
  msgstr "عدد المشتركين المالكين"
  
+ # D:\dccss\dccss/logbook_report.php:75
+ #: Files\dccss\dccss/status_report.php:257
+ #, fuzzy
+ msgid "Number of Closed"
+ msgstr "عدد الشقق"
+ 
+ # C:\Program
+ #: Files\dccss\dccss/status_report.php:258
+ msgid "Number of legal connections used instead of meters"
+ msgstr ""
+ 
+ # D:\dccss\dccss/logbook_report.php:75
+ #: Files\dccss\dccss/status_report.php:259
+ #, fuzzy
+ msgid "Number of Subscribers supplied by meter cabinets"
+ msgstr "عدد العدادات غير المختومة"
+ 
+ # C:\Program
+ #: Files\dccss\dccss/status_report.php:260
+ msgid "Number of Subscribers not linked to property"
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/status_report.php:268
+ msgid "ERROR: Database query failed."
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/status_report.php:325
+ msgid "Planned"
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/status_report.php:326
+ msgid "Entered"
+ msgstr ""
+ 
  # c:\program
  #: Files\dccss\dccss/subscriberpage.php:42
***************
*** 1583,1613 ****
  
  # e:\program
! #: Files\dccss\dccss/subscriberpage.php:97
! #: Files\dccss\dccss/subscriberpage.php:120
  msgid "[Back to main Delivery Point page]"
  msgstr "العودة الى معلومات نقطة الوصول."
  
  # e:\program
! #: Files\dccss\dccss/subscriberpage.php:111
  msgid "[Add new subscriber]"
  msgstr "اضافة مشترك جديد"
  
  # c:\program
! #: Files\dccss\dccss/subscriberpage.php:112
  msgid "Record(s) saved successfully."
  msgstr "حفظ السجل/السجلات بنجاح"
  
  # C:\Program
! #: Files\dccss\dccss/subscriberpage.php:157
  msgid "This subscriber number is duplicated"
  msgstr "يوجد تكرار في رقم الاشتراك"
  
  # c:\program
! #: Files\dccss\dccss/subscriberpage.php:189
  msgid "Reset"
  msgstr "تنظيف النموذج"
  
  # c:\program
! #: Files\dccss\dccss/subscriberpage.php:191
  msgid "Check customer information"
  msgstr " فحص معلومات المشتركين"
--- 1685,1715 ----
  
  # e:\program
! #: Files\dccss\dccss/subscriberpage.php:101
! #: Files\dccss\dccss/subscriberpage.php:145
  msgid "[Back to main Delivery Point page]"
  msgstr "العودة الى معلومات نقطة الوصول."
  
  # e:\program
! #: Files\dccss\dccss/subscriberpage.php:115
  msgid "[Add new subscriber]"
  msgstr "اضافة مشترك جديد"
  
  # c:\program
! #: Files\dccss\dccss/subscriberpage.php:116
  msgid "Record(s) saved successfully."
  msgstr "حفظ السجل/السجلات بنجاح"
  
  # C:\Program
! #: Files\dccss\dccss/subscriberpage.php:182
  msgid "This subscriber number is duplicated"
  msgstr "يوجد تكرار في رقم الاشتراك"
  
  # c:\program
! #: Files\dccss\dccss/subscriberpage.php:222
  msgid "Reset"
  msgstr "تنظيف النموذج"
  
  # c:\program
! #: Files\dccss\dccss/subscriberpage.php:224
  msgid "Check customer information"
  msgstr " فحص معلومات المشتركين"
***************
*** 1618,1631 ****
  msgstr "تقرير اداء المساحين"
  
- # C:\Program
- #: Files\dccss\dccss/surveyor_report.php:35
- msgid "Select From Date"
- msgstr "اختر بداية الفتره"
- 
- # e:\program
- #: Files\dccss\dccss/surveyor_report.php:36
- msgid "Select To Date"
- msgstr "اختر تاريخ نهاية الفتره"
- 
  # c:\program
  #: Files\dccss\dccss/surveyor_report.php:50
--- 1720,1723 ----
***************
*** 1633,1646 ****
  msgstr "تقرير اداء المساحين للفترة من"
  
- # C:\Program
- #: Files\dccss\dccss/surveyor_report.php:51
- msgid "\t\t"
- msgstr ""
- 
- # C:\Program
- #: Files\dccss\dccss/surveyor_report.php:51
- msgid "To"
- msgstr ""
- 
  # e:\program
  #: Files\dccss\dccss/surveyor_report.php:137
--- 1725,1728 ----
***************
*** 1838,1841 ****
--- 1920,1943 ----
  msgstr "تحديث الترجمه"
  
+ # C:\Program
+ #: Files\dccss\dccss/conf/dccssconfig.php:116
+ msgid "11"
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/conf/dccssconfig.php:116
+ msgid "12"
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/conf/dccssconfig.php:117
+ msgid "1"
+ msgstr ""
+ 
+ # C:\Program
+ #: Files\dccss\dccss/conf/dccssconfig.php:117
+ msgid "2"
+ msgstr ""
+ 
  # e:\program
  #: Files\dccss\dccss/include/dccsspage.php:178
***************
*** 1968,1972 ****
  
  # e:\program
! #: Files\dccss\dccss/include/dcmmap.php:602
  msgid "Nothing was found at this location."
  msgstr "لم يتم ايجاد شيء في هذا الموقع"
--- 2070,2074 ----
  
  # e:\program
! #: Files\dccss\dccss/include/dcmmap.php:607
  msgid "Nothing was found at this location."
  msgstr "لم يتم ايجاد شيء في هذا الموقع"

[Dccss-commit] dccss changelog,1.178,1.179 index.php,1.13,1.14 status_report.php,1.2,1.3

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26458

Modified Files:
	changelog index.php status_report.php 
Log Message:
2005-01-19  Maher Abdel karim <mah...@do...>

    * admin/purge_subscriber.php:Add the functionality to remove a subscriber,
    and all related records.
    * admin/move_subscriber.php:Add the functionality to move all subscriber, or
    a specific subscriber from deliverypoint to another.
    * index.php: Add links to the new pages.
    * ar/LC_MESSAGES/dccss.po: Add translations
    * images/remove_temporary_files.png
    * images/stock_refresh.png: added images to be used.
    * status_report.php: fix the status report table creation, not to include the
    subtypes queries.

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.178
retrieving revision 1.179
diff -C2 -d -r1.178 -r1.179
*** changelog	19 Jan 2006 08:00:55 -0000	1.178
--- changelog	20 Jan 2006 11:22:56 -0000	1.179
***************
*** 1,2 ****
--- 1,15 ----
+ 2005-01-19  Maher Abdel karim <mah...@do...>
+ 
+     * admin/purge_subscriber.php:Add the functionality to remove a subscriber,
+     and all related records.
+     * admin/move_subscriber.php:Add the functionality to move all subscriber, or
+     a specific subscriber from deliverypoint to another.
+     * index.php: Add links to the new pages.
+     * ar/LC_MESSAGES/dccss.po: Add translations
+     * images/remove_temporary_files.png
+     * images/stock_refresh.png: added images to be used.
+     * status_report.php: fix the status report table creation, not to include the
+     subtypes queries.
+     
  2006-01-19  Steffen Macke <Ste...@do...>
  

Index: status_report.php
===================================================================
RCS file: /cvsroot/dccss/dccss/status_report.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** status_report.php	14 Jan 2006 13:57:38 -0000	1.2
--- status_report.php	20 Jan 2006 11:22:56 -0000	1.3
***************
*** 144,147 ****
--- 144,182 ----
  $strQuery[20]="select count(*) from subscriber where note like '%لم يتم%'";
  
+ $arrTitles = array(_('Total Number of delivery point surveyed'),
+ 	_('Number of logbooks that have records Entered'), 
+ 	_('Total Number of records'),
+     _('Total Number of subscribers'),
+     _('Subscriber with Full Information'),
+     _('Subscriber with No Bill Availabe'),
+     _('Disconnected with no bill'),
+     _('Disconnected with bill'),
+     _('Closed'),
+     _('No Subscription /Supply from neighbors'),
+     _('No. of meters entered to the database'),
+     _('No. of Legal connection instead of W. meter'),
+     _('No. of mismatching water meter serial no.'),
+     _('No. of not working meters and/or damaged'),
+     _('Number of Unsealed meters'),
+     _('No. of meters in bad location'),
+     _('No. of illegal connections'),
+     _('No. of Miss placed Customers'),
+     _('Number of Is owner'),
+     _('Number of Subscribers supplied by meter cabinets'),
+     _('Number of Subscribers not linked to property'));
+   for($intI = 0; $intI <count($strQuery); $intI++) {
+     $objTable->setCellContents($intI, 0, $arrTitles[$intI], 'TD');
+     $objResult=pg_query($strQuery[$intI]);  
+      $arrRow = pg_fetch_row($objResult);
+      $row = $arrRow[0];
+     if(DB::isError($objResult)) {
+       echo($strQuery[$intI]);
+       die(_('ERROR: Database query failed.'));
+     }
+     $intColumn = 1;
+     $objTable->setCellContents($intI, $intColumn, $row,'TH');
+       $intColumn++;
+       
+   } 
  //Meter Position
  $strQuery[21]="select meterposition.description,count(*) from subscriber where
***************
*** 199,237 ****
  
  
! $arrTitles = array(_('Total Number of delivery point surveyed'),
! 	_('Number of logbooks that have records Entered'), 
! 	_('Total Number of records'),
!     _('Total Number of subscribers'),
!     _('Subscriber with Full Information'),
!     _('Subscriber with No Bill Availabe'),
!     _('Disconnected with no bill'),
!     _('Disconnected with bill'),
!     _('Closed'),
!     _('No Subscription /Supply from neighbors'),
!     _('No. of meters entered to the database'),
!     _('No. of Legal connection instead of W. meter'),
!     _('No. of mismatching water meter serial no.'),
!     _('No. of not working meters and/or damaged'),
!     _('Number of Unsealed meters'),
!     _('No. of meters in bad location'),
!     _('No. of illegal connections'),
!     _('No. of Miss placed Customers'),
!     _('Number of Is owner'),
!     _('Number of Subscribers supplied by meter cabinets'),
!     _('Number of Subscribers not linked to property'));
!   for($intI = 0; $intI <count($strQuery); $intI++) {
!     $objTable->setCellContents($intI, 0, $arrTitles[$intI], 'TD');
!     $objResult=pg_query($strQuery[$intI]);  
!      $arrRow = pg_fetch_row($objResult);
!      $row = $arrRow[0];
!     if(DB::isError($objResult)) {
!       echo($strQuery[$intI]);
!       die(_('ERROR: Database query failed.'));
!     }
!     $intColumn = 1;
!     $objTable->setCellContents($intI, $intColumn, $row,'TH');
!       $intColumn++;
!       
!   } 
  $DccssPage->add($objTable->toHtml()); 
   //Performance Line Chart.
--- 234,238 ----
  
  
! 
  $DccssPage->add($objTable->toHtml()); 
   //Performance Line Chart.

Index: index.php
===================================================================
RCS file: /cvsroot/dccss/dccss/index.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** index.php	13 Dec 2005 15:36:56 -0000	1.13
--- index.php	20 Jan 2006 11:22:56 -0000	1.14
***************
*** 101,104 ****
--- 101,116 ----
  </ul>
  </div> 
+ <div id="contentright">
+ <ul>
+     <li><?php echoOnMouseOverLink("admin/purge_subscriber.php",
+          _("Purge Subscriber"), 
+ 	_("Deletes a subscriber and the realted records from the DCCSS database."), 
+ 	"remove_temporary_files.png"); ?></li> 
+     <li><?php echoOnMouseOverLink("admin/move_subscriber.php",
+          _("Move Subscriber"), 
+ 	_("Move subscriber(s) from Delivery point to another."), 
+ 	"stock_refresh.png"); ?></li> 
+ </ul>
+ </div>
  <br clear="all" /> <?php 
    } ?>

[Dccss-commit] dccss/images remove_temporary_files.png,NONE,1.1 zoom_to_landmark.png,NONE,1.1

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/images
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26458/images

Added Files:
	remove_temporary_files.png zoom_to_landmark.png 
Log Message:
2005-01-19  Maher Abdel karim <mah...@do...>

    * admin/purge_subscriber.php:Add the functionality to remove a subscriber,
    and all related records.
    * admin/move_subscriber.php:Add the functionality to move all subscriber, or
    a specific subscriber from deliverypoint to another.
    * index.php: Add links to the new pages.
    * ar/LC_MESSAGES/dccss.po: Add translations
    * images/remove_temporary_files.png
    * images/stock_refresh.png: added images to be used.
    * status_report.php: fix the status report table creation, not to include the
    subtypes queries.

--- NEW FILE: remove_temporary_files.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: zoom_to_landmark.png ---
(This appears to be a binary file; contents omitted.)

[Dccss-commit] dccss changelog,1.177,1.178

[Steffen M. <sdt...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24132

Modified Files:
	changelog 
Log Message:
	* doc/development/data_model.vsd: Some classes were marked
	by mistake as abstract. Corrected copyright notice

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** changelog	18 Jan 2006 08:06:40 -0000	1.177
--- changelog	19 Jan 2006 08:00:55 -0000	1.178
***************
*** 1,22 ****
! 2005-01-17  Maher Abdel karim <mah...@do...>
  
!     * script/create_views.sql: Add clean up views
!     
! 2005-01-16  M.Sammer Srouji <sam...@do...>
  
!     * doc/development: development folder were added
!     * doc/development/data_model.vsd: DCCSS Data model
  
! 2005-01-15  Maher Abdel karim <mah...@do...>
  
!     * conf/dccss_pewssa_ar.map: Use unique id instead of oid.(PostgreSQL 8.1
  	compatibility)
      
! 2005-01-15  Steffen Macke <Ste...@do...>
  
  	* script/create_views.sql: Removing OID dependency (PostgreSQL 8.1
  	compatibility)
  
! 2005-01-14  Maher Abdel karim <mah...@do...>
  
  	* status_report.php:implement the CSS status reports with graphs.This report
--- 1,27 ----
! 2006-01-19  Steffen Macke <Ste...@do...>
  
! 	* doc/development/data_model.vsd: Some classes were marked
! 	by mistake as abstract. Corrected copyright notice
  
! 2006-01-17  Maher Abdel karim <mah...@do...>
  
! 	* script/create_views.sql: Add clean up views
! 	
! 2006-01-16  M.Sammer Srouji <sam...@do...>
  
! 	* doc/development: development folder were added
! 	* doc/development/data_model.vsd: DCCSS Data model
! 
! 2006-01-15  Maher Abdel karim <mah...@do...>
! 
! 	* conf/dccss_pewssa_ar.map: Use unique id instead of oid.(PostgreSQL 8.1
  	compatibility)
      
! 2006-01-15  Steffen Macke <Ste...@do...>
  
  	* script/create_views.sql: Removing OID dependency (PostgreSQL 8.1
  	compatibility)
  
! 2006-01-14  Maher Abdel karim <mah...@do...>
  
  	* status_report.php:implement the CSS status reports with graphs.This report
***************
*** 26,35 ****
  	sensetive.
      
! 2005-01-12  Maher Abdel karim <mah...@do...>
  
  	* script/create_view.sql:Add CSS status report views.
  	* status_report.php:adjust the status report.
      
! 2005-01-03  Maher Abdel karim <mah...@do...>
  
  	* logbook_report.php:
--- 31,40 ----
  	sensetive.
      
! 2006-01-12  Maher Abdel karim <mah...@do...>
  
  	* script/create_view.sql:Add CSS status report views.
  	* status_report.php:adjust the status report.
      
! 2006-01-03  Maher Abdel karim <mah...@do...>
  
  	* logbook_report.php:
***************
*** 38,42 ****
  	identify.
  	
! 2005-01-03  Maher Abdel karim <mah...@do...>
  	
  	* surveyor_report.php:adjust the query.
--- 43,47 ----
  	identify.
  	
! 2006-01-03  Maher Abdel karim <mah...@do...>
  	
  	* surveyor_report.php:adjust the query.

[Dccss-commit] dccss/doc/development data_model.vsd,1.1,1.2

[Steffen M. <sdt...@us...>]

Update of /cvsroot/dccss/dccss/doc/development
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24132/doc/development

Modified Files:
	data_model.vsd 
Log Message:
	* doc/development/data_model.vsd: Some classes were marked
	by mistake as abstract. Corrected copyright notice

Index: data_model.vsd
===================================================================
RCS file: /cvsroot/dccss/dccss/doc/development/data_model.vsd,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
Binary files /tmp/cvsPpJ8zU and /tmp/cvsZFdRPu differ

[Dccss-commit] dccss changelog,1.176,1.177

[sammer <sa...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22763

Modified Files:
	changelog 
Log Message:
16-01-2006 changes were added

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.176
retrieving revision 1.177
diff -C2 -d -r1.176 -r1.177
*** changelog	18 Jan 2006 06:04:58 -0000	1.176
--- changelog	18 Jan 2006 08:06:40 -0000	1.177
***************
*** 3,6 ****
--- 3,11 ----
      * script/create_views.sql: Add clean up views
      
+ 2005-01-16  M.Sammer Srouji <sam...@do...>
+ 
+     * doc/development: development folder were added
+     * doc/development/data_model.vsd: DCCSS Data model
+ 
  2005-01-15  Maher Abdel karim <mah...@do...>
  

[Dccss-commit] dccss/script create_views.sql,1.5,1.6

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17806/script

Modified Files:
	create_views.sql 
Log Message:
2005-01-17  Maher Abdel karim <mah...@do...>

    * script/create_views.sql: Add clean up views

Index: create_views.sql
===================================================================
RCS file: /cvsroot/dccss/dccss/script/create_views.sql,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** create_views.sql	15 Jan 2006 13:53:13 -0000	1.5
--- create_views.sql	18 Jan 2006 06:04:59 -0000	1.6
***************
*** 188,192 ****
  --Create view for link test
  create or replace view testlink 
! 	as select subscriber.logbooknumber,subscriber.name,
    subscriber.sequence,subscriber.subsequence,subscriber.subscription,
    subscriber.logbookserialnumber,
--- 188,192 ----
  --Create view for link test
  create or replace view testlink 
! 	as select subscriber.geocode,subscriber.logbooknumber,subscriber.name,
    subscriber.sequence,subscriber.subsequence,subscriber.subscription,
    subscriber.logbookserialnumber,
***************
*** 198,203 ****
--- 198,283 ----
    where logbook is null;
  
+ --Clean up cases views
+ 
+ --No bill available Point 4 in status
+ create or replace view nobillavailable as 
+ select * from deliverypoint  where geocode=subscriber.geocode and 
+ subscriber.id=subscriber_meterstatus.subscriberid and  
+ (upper(subscriber.subscription) like '%A%' or upper(subscriber.subscription) 
+ like '%B%') and subscriber.serialnumber<>'' and 
+ subscriber_meterstatus.codedvalue<>4 and subscriber.note not like '%مغلق%';
+ 
+ insert into geometry_columns values ('', 'public', 'nobillavailable', 
+   'the_geom', 2, -1, 'POINT');
+ 
+ --Disconnect with bill point no 6
+ create or replace view disconnectwithbill as 
+ select * from deliverypoint where deliverypoint.geocode=subscriber.geocode and 
+ subscriber.id=subscriber_meterstatus.subscriberid  and not 
+ (upper(subscriber.subscription) like '%A%' 
+ or upper(subscriber.subscription) like '%B%') and subscriber.serialnumber='' 
+ and subscriber.note not like '%مغلق%' union
+ select * from deliverypoint where deliverypoint.geocode=subscriber.geocode and 
+ subscriber.id not in (select subscriberid from subscriber_meterstatus) and 
+ subscriber.note not like '%مغلق%'
+ and  not (upper(subscriber.subscription) like '%A%' 
+ or upper(subscriber.subscription) like '%B%') and subscriber.serialnumber='';
+ 
+ insert into geometry_columns values ('', 'public', 'disconnectwithbill', 
+   'the_geom', 2, -1, 'POINT');
+ 
+   --Disconnect with no bill Point 5 in the status report.
+ create or replace view disconnectwithnobbill as 
+ select * from deliverypoint where geocode=subscriber.geocode and subscriber.id
+ =subscriber_meterstatus .subscriberid and (upper(subscriber.subscription) 
+ like '%A%' or upper(subscriber.subscription) like '%B%') and 
+ subscriber.serialnumber='' and subscriber.note not like '%مغلق%' union
+ select * from deliverypoint where geocode=subscriber.geocode and subscriber.id 
+ not in (select subscriberid from subscriber_meterstatus) and subscriber.note 
+ not like '%مغلق%'
+ and  (upper(subscriber.subscription) like '%A%' 
+ or upper(subscriber.subscription) like '%B%') and subscriber.serialnumber='';
+ 
+ insert into geometry_columns values ('', 'public', 'disconnectwithnobbill', 
+   'the_geom', 2, -1, 'POINT');
  
    
+ --closed point No 7
+ create or replace view closed as
+ select * from deliverypoint where geocode=subscriber.geocode and subscriber.note
+ like '%مغلق%'
+ 
+ insert into geometry_columns values ('', 'public', 'closed', 
+   'the_geom', 2, -1, 'POINT');
+ 
+   --Illegal connection
+ create or replace view illegalconnection as 
+ select * from deliverypoint where geocode=subscriber.geocode and subscriber.hasconnectionbefore<>1 and subscriber.note like '%وصلة غير%'
+ union 
+ select * from deliverypoint where geocode=subscriber.geocode and  subscriber.hasconnectionbefore=1;
+ 
+ insert into geometry_columns values ('', 'public', 'illegalconnection', 
+   'the_geom', 2, -1, 'POINT');
+ 
+ grant all on nobillavailable to group dccssuser;
+ grant all on disconnectwithbill to group dccssuser;
+ grant all on disconnectwithnobbill to group dccssuser;
+ grant all on closed to group dccssuser;
+ grant all on illegalconnection to group dccssuser;
+ 
+   --Subscriber in bad location
+ create or replace view subscribers_badlocation as
+ select * from deliverypoint where geocode=subscriber.geocode and subscriber.meterlocationdeliverypointseq<>0
+ 
+ insert into geometry_columns values ('', 'public', 'subscribers_badlocation', 
+   'the_geom', 2, -1, 'POINT');
+ 
+ --Create view for subscriber_notlinked
+ create or replace view subscriber_notlinked as 
+ select * from deliverypoint where geocode=testlink.geocode 
+ insert into geometry_columns values ('', 'public', 'subscriber_notlinked', 
+   'the_geom', 2, -1, 'POINT');
+ 
+  
  -- user access rights
  grant all on LandmarkView to public;
***************
*** 219,222 ****
--- 299,309 ----
  grant all on supply_legalconnection to public;
  grant all on testlink to public;
+ grant all on nobillavailable to public;
+ grant all on disconnectwithbill to public;
+ grant all on disconnectwithnobbill to public;
+ grant all on closed to public;
+ grant all on illegalconnection to public;
+ grant all on subscribers_badlocation to public;
+ grant all on subscriber_notlinked to public;
  
  -- administrator access rights

[Dccss-commit] dccss changelog,1.175,1.176

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17806

Modified Files:
	changelog 
Log Message:
2005-01-17  Maher Abdel karim <mah...@do...>

    * script/create_views.sql: Add clean up views

Index: changelog
===================================================================
RCS file: /cvsroot/dccss/dccss/changelog,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** changelog	15 Jan 2006 14:13:36 -0000	1.175
--- changelog	18 Jan 2006 06:04:58 -0000	1.176
***************
*** 1,2 ****
--- 1,6 ----
+ 2005-01-17  Maher Abdel karim <mah...@do...>
+ 
+     * script/create_views.sql: Add clean up views
+     
  2005-01-15  Maher Abdel karim <mah...@do...>
  

[Dccss-commit] dccss/doc/development data_model.vsd,NONE,1.1

[sammer <sa...@us...>]

Update of /cvsroot/dccss/dccss/doc/development
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9476/doc/development

Added Files:
	data_model.vsd 
Log Message:
DCCSS Data model were added

--- NEW FILE: data_model.vsd ---
(This appears to be a binary file; contents omitted.)

[Dccss-commit] dccss/doc/development - New directory

[sammer <sa...@us...>]

Update of /cvsroot/dccss/dccss/doc/development
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5310/development

Log Message:
Directory /cvsroot/dccss/dccss/doc/development added to the repository

[Dccss-commit] dccss/conf dccss_pewssa_ar.map,1.5,1.6

[Maher A. K. <mah...@us...>]

Update of /cvsroot/dccss/dccss/conf
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15426/conf

Modified Files:
	dccss_pewssa_ar.map 
Log Message:
2005-01-15  Maher Abdel karim <mah...@do...>

    * conf/dccss_pewssa_ar.map: Use unique id instead of oid.(PostgreSQL 8.1
	compatibility)

Index: dccss_pewssa_ar.map
===================================================================
RCS file: /cvsroot/dccss/dccss/conf/dccss_pewssa_ar.map,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** dccss_pewssa_ar.map	4 Jan 2006 15:26:56 -0000	1.5
--- dccss_pewssa_ar.map	15 Jan 2006 14:13:36 -0000	1.6
***************
*** 125,129 ****
      CONNECTIONTYPE postgis
      CONNECTION "dbname=dccss user=dummy password=dummy host=localhost"
!     DATA "the_geom from landmarkview using SRID=-1"
      labelitem "str_reverse(shape_arabic(dcmmstranslation('en',name)))"
      HEADER 'header.html'
--- 125,129 ----
      CONNECTIONTYPE postgis
      CONNECTION "dbname=dccss user=dummy password=dummy host=localhost"
!     DATA "the_geom from landmarkview using unique id using SRID=-1"
      labelitem "str_reverse(shape_arabic(dcmmstranslation('en',name)))"
      HEADER 'header.html'