Menu
▾
▴
dccss-commit — DCCSS commit messages
You can subscribe to this list here.
| 2005 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(63) |
Oct
(176) |
Nov
(98) |
Dec
(29) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2006 |
Jan
(37) |
Feb
(12) |
Mar
(9) |
Apr
(20) |
May
(1) |
Jun
(20) |
Jul
(11) |
Aug
|
Sep
|
Oct
(5) |
Nov
(7) |
Dec
(2) |
| 2007 |
Jan
(8) |
Feb
|
Mar
(7) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
| 2009 |
Jan
(5) |
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
|
Dec
(1) |
|
From: <mah...@us...> - 2006-07-28 19:45:20
|
Revision: 326 Author: maher_karim Date: 2006-07-26 22:45:39 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=326&view=rev Log Message: ----------- Ready for 0.6.0 release Added Paths: ----------- tags/DCCSS_0.6.0/ Copied: tags/DCCSS_0.6.0 (from rev 325, trunk/dccss) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-27 06:29:12
|
Revision: 325 Author: maher_karim Date: 2006-07-26 22:33:24 -0700 (Wed, 26 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=325&view=rev Log Message: ----------- 2006-07-27 Maher Abdel karim <mah...@do...> * admin/processing.php: fix form elements labels. * include/i18n.php: * locale/ar/LC_MESSAGES/dccss.po: update translations * dccss.nsi:update version number. * include/header.php: * include/dccsspage.php:Adjust version number. Modified Paths: -------------- trunk/dccss/admin/processing.php trunk/dccss/changelog trunk/dccss/dccss.nsi trunk/dccss/include/dccsspage.php trunk/dccss/include/header.php trunk/dccss/include/i18n.php trunk/dccss/locale/ar/LC_MESSAGES/dccss.po Modified: trunk/dccss/admin/processing.php =================================================================== --- trunk/dccss/admin/processing.php 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/admin/processing.php 2006-07-27 05:33:24 UTC (rev 325) @@ -30,12 +30,12 @@ $DccssPage->add( _("Process data in dccss database.")."<br>"); $DccssPage->add (_("Please Select the processing type from the list.")); -$processArray= array ("dcrmroute" => "Generate route information", -"createlineconnection"=>"Create line connection between meter cabinet and deliverypoints"); +$processArray= array ("dcrmroute" => _("Generate route information"), +"createlineconnection"=>_("Create line connection between meter cabinet and deliverypoints")); $Processingform = new HTML_QuickForm('Processingform'); $Processingform->addElement('header', null, _('Prepare CSS data transfer file for Billing')); -$Processingform->addElement('select','processingtype', 'Select the processing type',$processArray); +$Processingform->addElement('select','processingtype', _('Select the processing type'),$processArray); $Processingform->addElement('text', 'processingvalue',_('Apply processing at'),number); $Processingform->addElement('submit', null, _('Process GIS data')); $Processingform->addRule('processingvalue', Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/changelog 2006-07-27 05:33:24 UTC (rev 325) @@ -1,3 +1,12 @@ +2006-07-27 Maher Abdel karim <mah...@do...> + + * admin/processing.php: fix form elements labels. + * include/i18n.php: + * locale/ar/LC_MESSAGES/dccss.po: update translations + * dccss.nsi:update version number. + * include/header.php: + * include/dccsspage.php:Adjust version number. + 2006-07-25 Maher Abdel karim <mah...@do...> * index.php:Add link to process.php page. Modified: trunk/dccss/dccss.nsi =================================================================== --- trunk/dccss/dccss.nsi 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/dccss.nsi 2006-07-27 05:33:24 UTC (rev 325) @@ -3,6 +3,7 @@ ; dccss.nsi - NSIS Script for version 2.0 ; ; Copyright (c) 2005,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 @@ -31,7 +32,7 @@ !define DataBase $R2 !define DCCSS_PRODUCT "DCCSS" -!define DCCSS_VERSION "0.5.1" +!define DCCSS_VERSION "0.6.0" !define DCCSS_PREVIOUS_VERSION "0.5.0" !define DCCSS_PACKAGE "1" !define PG_VERSION "8.1.2" Modified: trunk/dccss/include/dccsspage.php =================================================================== --- trunk/dccss/include/dccsspage.php 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/include/dccsspage.php 2006-07-27 05:33:24 UTC (rev 325) @@ -4,6 +4,7 @@ * dccsspage.php - General classes for DCCSS pages; replaces header.php * * Copyright (C) 2005,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 @@ -270,7 +271,7 @@ 'images/dccss_icon_16.png" /> <a href="'.$this->strPathInDccss.'index.php?PHPSESSID='.session_id(). '" title="'._('Click this link to go to the DCCSS main page.'). - '">'._('DCCSS').' 0.5.0</a> + '">'._('DCCSS').' 0.6.0</a> </span> <span class="navigationend"> <form name="search" action= Modified: trunk/dccss/include/header.php =================================================================== --- trunk/dccss/include/header.php 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/include/header.php 2006-07-27 05:33:24 UTC (rev 325) @@ -149,7 +149,7 @@ 'images/dccss_icon_16.png" /> <a href="'.$strPathInDccss.'index.php?PHPSESSID='.session_id(). '" title="'._('Click this link to go to the DCCSS main page.'). - '">'._('DCCSS').' 0.5.0</a> + '">'._('DCCSS').' 0.6.0</a> </span> <span class="navigationend"> <form name="search" action= Modified: trunk/dccss/include/i18n.php =================================================================== --- trunk/dccss/include/i18n.php 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/include/i18n.php 2006-07-27 05:33:24 UTC (rev 325) @@ -136,6 +136,8 @@ _("routedandmissplaced"); _("collectionmissplaced"); _("notroutedandzerocons"); +_("Generate route information"); +_("Create line connection between meter cabinet and deliverypoints"); ?> Modified: trunk/dccss/locale/ar/LC_MESSAGES/dccss.po =================================================================== --- trunk/dccss/locale/ar/LC_MESSAGES/dccss.po 2006-07-25 06:09:47 UTC (rev 324) +++ trunk/dccss/locale/ar/LC_MESSAGES/dccss.po 2006-07-27 05:33:24 UTC (rev 325) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: DCCSS\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2006-07-12 10:52+0200\n" +"PO-Revision-Date: 2006-07-26 08:26+0200\n" "Last-Translator: t <t>\n" "Language-Team: Dorsch <mah...@do...>\n" "MIME-Version: 1.0\n" @@ -47,250 +47,6 @@ msgid "Authors" msgstr "المحررون" -# e:\program -#: ../../.././Copy of map.php:168 -#: ../../.././map.php:168 -#: ../../.././back/map.php:124 -#: ../../.././back/map_layerselection.php:168 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:143 -#, php-format -msgid "Moving DeliveryPoint %s." -msgstr "تحريك نقطة الوصول رقم %s" - -# e:\program -#: ../../.././Copy of map.php:196 -#: ../../.././map.php:196 -#: ../../.././back/map.php:152 -#: ../../.././back/map_layerselection.php:196 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 -msgid "Deleted DeliveryPoint." -msgstr "تم تحريك نقطة الوصول" - -# D:\dccss\dccss/map.php:134 -#: ../../.././Copy of map.php:196 -#: ../../.././map.php:196 -#: ../../.././back/map.php:152 -#: ../../.././back/map_layerselection.php:196 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 -msgid " " -msgstr "" - -# e:\program -#: ../../.././Copy of map.php:196 -#: ../../.././map.php:196 -#: ../../.././back/map.php:152 -#: ../../.././back/map_layerselection.php:196 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 -msgid "DeliveryPointID:" -msgstr "نقطة الوصول" - -# c:\program -#: ../../.././Copy of map.php:196 -#: ../../.././map.php:196 -#: ../../.././back/map.php:152 -#: ../../.././back/map_layerselection.php:196 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 -msgid "sequence" -msgstr "رقم التخصيص" - -# c:\program -#: ../../.././Copy of map.php:235 -#: ../../.././map.php:235 -#: ../../.././back/map.php:191 -#: ../../.././back/map_layerselection.php:235 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:210 -msgid "NO geocode value returned" -msgstr "لم يتم ارسال اي رمز جغرافي" - -# e:\program -#: ../../.././Copy of map.php:262 -#: ../../.././map.php:262 -#: ../../.././back/map.php:218 -#: ../../.././back/map_layerselection.php:262 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:237 -msgid "Moved DeliveryPoint." -msgstr "تم تحريك نقطة الوصول" - -# e:\program -#: ../../.././Copy of map.php:408 -#: ../../.././map.php:473 -#: ../../.././back/map.php:521 -#: ../../.././back/map_layerselection.php:409 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:383 -msgid "Legend" -msgstr "مفتاح الخريطة" - -# c:\program -#: ../../.././Copy of map.php:430 -#: ../../.././map.php:495 -#: ../../.././back/map.php:543 -#: ../../.././back/map_layerselection.php:431 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:405 -msgid "Display the Water network" -msgstr "اظهار شبكة المياه" - -# e:\program -#: ../../.././Copy of map.php:431 -#: ../../.././map.php:496 -#: ../../.././back/map.php:544 -#: ../../.././back/map_layerselection.php:432 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:406 -msgid "Water Network" -msgstr "شبكة المياه" - -# e:\program -#: ../../.././Copy of map.php:443 -#: ../../.././map.php:508 -#: ../../.././back/map.php:556 -#: ../../.././back/map_layerselection.php:444 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:418 -msgid "Landmark" -msgstr "معلم" - -# c:\program -#: ../../.././Copy of map.php:451 -#: ../../.././map.php:516 -#: ../../.././back/map.php:564 -#: ../../.././back/map_layerselection.php:452 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:426 -msgid "Refresh the map display" -msgstr "تحديث الخريطة" - -# e:\program -#: ../../.././Copy of map.php:452 -#: ../../.././map.php:517 -#: ../../.././back/map.php:565 -#: ../../.././back/map_layerselection.php:453 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:427 -msgid "Redraw Map" -msgstr "اعادة رسم الخريطة" - -# c:\program -#: ../../.././Copy of map.php:460 -#: ../../.././map.php:525 -#: ../../.././back/map.php:573 -#: ../../.././back/map_layerselection.php:461 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:435 -msgid "Zoom to grid" -msgstr "التكبير الى الشبكة" - -# c:\program -#: ../../.././Copy of map.php:483 -#: ../../.././map.php:548 -#: ../../.././back/map.php:596 -#: ../../.././back/map_layerselection.php:484 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:458 -msgid "Full View" -msgstr "منظر عام" - -# c:\program -#: ../../.././Copy of map.php:508 -#: ../../.././map.php:574 -#: ../../.././back/map.php:621 -#: ../../.././back/map_layerselection.php:509 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:483 -msgid "Select the map size from the list." -msgstr "اختر حجم الخريطة من القائمة" - -# e:\program -#: ../../.././Copy of map.php:509 -#: ../../.././map.php:575 -#: ../../.././back/map.php:622 -#: ../../.././back/map_layerselection.php:510 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:484 -msgid "Map Size" -msgstr "حجم الخريطة" - -# e:\program -#: ../../.././Copy of map.php:551 -#: ../../.././map.php:617 -#: ../../.././back/map.php:659 -#: ../../.././back/map_layerselection.php:552 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:526 -msgid "Keymap" -msgstr "خريطة الدليل" - -# e:\program -#: ../../.././Copy of map.php:555 -#: ../../.././map.php:621 -#: ../../.././back/map.php:663 -#: ../../.././back/map_layerselection.php:556 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:530 -msgid "Click on the key map to view an area." -msgstr "اضغط على خريطة الدليل لاظهار منطقة" - -# e:\program -#: ../../.././Copy of map.php:566 -#: ../../.././map.php:632 -#: ../../.././back/map.php:674 -#: ../../.././back/map_layerselection.php:567 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:541 -msgid "Zoom in further to display more detailed map information." -msgstr "كبر اكثر من اجل اظهار تفاصيل اكثر للخريطة." - -# e:\program -#: ../../.././Copy of map.php:568 -#: ../../.././map.php:634 -#: ../../.././back/map.php:676 -#: ../../.././back/map_layerselection.php:569 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:543 -msgid "Zoom In" -msgstr "تكبير" - -# e:\program -#: ../../.././Copy of map.php:576 -#: ../../.././map.php:642 -#: ../../.././back/map.php:684 -#: ../../.././back/map_layerselection.php:577 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:551 -msgid "Zoom out to display a larger area of the map." -msgstr "صغر من اجل اظهار منطقة اكبر من الخريطة." - -# e:\program -#: ../../.././Copy of map.php:578 -#: ../../.././map.php:644 -#: ../../.././back/map.php:686 -#: ../../.././back/map_layerselection.php:579 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:553 -msgid "Zoom Out" -msgstr "تصغير" - -# e:\program -#: ../../.././Copy of map.php:586 -#: ../../.././map.php:652 -#: ../../.././back/map.php:694 -#: ../../.././back/map_layerselection.php:587 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:561 -msgid "Move the map view without zooming in or out." -msgstr "التحرك في الخريطة بدون تكبير او تصغير." - -# e:\program -#: ../../.././Copy of map.php:588 -#: ../../.././map.php:654 -#: ../../.././back/map.php:696 -#: ../../.././back/map_layerselection.php:589 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:563 -msgid "Pan" -msgstr "تحريك" - -# e:\program -#: ../../.././Copy of map.php:596 -#: ../../.././map.php:662 -#: ../../.././back/map.php:704 -#: ../../.././back/map_layerselection.php:597 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:571 -msgid "Display information about elements in the map." -msgstr "اظهار المعلومات المتعلقة بالعناصر الموجودة في الخريطة." - -# e:\program -#: ../../.././Copy of map.php:598 -#: ../../.././map.php:664 -#: ../../.././back/map.php:706 -#: ../../.././back/map_layerselection.php:599 -#: ../../.././back/map_workingqueryexamplefor ghazi.php:573 -msgid "Identify" -msgstr "اداة التعريف" - #: ../../.././Copy of print_workorder.php:40 #: ../../.././print_workorder.php:40 msgid "Task force workorder" @@ -459,29 +215,29 @@ msgstr "مشتركون ليسو على المسار" #: ../../.././Copy of taskforce_report.php:53 -#: ../../.././taskforce_report.php:58 +#: ../../.././taskforce_report.php:61 #: ../../.././include/i18n.php:116 msgid "Select task force type:" msgstr "اختر نوع مجموعة العمل:" #: ../../.././Copy of taskforce_report.php:55 #: taskforce_report.php:76 -#: ../../.././taskforce_report.php:60 -#: ../../.././taskforce_report.php:81 +#: ../../.././taskforce_report.php:64 +#: ../../.././taskforce_report.php:85 #: ../../.././include/i18n.php:119 msgid "Create Task force list" msgstr "انشاء قائمة مجموعة عمل" #: ../../.././Copy of taskforce_report.php:56 #: taskforce_report.php:92 -#: ../../.././taskforce_report.php:61 -#: ../../.././taskforce_report.php:97 +#: ../../.././taskforce_report.php:65 +#: ../../.././taskforce_report.php:101 #: ../../.././include/i18n.php:118 msgid "Print Task force maps" msgstr "طباعة خرائط مجموعات العمل" #: ../../.././Copy of taskforce_report.php:66 -#: ../../.././taskforce_report.php:71 +#: ../../.././taskforce_report.php:75 msgid "Please select task force type." msgstr "" @@ -489,12 +245,12 @@ #: ../../.././Copy of taskforce_report.php:70 #: ../../.././logbook_report.php:65 #: ../../.././logbook_report_subscriber.php:63 -#: ../../.././map.php:694 #: ../../.././meter_query_report.php:64 #: ../../.././query.php:64 #: ../../.././querybuilder.php:52 -#: ../../.././taskforce_report.php:75 +#: ../../.././taskforce_report.php:79 #: ../../.././admin/move_subscriber.php:76 +#: ../../.././admin/processing.php:48 #: ../../.././admin/purge_subscriber.php:63 #: ../../.././back/map_layerselection.php:629 #: ../../.././include/i18n.php:62 @@ -703,37 +459,54 @@ msgid "Download zipped shapefiles from the DCCSS geodatabase." msgstr "تنزيل الملف المضغوط للبانات من قاعدة المعلومات الجغرافية" +#: ../../.././index.php:81 +msgid "CSS to billing data transfer file preparation" +msgstr "تجهيز ملف نقل معلومات CSS الى الفواتير" + +# c:\program +#: ../../.././index.php:82 +msgid "Download CSV file from CSS database." +msgstr "تنزيل ملف CSV من قاعدة بيانات CSS" + # D:\dccss\dccss/index.php:74 -#: ../../.././index.php:81 +#: ../../.././index.php:85 msgid "Bill Loader" msgstr "تحميل معلومات الفواتير" # c:\program -#: ../../.././index.php:82 +#: ../../.././index.php:86 msgid "Load a PEWSSA bill file to the DCCSS geodatabase." msgstr "تنزيل الملف المضغوط للبانات من قاعدة المعلومات الجغرافية" # e:\program -#: ../../.././index.php:92 +#: ../../.././index.php:97 msgid "Purge Subscriber" msgstr "حذف مشترك" # c:\program -#: ../../.././index.php:93 +#: ../../.././index.php:98 msgid "Deletes a subscriber and the realted records from the DCCSS database." msgstr "حذف مشترك مع جميع معلوماته من قاعدة البيانات" # e:\program -#: ../../.././index.php:96 +#: ../../.././index.php:101 #: ../../.././admin/move_subscriber.php:50 msgid "Move Subscriber" msgstr "نقل مشترك" # C:\Program -#: ../../.././index.php:97 +#: ../../.././index.php:102 msgid "Move subscriber(s) from Delivery point to another." msgstr "نقل المشتركين من نقطة توصيل الى اخرى" +#: ../../.././index.php:105 +msgid "GIS data processing" +msgstr "معالجة البيانات الجغرافية" + +#: ../../.././index.php:106 +msgid "Process GIS data." +msgstr "معالجة البيانات الجغرافية" + # C:\Program #: ../../.././logbook_report.php:51 #: ../../.././logbook_report_subscriber.php:51 @@ -751,6 +524,7 @@ # C:\Program #: ../../.././logbook_report.php:54 #: ../../.././logbook_report_subscriber.php:54 +#: ../../.././taskforce_report.php:63 msgid "Batch:" msgstr "المجموعة:" @@ -1700,20 +1474,223 @@ msgstr "الدخول" # e:\program -#: ../../.././map.php:697 -#: ../../.././map.php:698 -#: ../../.././map.php:715 -#: ../../.././querybuilder.php:55 -#: ../../.././querybuilder.php:56 -#: ../../.././querybuilder.php:73 -#: ../../.././back/map_layerselection.php:632 -#: ../../.././back/map_layerselection.php:633 -#: ../../.././back/map_layerselection.php:650 -#: ../../.././include/header.php:290 -msgid "[Select One]" -msgstr "[اختر واحدة]" +#: ../../.././map.php:107 +#: ../../.././back/map.php:124 +#: ../../.././back/map_layerselection.php:168 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:143 +#, php-format +msgid "Moving DeliveryPoint %s." +msgstr "تحريك نقطة الوصول رقم %s" +# e:\program +#: ../../.././map.php:135 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid "Deleted DeliveryPoint." +msgstr "تم تحريك نقطة الوصول" + +# D:\dccss\dccss/map.php:134 +#: ../../.././map.php:135 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid " " +msgstr "" + +# e:\program +#: ../../.././map.php:135 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid "DeliveryPointID:" +msgstr "نقطة الوصول" + # c:\program +#: ../../.././map.php:135 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid "sequence" +msgstr "رقم التخصيص" + +# c:\program +#: ../../.././map.php:174 +#: ../../.././back/map.php:191 +#: ../../.././back/map_layerselection.php:235 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:210 +msgid "NO geocode value returned" +msgstr "لم يتم ارسال اي رمز جغرافي" + +# e:\program +#: ../../.././map.php:201 +#: ../../.././back/map.php:218 +#: ../../.././back/map_layerselection.php:262 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:237 +msgid "Moved DeliveryPoint." +msgstr "تم تحريك نقطة الوصول" + +# e:\program +#: ../../.././map.php:355 +#: ../../.././back/map.php:521 +#: ../../.././back/map_layerselection.php:409 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:383 +msgid "Legend" +msgstr "مفتاح الخريطة" + +# c:\program +#: ../../.././map.php:377 +#: ../../.././back/map.php:543 +#: ../../.././back/map_layerselection.php:431 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:405 +msgid "Display the Water network" +msgstr "اظهار شبكة المياه" + +# e:\program +#: ../../.././map.php:378 +#: ../../.././back/map.php:544 +#: ../../.././back/map_layerselection.php:432 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:406 +msgid "Water Network" +msgstr "شبكة المياه" + +# e:\program +#: ../../.././map.php:390 +#: ../../.././back/map.php:556 +#: ../../.././back/map_layerselection.php:444 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:418 +msgid "Landmark" +msgstr "معلم" + +# c:\program +#: ../../.././map.php:398 +#: ../../.././back/map.php:564 +#: ../../.././back/map_layerselection.php:452 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:426 +msgid "Refresh the map display" +msgstr "تحديث الخريطة" + +# e:\program +#: ../../.././map.php:399 +#: ../../.././back/map.php:565 +#: ../../.././back/map_layerselection.php:453 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:427 +msgid "Redraw Map" +msgstr "اعادة رسم الخريطة" + +# c:\program +#: ../../.././map.php:407 +#: ../../.././back/map.php:573 +#: ../../.././back/map_layerselection.php:461 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:435 +msgid "Zoom to grid" +msgstr "التكبير الى الشبكة" + +# c:\program +#: ../../.././map.php:430 +#: ../../.././back/map.php:596 +#: ../../.././back/map_layerselection.php:484 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:458 +msgid "Full View" +msgstr "منظر عام" + +# c:\program +#: ../../.././map.php:455 +#: ../../.././back/map.php:621 +#: ../../.././back/map_layerselection.php:509 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:483 +msgid "Select the map size from the list." +msgstr "اختر حجم الخريطة من القائمة" + +# e:\program +#: ../../.././map.php:456 +#: ../../.././back/map.php:622 +#: ../../.././back/map_layerselection.php:510 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:484 +msgid "Map Size" +msgstr "حجم الخريطة" + +# e:\program +#: ../../.././map.php:493 +#: ../../.././back/map.php:659 +#: ../../.././back/map_layerselection.php:552 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:526 +msgid "Keymap" +msgstr "خريطة الدليل" + +# e:\program +#: ../../.././map.php:497 +#: ../../.././back/map.php:663 +#: ../../.././back/map_layerselection.php:556 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:530 +msgid "Click on the key map to view an area." +msgstr "اضغط على خريطة الدليل لاظهار منطقة" + +# e:\program +#: ../../.././map.php:508 +#: ../../.././back/map.php:674 +#: ../../.././back/map_layerselection.php:567 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:541 +msgid "Zoom in further to display more detailed map information." +msgstr "كبر اكثر من اجل اظهار تفاصيل اكثر للخريطة." + +# e:\program +#: ../../.././map.php:510 +#: ../../.././back/map.php:676 +#: ../../.././back/map_layerselection.php:569 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:543 +msgid "Zoom In" +msgstr "تكبير" + +# e:\program +#: ../../.././map.php:518 +#: ../../.././back/map.php:684 +#: ../../.././back/map_layerselection.php:577 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:551 +msgid "Zoom out to display a larger area of the map." +msgstr "صغر من اجل اظهار منطقة اكبر من الخريطة." + +# e:\program +#: ../../.././map.php:520 +#: ../../.././back/map.php:686 +#: ../../.././back/map_layerselection.php:579 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:553 +msgid "Zoom Out" +msgstr "تصغير" + +# e:\program +#: ../../.././map.php:528 +#: ../../.././back/map.php:694 +#: ../../.././back/map_layerselection.php:587 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:561 +msgid "Move the map view without zooming in or out." +msgstr "التحرك في الخريطة بدون تكبير او تصغير." + +# e:\program +#: ../../.././map.php:530 +#: ../../.././back/map.php:696 +#: ../../.././back/map_layerselection.php:589 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:563 +msgid "Pan" +msgstr "تحريك" + +# e:\program +#: ../../.././map.php:538 +#: ../../.././back/map.php:704 +#: ../../.././back/map_layerselection.php:597 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:571 +msgid "Display information about elements in the map." +msgstr "اظهار المعلومات المتعلقة بالعناصر الموجودة في الخريطة." + +# e:\program +#: ../../.././map.php:540 +#: ../../.././back/map.php:706 +#: ../../.././back/map_layerselection.php:599 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:573 +msgid "Identify" +msgstr "اداة التعريف" + +# c:\program #: ../../.././meter_query_report.php:49 msgid "Query using Meter Serial Number" msgstr "الاستفسار عن مشتركباستخدام رقم العداد" @@ -1802,6 +1779,17 @@ msgid "Query Builder" msgstr "بناء الاستفسارات" +# e:\program +#: ../../.././querybuilder.php:55 +#: ../../.././querybuilder.php:56 +#: ../../.././querybuilder.php:73 +#: ../../.././back/map_layerselection.php:632 +#: ../../.././back/map_layerselection.php:633 +#: ../../.././back/map_layerselection.php:650 +#: ../../.././include/header.php:290 +msgid "[Select One]" +msgstr "[اختر واحدة]" + # c:\program #: ../../.././reports.php:34 msgid "Create No bill available status report" @@ -2158,7 +2146,49 @@ msgid "Load file" msgstr "تحميل الملف" +#: ../../.././admin/css_to_billing.php:29 +msgid "CSS to Billing data dumper" +msgstr "نقل البيانات من CSS الى الفواتير" + +# c:\program +#: ../../.././admin/css_to_billing.php:31 +msgid "Download CSS data from dccss database." +msgstr "تنزيل بيانات المسح الميداني من قاعدة البيانات" + # e:\program +#: ../../.././admin/css_to_billing.php:32 +msgid "Please check the box if you want to have the route information included." +msgstr "الرجاء الاختيار في حال الرغبة في اضافة معلومات المسار الى الملف" + +#: ../../.././admin/css_to_billing.php:35 +#: ../../.././admin/processing.php:37 +msgid "Prepare CSS data transfer file for Billing" +msgstr "تجهيز بيانات CSS لنقلها الى نظام الفواتير" + +# c:\program +#: ../../.././admin/css_to_billing.php:38 +msgid "Include route information" +msgstr "تضمين معلومات المسار" + +#: ../../.././admin/css_to_billing.php:39 +msgid "Prepare CSV file" +msgstr "تجهيز ملف CSV" + +#: ../../.././admin/css_to_billing.php:59 +msgid "File preparation is done." +msgstr "تم تجهيز الملف" + +# c:\program +#: ../../.././admin/css_to_billing.php:65 +#: ../../.././admin/shapefile_dumper.php:124 +msgid "Download " +msgstr "تنزيل" + +#: ../../.././admin/css_to_billing.php:70 +msgid "Failed to dump CSS data." +msgstr "فشل في تنزيل بيانات CSS" + +# e:\program #: ../../.././admin/move_subscriber.php:51 #: ../../.././admin/move_subscriber.php:53 msgid "Enter Delivery Point ID:" @@ -2222,7 +2252,50 @@ msgid "Please check if the delivery point exists." msgstr "الرجاء التأكد من وجود نقطة الوصول." +#: ../../.././admin/processing.php:29 +msgid "GIS Data Processing" +msgstr "معالجة البيانات الجغرافية" + +#: ../../.././admin/processing.php:31 +msgid "Process data in dccss database." +msgstr "معالجة البيانات في قاعدة البيانات" + # c:\program +#: ../../.././admin/processing.php:32 +msgid "Please Select the processing type from the list." +msgstr "الرجاء اختيار نوع عملية المعالجة من القائمة" + +# c:\program +#: ../../.././admin/processing.php:38 +msgid "Select the processing type" +msgstr "الرجاء اختيار نوع عملية المعالجة من القائمة" + +#: ../../.././admin/processing.php:39 +msgid "Apply processing at" +msgstr "تطبيق المعالجة على" + +#: ../../.././admin/processing.php:40 +msgid "Process GIS data" +msgstr "معالجة البيانات الجغرافية" + +# c:\program +#: ../../.././admin/processing.php:42 +msgid "Please enter the value to be processed." +msgstr "ادخل قيمة المعالجة" + +#: ../../.././admin/processing.php:44 +msgid "Please enter the processing value or enter 0 to process all data." +msgstr "الرجاء ادخال القيمة المرغوب بمعالجتها او ادخل صفر لمعالجة جميع البيانات" + +#: ../../.././admin/processing.php:65 +msgid "Data processing is done." +msgstr "تمت معالجة البيانات." + +#: ../../.././admin/processing.php:68 +msgid "Failed to process the data." +msgstr "لم تتم عملية المعالجة بنجاح" + +# c:\program #: ../../.././admin/purge_subscriber.php:50 msgid "Delete Subscriber Information" msgstr "حذف معلومات المشتركين" @@ -2268,11 +2341,6 @@ msgstr "تنزيل المعلومات الجغرافية من قاعدة البيانات DCCSS" # c:\program -#: ../../.././admin/shapefile_dumper.php:124 -msgid "Download " -msgstr "تنزيل" - -# c:\program #: ../../.././admin/shapefile_dumper.php:128 #, php-format msgid "Failed to dump table '%s' to a shapefile." @@ -2409,7 +2477,7 @@ #: ../../.././back/print_inspection.php:41 msgid "DCCSS Inspection Sheet" -msgstr "" +msgstr "امر عمل DCCSS" # c:\program #: ../../.././back/print_inspection.php:74 @@ -3060,6 +3128,15 @@ msgstr "مشترك ليس على المسار مع كمية استهلاك صفر" # c:\program +#: ../../.././include/i18n.php:139 +msgid "Generate route information" +msgstr "توليد معلومات المسار" + +#: ../../.././include/i18n.php:140 +msgid "Create line connection between meter cabinet and deliverypoints" +msgstr "انشاء الوصلات بين نقاط التوصيل و غرف العدادات الجماعية التي تحتوي عداداتها" + +# c:\program #: ../../.././include/dataobject/Public_bill.php:33 #: ../../.././include/dataobject/Public_subscriber.php:203 msgid "Subscriber number" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-25 06:10:14
|
Revision: 324 Author: maher_karim Date: 2006-07-24 23:09:47 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=324&view=rev Log Message: ----------- 2006-07-25 Maher Abdel karim <mah...@do...> * index.php:Add link to process.php page. * script/create_css_ddl.sql:adjust the dcrmroute(). * admin/processing.php:adjust the form and event handling. Modified Paths: -------------- trunk/dccss/admin/processing.php trunk/dccss/changelog trunk/dccss/index.php trunk/dccss/script/create_css_ddl.sql Modified: trunk/dccss/admin/processing.php =================================================================== --- trunk/dccss/admin/processing.php 2006-07-24 12:24:22 UTC (rev 323) +++ trunk/dccss/admin/processing.php 2006-07-25 06:09:47 UTC (rev 324) @@ -37,7 +37,7 @@ $Processingform->addElement('header', null, _('Prepare CSS data transfer file for Billing')); $Processingform->addElement('select','processingtype', 'Select the processing type',$processArray); $Processingform->addElement('text', 'processingvalue',_('Apply processing at'),number); -$Processingform->addElement('submit', null, _('Prepare CSV file')); +$Processingform->addElement('submit', null, _('Process GIS data')); $Processingform->addRule('processingvalue', _('Please enter the value to be processed.'), 'required', null, 'client'); $Processingform->addRule('processingvalue', Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-24 12:24:22 UTC (rev 323) +++ trunk/dccss/changelog 2006-07-25 06:09:47 UTC (rev 324) @@ -1,3 +1,9 @@ +2006-07-25 Maher Abdel karim <mah...@do...> + + * index.php:Add link to process.php page. + * script/create_css_ddl.sql:adjust the dcrmroute(). + * admin/processing.php:adjust the form and event handling. + 2006-07-24 Maher Abdel karim <mah...@do...> * include/dataobject/public_subscriber.php:adjust the field names. Modified: trunk/dccss/index.php =================================================================== --- trunk/dccss/index.php 2006-07-24 12:24:22 UTC (rev 323) +++ trunk/dccss/index.php 2006-07-25 06:09:47 UTC (rev 324) @@ -80,7 +80,7 @@ <li><?php echoOnMouseOverLink("admin/css_to_billing.php", _("CSS to billing data transfer file preparation"), _("Download CSV file from CSS database."), - "shapefile_dumper.png"); ?></li> + "bill_loader.png"); ?></li> <!--<li><?php echoOnMouseOverLink("admin/bill_loader.php", _("Bill Loader"), _("Load a PEWSSA bill file to the DCCSS geodatabase."), @@ -101,6 +101,10 @@ _("Move Subscriber"), _("Move subscriber(s) from Delivery point to another."), "stock_refresh.png"); ?></li> + <li><?php echoOnMouseOverLink("admin/processing.php", + _("GIS data processing"), + _("Process GIS data."), + "administration-32.png"); ?></li> </ul> </div> <br clear="all" /> <?php Modified: trunk/dccss/script/create_css_ddl.sql =================================================================== --- trunk/dccss/script/create_css_ddl.sql 2006-07-24 12:24:22 UTC (rev 323) +++ trunk/dccss/script/create_css_ddl.sql 2006-07-25 06:09:47 UTC (rev 324) @@ -660,6 +660,7 @@ routegeom geometry; recordcount integer; cabinetupdate integer; +deliveryupdate integer; begin if $1 = 0 then @@ -670,11 +671,18 @@ recordcount= npoints(route.the_geom) from route where logbookno=row_data2.logbookno; perform setval(''route_seq'', 1); for m in 0..recordcount-1 loop - update deliverypoint set routesequence=(nextval(''route_seq'')-1), +deliveryupdate := count(*) from deliverypoint,route where +deliverypoint.the_geom && pointn(route.the_geom,m)::box3d and +intersects(pointn(route.the_geom,m),deliverypoint.the_geom) and +route.logbookno=row_data2.logbookno; + if deliveryupdate > 0 then + update deliverypoint set routesequence=(currval(''route_seq'')), routeid=row_data2.logbookno from route where deliverypoint.the_geom && pointn(route.the_geom,m)::box3d and intersects(pointn(route.the_geom,m),deliverypoint.the_geom) and route.logbookno=row_data2.logbookno; +perform nextval(''route_seq''); +end if; cabinetupdate := count(*) from metercabinet,route where metercabinet.the_geom && pointn(route.the_geom,m)::box3d and intersects(pointn(route.the_geom,m),metercabinet.the_geom) and @@ -697,11 +705,18 @@ recordcount= npoints(route.the_geom) from route where logbookno=route_id; perform setval(''route_seq'', 1); for m in 0..recordcount-1 loop - update deliverypoint set routesequence=(nextval(''route_seq'')-1), + deliveryupdate := count(*) from deliverypoint,route where + deliverypoint.the_geom && pointn(route.the_geom,m)::box3d and + intersects(pointn(route.the_geom,m),deliverypoint.the_geom) and + route.logbookno=route_id; + if deliveryupdate > 0 then + update deliverypoint set routesequence=(currval(''route_seq'')), routeid=route_id from route where deliverypoint.the_geom && pointn(route.the_geom,m)::box3d and intersects(pointn(route.the_geom,m),deliverypoint.the_geom) and route.logbookno=route_id; +perform nextval(''route_seq''); +end if; cabinetupdate := count(*) from metercabinet,route where metercabinet.the_geom && pointn(route.the_geom,m)::box3d and intersects(pointn(route.the_geom,m),metercabinet.the_geom) and This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-24 12:25:01
|
Revision: 323 Author: maher_karim Date: 2006-07-24 05:24:22 -0700 (Mon, 24 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=323&view=rev Log Message: ----------- 2006-07-24 Maher Abdel karim <mah...@do...> * include/dataobject/public_subscriber.php:adjust the field names. * admin/css_to_billing.php:Create the ascii UTF8 encoded file to be transfered to the billing system. * index.php:Add link for the CSS to billing page. * script/create_css_ddl.sql:update the dcrmroute(). * admin/processing.php:Add processing functionality for route, and meter cabinet Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/include/dataobject/Public_subscriber.php trunk/dccss/index.php Added Paths: ----------- trunk/dccss/admin/css_to_billing.php trunk/dccss/admin/processing.php Added: trunk/dccss/admin/css_to_billing.php =================================================================== --- trunk/dccss/admin/css_to_billing.php (rev 0) +++ trunk/dccss/admin/css_to_billing.php 2006-07-24 12:24:22 UTC (rev 323) @@ -0,0 +1,78 @@ +<?php + /* CSS -- DC Comprehensive Subscribers Survey + * + * css_to_billing.php - export CSS data from the DCCSS database + * + * Copyright (C) 2005 DORSCH Consult + * Copyright (C) 2006 DC Water and Environemnt + * + * 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/dccsspage.php"); +include("../include/dcmpostgis.php"); +require_once('HTML/QuickForm.php'); +$DccssPage->strPathInDccss = '../'; +$DccssPage = new DccssPage(_("CSS to Billing data dumper"), '../'); + +$DccssPage->add( _("Download CSS data from dccss database.")."<br>"); +$DccssPage->add (_("Please check the box if you want to have the route information included.")); + +$Fileform = new HTML_QuickForm('fileform'); +$Fileform->addElement('header', null, _('Prepare CSS data transfer file for Billing')); +$Fileform->addElement('hidden', 'maxfile',''); +$Fileform->addElement('checkbox', 'routeinformation', +_('Include route information')); +$Fileform->addElement('submit', null, _('Prepare CSV file')); + +$DccssPage->add($Fileform->toHtml()); +if ($Fileform->validate()){ + +$Fileform->process($Fileform, false); + +$strQuery = "BEGIN; +CREATE TEMP TABLE css_to_billing_transfer AS +SELECT customerlocation,meterlocation,paracode,logbooknumber,sequence, +subsequence,name,logbookserialnumber"; +if ($Fileform->exportValue('routeinformation')!=0){ +$strQuery= $strQuery.", routeid,routesequence"; +} +$strQuery= $strQuery." FROM css_to_billing; +COPY css_to_billing_transfer TO '/tmp/ms_tmp/css_to_billing.csv' with csv; +ROLLBACK;"; + + $objResult = pg_query($strQuery); + if($objResult) { + $DccssPage->add( _("File preparation is done.")."<br>"); + $blnSuccess=true; + } + + if($blnSuccess) { + + $DccssPage->add( _("Download ")); + $DccssPage->add('<a href="/ms_tmp/css_to_billing.csv">'); + $DccssPage->add('CSS_to_billing.csv'); + $DccssPage->add('</a>'); + } else { + $DccssPage->add( _("Failed to dump CSS data.")); + + + } + +} + +echo($DccssPage->toHtml()); + Added: trunk/dccss/admin/processing.php =================================================================== --- trunk/dccss/admin/processing.php (rev 0) +++ trunk/dccss/admin/processing.php 2006-07-24 12:24:22 UTC (rev 323) @@ -0,0 +1,73 @@ +<?php + /* CSS -- DC Comprehensive Subscribers Survey + * + * processing.php - Processing data in dccss database. + * + * Copyright (C) 2005 DORSCH Consult + * Copyright (C) 2006 DC Water and Environemnt + * + * 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/dccsspage.php"); +include("../include/dcmpostgis.php"); +require_once('HTML/QuickForm.php'); +$DccssPage->strPathInDccss = '../'; +$DccssPage = new DccssPage(_("GIS Data Processing"), '../'); + +$DccssPage->add( _("Process data in dccss database.")."<br>"); +$DccssPage->add (_("Please Select the processing type from the list.")); +$processArray= array ("dcrmroute" => "Generate route information", +"createlineconnection"=>"Create line connection between meter cabinet and deliverypoints"); + +$Processingform = new HTML_QuickForm('Processingform'); +$Processingform->addElement('header', null, _('Prepare CSS data transfer file for Billing')); +$Processingform->addElement('select','processingtype', 'Select the processing type',$processArray); +$Processingform->addElement('text', 'processingvalue',_('Apply processing at'),number); +$Processingform->addElement('submit', null, _('Prepare CSV file')); +$Processingform->addRule('processingvalue', + _('Please enter the value to be processed.'), 'required', null, 'client'); + $Processingform->addRule('processingvalue', + _('Please enter the processing value or enter 0 to process all data.'), + 'numeric', null, 'client'); +$Processingform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + >*</span><span style="font-size:80%;"> '. + _('denotes required field').'</span>'); + +$DccssPage->add($Processingform->toHtml()); +if ($Processingform->validate()){ + +$Processingform->process($Processingform, false); + +$strQuery ="select ".$Processingform->exportValue('processingtype')."("; + +if ($Processingform->exportValue('processingtype')=='createlineconnection'){ + $strQuery=$strQuery."'".$Processingform->exportValue('processingvalue')."')"; +}else{ + $strQuery=$strQuery.$Processingform->exportValue('processingvalue').")"; +} + + $objResult = pg_query($strQuery); + if($objResult) { + $DccssPage->add( _("Data processing is done.")."<br>"); + + }else{ + $DccssPage->add( _("Failed to process the data.")."<br>"); + } +} + +echo($DccssPage->toHtml()); + Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-19 17:36:21 UTC (rev 322) +++ trunk/dccss/changelog 2006-07-24 12:24:22 UTC (rev 323) @@ -1,3 +1,13 @@ +2006-07-24 Maher Abdel karim <mah...@do...> + + * include/dataobject/public_subscriber.php:adjust the field names. + * admin/css_to_billing.php:Create the ascii UTF8 encoded file to be + transfered to the billing system. + * index.php:Add link for the CSS to billing page. + * script/create_css_ddl.sql:update the dcrmroute(). + * admin/processing.php:Add processing functionality for route, + and meter cabinet + 2006-07-19 Maher Abdel karim <mah...@do...> * script/create_views.sql: add css_to_billing view for data transfer. Modified: trunk/dccss/include/dataobject/Public_subscriber.php =================================================================== --- trunk/dccss/include/dataobject/Public_subscriber.php 2006-07-19 17:36:21 UTC (rev 322) +++ trunk/dccss/include/dataobject/Public_subscriber.php 2006-07-24 12:24:22 UTC (rev 323) @@ -211,12 +211,12 @@ while($this->fetch()) { if($this->geocode != '') { $objTable->setCellContents($i, 0, $this->id); - $objTable->setCellContents($i, 1, $this->sequence); + $objTable->setCellContents($i, 1, $this->geocode); $objTable->setCellContents($i, 2, $this->logbooknumber); $objTable->setCellContents($i, 3, $this->subscription); $objTable->setCellContents($i, 4, $this->name); $objTable->setCellContents($i, 5, $this->serialnumber); - $objTable->setCellContents($i, 6, $this->s); + $objTable->setCellContents($i, 6, $this->sequence); $objTable->setCellContents($i, 7, $this->subsequence); if ($action=='view'){ $ref='<a href="deliverypointpage.php?PHPSESSID='.session_id(). Modified: trunk/dccss/index.php =================================================================== --- trunk/dccss/index.php 2006-07-19 17:36:21 UTC (rev 322) +++ trunk/dccss/index.php 2006-07-24 12:24:22 UTC (rev 323) @@ -77,6 +77,10 @@ _("Shapefile Dumper"), _("Download zipped shapefiles from the DCCSS geodatabase."), "shapefile_dumper.png"); ?></li> + <li><?php echoOnMouseOverLink("admin/css_to_billing.php", + _("CSS to billing data transfer file preparation"), + _("Download CSV file from CSS database."), + "shapefile_dumper.png"); ?></li> <!--<li><?php echoOnMouseOverLink("admin/bill_loader.php", _("Bill Loader"), _("Load a PEWSSA bill file to the DCCSS geodatabase."), @@ -84,6 +88,7 @@ * \todo Adjust image. */ "bill_loader.png"); ?></li>--> + </ul> </div> <div id="contentright"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-19 17:37:32
|
Revision: 322 Author: maher_karim Date: 2006-07-19 10:36:21 -0700 (Wed, 19 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=322&view=rev Log Message: ----------- 2006-07-19 Maher Abdel karim <mah...@do...> * script/create_views.sql: add css_to_billing view for data transfer. Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/script/create_views.sql Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-18 13:44:44 UTC (rev 321) +++ trunk/dccss/changelog 2006-07-19 17:36:21 UTC (rev 322) @@ -1,3 +1,7 @@ +2006-07-19 Maher Abdel karim <mah...@do...> + + * script/create_views.sql: add css_to_billing view for data transfer. + 2006-07-18 Maher Abdel karim <mah...@do...> * script/create_views.sql:add mote task force views. Modified: trunk/dccss/script/create_views.sql =================================================================== --- trunk/dccss/script/create_views.sql 2006-07-18 13:44:44 UTC (rev 321) +++ trunk/dccss/script/create_views.sql 2006-07-19 17:36:21 UTC (rev 322) @@ -398,7 +398,46 @@ subscriber.geocode=deliverypoint.geocode and grid.the_geom&&deliverypoint.the_geom and intersects(deliverypoint.the_geom,grid.the_geom) order by grid.id; +-- CSS to billing for data transfer +create or replace view css_to_billing as +select subscriber.id,deliverypoint.sequence as customerlocation, +subscriber.meterlocationdeliverypointseq as meterlocation, +subscriber.paracode,subscriber.logbooknumber,subscriber.sequence, +subscriber.subsequence,subscriber.name,subscriber.logbookserialnumber, +deliverypoint.routeid,deliverypoint.routesequence +from subscriber,deliverypoint where subscriber.cabinetid='0' and +subscriber.meterlocationdeliverypointseq <>0 and subscriber.paracode is not null +and subscriber.geocode=deliverypoint.geocode +union +select subscriber.id,deliverypoint.sequence as customerlocation, +to_number(subscriber.cabinetid,99999),subscriber.paracode,subscriber.logbooknumber, +subscriber.sequence,subscriber.subsequence,subscriber.name, +subscriber.logbookserialnumber,deliverypoint.routeid,deliverypoint.routesequence +from subscriber left outer join metercabinet on +(subscriber.cabinetid=metercabinet.pewssaid) left outer join deliverypoint on +(subscriber.geocode=deliverypoint.geocode) +where subscriber.cabinetid<>'0' and subscriber.meterlocationdeliverypointseq =0 +and subscriber.paracode is not null +union +select subscriber.id,deliverypoint.sequence as customerlocation, +subscriber.meterlocationdeliverypointseq as meterlocation, +subscriber.paracode,subscriber.logbooknumber,subscriber.sequence, +subscriber.subsequence,subscriber.name,subscriber.logbookserialnumber, +deliverypoint.routeid,deliverypoint.routesequence +from subscriber,deliverypoint where subscriber.cabinetid<>'0' and +subscriber.meterlocationdeliverypointseq <>0 and subscriber.paracode is not null +and subscriber.geocode=deliverypoint.geocode +union +select subscriber.id,deliverypoint.sequence as customerlocation, +deliverypoint.sequence as meterlocation ,subscriber.paracode,subscriber.logbooknumber, +subscriber.sequence,subscriber.subsequence,subscriber.name, +subscriber.logbookserialnumber,deliverypoint.routeid,deliverypoint.routesequence +from subscriber,deliverypoint where subscriber.cabinetid='0' +and subscriber.meterlocationdeliverypointseq =0 and subscriber.paracode is not null +and subscriber.geocode=deliverypoint.geocode + -- user access rights +grant all on css_to_billing to public; grant all on LandmarkView to public; grant all on taskforce_lostcustomer to public; grant all on taskforce_collectionmissplaced to public; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-18 13:45:10
|
Revision: 321 Author: maher_karim Date: 2006-07-18 06:44:44 -0700 (Tue, 18 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=321&view=rev Log Message: ----------- 2006-07-18 Maher Abdel karim <mah...@do...> * script/create_views.sql:add mote task force views. * script/create_css_ddl.sql:add routeid,and routesequence to metercabinet, and deliverypoint tables, and paracode to subscriber table. add dcrmroute() function. * print_workorder.php: * taskforce_report.php:add the ability to print batches. Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/print_workorder.php trunk/dccss/script/create_css_ddl.sql trunk/dccss/script/create_views.sql trunk/dccss/taskforce_report.php Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-12 08:54:33 UTC (rev 320) +++ trunk/dccss/changelog 2006-07-18 13:44:44 UTC (rev 321) @@ -1,3 +1,12 @@ +2006-07-18 Maher Abdel karim <mah...@do...> + + * script/create_views.sql:add mote task force views. + * script/create_css_ddl.sql:add routeid,and routesequence to metercabinet, + and deliverypoint tables, and paracode to subscriber table. + add dcrmroute() function. + * print_workorder.php: + * taskforce_report.php:add the ability to print batches. + 2006-07-12 Maher Abdel karim <mah...@do...> * include/i18n.php: Modified: trunk/dccss/print_workorder.php =================================================================== --- trunk/dccss/print_workorder.php 2006-07-12 08:54:33 UTC (rev 320) +++ trunk/dccss/print_workorder.php 2006-07-18 13:44:44 UTC (rev 321) @@ -66,8 +66,8 @@ </td> <td align="center"> - </a><b align="middle"><?= _("Task force - ") ?><?= _($_REQUEST['label']) ?></b><br> - </a><b align="middle"><?php echo($record);echo(" "); echo _("of"); echo (" "); + </a><b align="middle"><?= _("Task force - ") ?><?= _($_SESSION['label']) ?></b><br> + </a><b align="middle"><?php echo(($record+$_REQUEST['batch']));echo(" "); echo _("of"); echo (" "); echo(count($_SESSION['TaskforceArray'])); ?></b><br> </a><b align="middle"><?= _("Date:") ?><?php echo($date); ?></b></td> </td> Modified: trunk/dccss/script/create_css_ddl.sql =================================================================== --- trunk/dccss/script/create_css_ddl.sql 2006-07-12 08:54:33 UTC (rev 320) +++ trunk/dccss/script/create_css_ddl.sql 2006-07-18 13:44:44 UTC (rev 321) @@ -161,7 +161,9 @@ create table MeterCabinet ( PewssaID varchar(16) primary key, - id integer + id integer, + routeid integer,--Route ID + routesequence integer -- deliverypoint route sequence ); create table route( logbookno integer; @@ -205,7 +207,9 @@ Surveyor integer references Surveyor(CodedValue),--Field Surveyor Number Note varchar(128),--Remarks insertdate timestamp DEFAULT now(),--The Date of Insertion Form to The System - username varchar(16)--The Name of the user insert the form + username varchar(16),--The Name of the user insert the form + routeid integer,--Route ID + routesequence integer -- deliverypoint route sequence ); comment on column deliverypoint.FormNumber is @@ -258,7 +262,8 @@ Note varchar(256),-- Remarks insertdate timestamp DEFAULT now(),--The Date of Insertion Form to The System username varchar(16),--The Name of the user insert the form - meterLocationDeliveryPointSeq integer--The meter location Deliverypoint sequence. + meterLocationDeliveryPointSeq integer,--The meter location Deliverypoint sequence. + paracode varchar(32) ); -- History table @@ -641,6 +646,87 @@ process all meter cabinets, and select createlineconnection(''616'') will process only this cabinet.'; + + +-- +create or replace function dcrmroute(integer) returns text as ' +declare +route_id alias for $1; +countall integer; +dpsequence integer; +dpgeom geometry; +row_data RECORD; +row_data2 RECORD; +routegeom geometry; +recordcount integer; +cabinetupdate integer; +begin + +if $1 = 0 then + FOR row_data2 in select distinct logbookno from route where logbookno<>0 + +LOOP + +recordcount= npoints(route.the_geom) from route where logbookno=row_data2.logbookno; +perform setval(''route_seq'', 1); + for m in 0..recordcount-1 loop + update deliverypoint set routesequence=(nextval(''route_seq'')-1), + routeid=row_data2.logbookno from route where + deliverypoint.the_geom && pointn(route.the_geom,m)::box3d and + intersects(pointn(route.the_geom,m),deliverypoint.the_geom) and + route.logbookno=row_data2.logbookno; + cabinetupdate := count(*) from metercabinet,route where + metercabinet.the_geom && pointn(route.the_geom,m)::box3d and + intersects(pointn(route.the_geom,m),metercabinet.the_geom) and + route.logbookno=row_data2.logbookno; + if cabinetupdate = 1 then + update metercabinet set routesequence=(currval(''route_seq'')), + routeid=row_data2.logbookno from route where + metercabinet.the_geom && route.the_geom::box3d and + intersects(pointn(route.the_geom,m),metercabinet.the_geom) and + route.logbookno=row_data2.logbookno; + perform nextval(''route_seq''); + end if; + end loop; + + + +END LOOP; + RETURN ''All records were processed.''||row_data2.logbookno; +else +recordcount= npoints(route.the_geom) from route where logbookno=route_id; +perform setval(''route_seq'', 1); +for m in 0..recordcount-1 loop + update deliverypoint set routesequence=(nextval(''route_seq'')-1), + routeid=route_id from route where + deliverypoint.the_geom && pointn(route.the_geom,m)::box3d and + intersects(pointn(route.the_geom,m),deliverypoint.the_geom) and + route.logbookno=route_id; + cabinetupdate := count(*) from metercabinet,route where + metercabinet.the_geom && pointn(route.the_geom,m)::box3d and + intersects(pointn(route.the_geom,m),metercabinet.the_geom) and + route.logbookno=route_id; + if cabinetupdate = 1 then + update metercabinet set routesequence=(currval(''route_seq'')), + routeid=route_id from route where metercabinet.the_geom && route.the_geom::box3d + and intersects(pointn(route.the_geom,m),metercabinet.the_geom) and + route.logbookno=route_id; + perform nextval(''route_seq''); + end if; +end loop; + return ''Deliverypoints for route : ''||$1||recordcount||'' were processed.''; +end if; +end;' +language 'plpgsql'; +comment on function dcrmroute(id) is +'calculate the route sequence for each deliverypoint intersected with the route + @param routeid, or an 0 to process all the routes. + @returns a text like ''All records were processed''. + meter cabinets are processed also, to have a sequence within the rou + The following command can be used select dcrmroute(0), this will + process all routes, and select dcrmroute(2333) will + process only this route.'; + -- Grants and user rights. -- TODO: More permissions to be added, still give unsufficient permission. Modified: trunk/dccss/script/create_views.sql =================================================================== --- trunk/dccss/script/create_views.sql 2006-07-12 08:54:33 UTC (rev 320) +++ trunk/dccss/script/create_views.sql 2006-07-18 13:44:44 UTC (rev 321) @@ -390,9 +390,17 @@ 2666,2667,2670,2672,2674,2677 ,2678,2680); +--Task force lost customers +create or replace view taskforce_lostcustomer as +select deliverypoint.sequence as dpsequence,subscriber.logbooknumber,subscriber.sequence,subscriber.subsequence, +subscriber.name,subscriber.logbookserialnumber, grid.id from subscriber,deliverypoint,grid where +link=0 and subscriber.hasconnectionbefore <> 1 and subscriber.note::text !~~ '%وصلة غير%'::text and +subscriber.geocode=deliverypoint.geocode and grid.the_geom&&deliverypoint.the_geom and +intersects(deliverypoint.the_geom,grid.the_geom) order by grid.id; -- user access rights grant all on LandmarkView to public; +grant all on taskforce_lostcustomer to public; grant all on taskforce_collectionmissplaced to public; grant all on taskforce_routedandmissplaced to public; grant all on taskforce_illegal to public; Modified: trunk/dccss/taskforce_report.php =================================================================== --- trunk/dccss/taskforce_report.php 2006-07-12 08:54:33 UTC (rev 320) +++ trunk/dccss/taskforce_report.php 2006-07-18 13:44:44 UTC (rev 321) @@ -55,8 +55,12 @@ _("Routed and zero consumption-TF1"), 'notroutedandzerocons'=>_("Not Routed and zero consumption-Unkown-TF2"), 'damaged'=>_("Damaged-TF8")); +$arrbatch=array(0=>0,1=>100,2=>200,3=>300,4=>400,5=>500,6=>600,7=>700,8=>800,9=>900, +10=>1000); + $Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), $arrTask); +$Taskforceform->addElement('select', 'batch', _('Batch:'),$arrbatch); $objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); $objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); @@ -95,13 +99,21 @@ $DccssPage->add($objTable->toHtml()); break; case _("Print Task force maps"): + $strQuery='select dpsequence from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + $result=pg_query($strQuery); + $arrrows=pg_fetch_all($result); + $_SESSION['TaskforceArray']=$arrrows; $strQuery='select dpsequence from taskforce_'. - $Taskforceform->exportValue('TaskForce'); + $Taskforceform->exportValue('TaskForce').' limit 100 offset '.$Taskforceform->exportValue('batch')*100; $result=pg_query($strQuery); $arrrows=pg_fetch_all($result); - $_SESSION['TaskforceArray']=$arrrows; + if ($arrrows!=0){ + $_SESSION['label']=$arrTask[$Taskforceform->exportvalue('TaskForce')]; header('location:print_workorder?taskforce='.$_POST['TaskForce'].'&label='. - $arrTask[$Taskforceform->exportvalue('TaskForce')]); + $arrTask[$Taskforceform->exportvalue('TaskForce')]. + '&batch='.$Taskforceform->exportValue('batch')*100); + } // print_r($arrrows); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-12 08:55:18
|
Revision: 320 Author: maher_karim Date: 2006-07-12 01:54:33 -0700 (Wed, 12 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=320&view=rev Log Message: ----------- 2006-07-12 Maher Abdel karim <mah...@do...> * include/i18n.php: * ar/LC_MESSAGES/dccss.po:update translations. * conf/dccss_pewssa_%s.map:update map layers. * print_workorder.php:adjust map layout. * taskforce_report.php:Adjust task force actions.add more task forces. Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/conf/dccss_pewssa_ar.map trunk/dccss/conf/dccss_pewssa_en.map trunk/dccss/include/i18n.php trunk/dccss/locale/ar/LC_MESSAGES/dccss.po trunk/dccss/print_workorder.php trunk/dccss/taskforce_report.php Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/changelog 2006-07-12 08:54:33 UTC (rev 320) @@ -1,3 +1,11 @@ +2006-07-12 Maher Abdel karim <mah...@do...> + + * include/i18n.php: + * ar/LC_MESSAGES/dccss.po:update translations. + * conf/dccss_pewssa_%s.map:update map layers. + * print_workorder.php:adjust map layout. + * taskforce_report.php:Adjust task force actions.add more task forces. + 2006-07-05 Maher Abdel karim <mah...@do...> * script/create_css_ddl.sql: add route table.add id field to Modified: trunk/dccss/conf/dccss_pewssa_ar.map =================================================================== --- trunk/dccss/conf/dccss_pewssa_ar.map 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/conf/dccss_pewssa_ar.map 2006-07-12 08:54:33 UTC (rev 320) @@ -314,13 +314,14 @@ SIZE 30 COLOR 100 102 100 END #STYLE - #label - #color 100 102 100 - #position cc - #font arial - #type truetype - #size 20 - #end + label + color 180 102 100 + position cc + font arial + type truetype + backgroundcolor 250 230 120 + size 14 + end END METADATA "DESCRIPTION" "route line" Modified: trunk/dccss/conf/dccss_pewssa_en.map =================================================================== --- trunk/dccss/conf/dccss_pewssa_en.map 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/conf/dccss_pewssa_en.map 2006-07-12 08:54:33 UTC (rev 320) @@ -307,13 +307,14 @@ SIZE 30 COLOR 100 102 100 END #STYLE - #label - #color 100 102 100 - #position cc - #font arial - #type truetype - #size 20 - #end + label + color 180 102 100 + position cc + font arial + type truetype + backgroundcolor 250 230 120 + size 14 + end END METADATA "DESCRIPTION" "route line" Modified: trunk/dccss/include/i18n.php =================================================================== --- trunk/dccss/include/i18n.php 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/include/i18n.php 2006-07-12 08:54:33 UTC (rev 320) @@ -120,7 +120,22 @@ _("DCCSS Task force Report"); _("German Technical Cooperation-GTZ"); _("Institutional Support to Aleppo Water establishment"); -_("Task Force"); +_("Task Force"); +_("subsequence"); +_("Serial number"); +_("Subscription number"); +_("Billing"); +_("Meter readings unit"); +_("Meter Archiving"); +_("Subscription Archiving"); +_("Field check"); +_("Billing data update"); +_("CSS data update"); +_("Date:"); +_("routedandzerocons"); +_("routedandmissplaced"); +_("collectionmissplaced"); +_("notroutedandzerocons"); ?> Modified: trunk/dccss/locale/ar/LC_MESSAGES/dccss.po =================================================================== --- trunk/dccss/locale/ar/LC_MESSAGES/dccss.po 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/locale/ar/LC_MESSAGES/dccss.po 2006-07-12 08:54:33 UTC (rev 320) @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: DCCSS\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2006-06-29 12:34+0200\n" +"PO-Revision-Date: 2006-07-12 10:52+0200\n" "Last-Translator: t <t>\n" "Language-Team: Dorsch <mah...@do...>\n" "MIME-Version: 1.0\n" @@ -91,7 +91,7 @@ #: ../../.././back/map_layerselection.php:196 #: ../../.././back/map_workingqueryexamplefor ghazi.php:171 msgid "sequence" -msgstr "التسلسل:" +msgstr "رقم التخصيص" # c:\program #: ../../.././Copy of map.php:235 @@ -291,7 +291,220 @@ msgid "Identify" msgstr "اداة التعريف" +#: ../../.././Copy of print_workorder.php:40 +#: ../../.././print_workorder.php:40 +msgid "Task force workorder" +msgstr "امر عمل مجموعة عمل" + +#: ../../.././Copy of print_workorder.php:64 +#: ../../.././print_workorder.php:64 +#: ../../.././include/i18n.php:121 +msgid "German Technical Cooperation-GTZ" +msgstr "الوكالة الالمانية للتعاون الفني- GTZ" + +#: ../../.././Copy of print_workorder.php:65 +#: ../../.././print_workorder.php:65 +#: ../../.././include/i18n.php:122 +msgid "Institutional Support to Aleppo Water establishment" +msgstr "مشروع الدعم المؤسسي لمؤسسة مياه حلب" + +#: ../../.././Copy of print_workorder.php:69 +#: ../../.././print_workorder.php:69 +#: ../../.././include/i18n.php:114 +msgid "Task force - " +msgstr "مجموعة عمل - " + +#: ../../.././Copy of print_workorder.php:69 +msgid "taskforce" +msgstr "مجموعة عمل" + +#: ../../.././Copy of print_workorder.php:70 +#: ../../.././print_workorder.php:70 +msgid "of" +msgstr "من" + +#: ../../.././Copy of print_workorder.php:72 +#: ../../.././print_workorder.php:72 +#: ../../.././include/i18n.php:134 +msgid "Date:" +msgstr "التاريخ:" + +#: ../../.././Copy of print_workorder.php:117 +#: ../../.././print_workorder.php:117 +msgid "Finish date:" +msgstr "تاريخ الانتهاء:" + +#: ../../.././Copy of print_workorder.php:118 +#: ../../.././print_workorder.php:118 +msgid "Responsible name:" +msgstr "اسم الموظف المسؤول:" + +# D:\dccss\dccss/logbook_report.php:90 +#: ../../.././Copy of print_workorder.php:119 +#: ../../.././print_workorder.php:119 +msgid "Signiture:" +msgstr "التوقيع:" + +#: ../../.././Copy of print_workorder.php:212 +#: ../../.././print_workorder.php:224 +msgid "Check" +msgstr "فحص" + # c:\program +#: ../../.././Copy of print_workorder.php:213 +#: ../../.././print_workorder.php:225 +#: ../../.././include/i18n.php:127 +msgid "Billing" +msgstr "الفواتير" + +# c:\program +#: ../../.././Copy of print_workorder.php:213 +#: ../../.././print_workorder.php:225 +#: ../../.././include/i18n.php:128 +msgid "Meter readings unit" +msgstr "شعبة التأشيرات" + +# c:\program +#: ../../.././Copy of print_workorder.php:214 +#: ../../.././print_workorder.php:226 +#: ../../.././include/i18n.php:129 +msgid "Meter Archiving" +msgstr "شعبة حركة العدادات" + +# c:\program +#: ../../.././Copy of print_workorder.php:214 +#: ../../.././print_workorder.php:226 +#: ../../.././include/i18n.php:130 +msgid "Subscription Archiving" +msgstr "شعبة الاشتراكات" + +#: ../../.././Copy of print_workorder.php:215 +#: ../../.././print_workorder.php:227 +#: ../../.././include/i18n.php:131 +msgid "Field check" +msgstr "الكشف الميداني" + +#: ../../.././Copy of print_workorder.php:215 +#: ../../.././print_workorder.php:227 +#: ../../.././include/i18n.php:132 +msgid "Billing data update" +msgstr "تحديث معلومات الفواتير" + +#: ../../.././Copy of print_workorder.php:216 +#: ../../.././print_workorder.php:228 +#: ../../.././include/i18n.php:133 +msgid "CSS data update" +msgstr "تحديث معلومات المسح الميداني" + +# c:\program +#: ../../.././Copy of print_workorder.php:218 +#: ../../.././print_workorder.php:230 +#: ../../.././include/dataobject/Public_bill.php:32 +#: ../../.././include/dataobject/Public_subscriber.php:202 +msgid "Logbook" +msgstr "رقم المجلد" + +# c:\program +#: ../../.././Copy of print_workorder.php:223 +#: ../../.././print_workorder.php:235 +#: ../../.././include/dataobject/Public_bill.php:36 +#: ../../.././include/dataobject/Public_subscriber.php:206 +msgid "Sequence" +msgstr "رقم التخصيص " + +# c:\program +#: ../../.././Copy of print_workorder.php:228 +#: ../../.././print_workorder.php:240 +#: ../../.././include/dataobject/Public_bill.php:37 +#: ../../.././include/dataobject/Public_subscriber.php:207 +msgid "Subsequence" +msgstr "رقم التخصيص الفرعي" + +# c:\program +#: ../../.././Copy of print_workorder.php:233 +#: ../../.././print_workorder.php:245 +#: ../../.././include/dataobject/Public_bill.php:34 +#: ../../.././include/dataobject/Public_subscriber.php:204 +msgid "Name" +msgstr "اسم المشترك" + +# c:\program +#: ../../.././Copy of print_workorder.php:238 +#: ../../.././print_workorder.php:250 +#: ../../.././include/i18n.php:125 +msgid "Serial number" +msgstr "رقم العداد" + +# c:\program +#: ../../.././Copy of print_workorder.php:243 +#: ../../.././print_workorder.php:255 +#: ../../.././include/i18n.php:126 +msgid "Subscription number" +msgstr "رقم الاشتراك" + +#: ../../.././Copy of taskforce_report.php:49 +#: ../../.././taskforce_report.php:49 +msgid "Task force Action" +msgstr "اجراء مجموعة عمل" + +#: ../../.././Copy of taskforce_report.php:52 +#: ../../.././conf/dccssconfig.php:119 +#: ../../.././include/i18n.php:111 +msgid "Illegal" +msgstr "وصله غير نظامية" + +#: ../../.././Copy of taskforce_report.php:52 +#: ../../.././include/i18n.php:113 +msgid "Not Routed" +msgstr "مشتركون ليسو على المسار" + +#: ../../.././Copy of taskforce_report.php:53 +#: ../../.././taskforce_report.php:58 +#: ../../.././include/i18n.php:116 +msgid "Select task force type:" +msgstr "اختر نوع مجموعة العمل:" + +#: ../../.././Copy of taskforce_report.php:55 +#: taskforce_report.php:76 +#: ../../.././taskforce_report.php:60 +#: ../../.././taskforce_report.php:81 +#: ../../.././include/i18n.php:119 +msgid "Create Task force list" +msgstr "انشاء قائمة مجموعة عمل" + +#: ../../.././Copy of taskforce_report.php:56 +#: taskforce_report.php:92 +#: ../../.././taskforce_report.php:61 +#: ../../.././taskforce_report.php:97 +#: ../../.././include/i18n.php:118 +msgid "Print Task force maps" +msgstr "طباعة خرائط مجموعات العمل" + +#: ../../.././Copy of taskforce_report.php:66 +#: ../../.././taskforce_report.php:71 +msgid "Please select task force type." +msgstr "" + +# c:\program +#: ../../.././Copy of taskforce_report.php:70 +#: ../../.././logbook_report.php:65 +#: ../../.././logbook_report_subscriber.php:63 +#: ../../.././map.php:694 +#: ../../.././meter_query_report.php:64 +#: ../../.././query.php:64 +#: ../../.././querybuilder.php:52 +#: ../../.././taskforce_report.php:75 +#: ../../.././admin/move_subscriber.php:76 +#: ../../.././admin/purge_subscriber.php:63 +#: ../../.././back/map_layerselection.php:629 +#: ../../.././include/i18n.php:62 +#: ../../.././include/i18n.php:73 +#: ../../.././include/dataobject/Public_deliverypoint.php:117 +#: ../../.././include/dataobject/Public_subscriber.php:166 +msgid "denotes required field" +msgstr "الرجاء تعبئة الحقول المطلوبة." + +# c:\program #: ../../.././dataentry_performance_report.php:38 #: ../../.././dataentry_performance_report.php:39 msgid "Data Entry Performance Report" @@ -558,24 +771,6 @@ msgid "Please enter the logbook number." msgstr "الرجاء ادخال رقم المجلد" -# c:\program -#: ../../.././logbook_report.php:65 -#: ../../.././logbook_report_subscriber.php:63 -#: ../../.././map.php:694 -#: ../../.././meter_query_report.php:64 -#: ../../.././query.php:64 -#: ../../.././querybuilder.php:52 -#: ../../.././taskforce_report.php:70 -#: ../../.././admin/move_subscriber.php:76 -#: ../../.././admin/purge_subscriber.php:63 -#: ../../.././back/map_layerselection.php:629 -#: ../../.././include/i18n.php:62 -#: ../../.././include/i18n.php:73 -#: ../../.././include/dataobject/Public_deliverypoint.php:117 -#: ../../.././include/dataobject/Public_subscriber.php:166 -msgid "denotes required field" -msgstr "الرجاء تعبئة الحقول المطلوبة." - # D:\dccss\dccss/logbook_report.php:52 #: ../../.././logbook_report.php:80 #: ../../.././back/Empty_logbook_report.php:45 @@ -1544,34 +1739,10 @@ msgid "Not working meter status report" msgstr "تقرير العدادات المعطلة" -#: ../../.././print_workorder.php:39 -msgid "Task force workorder" -msgstr "امر عمل مجموعة عمل" +#: ../../.././print_workorder.php:69 +msgid "label" +msgstr "" -#: ../../.././print_workorder.php:63 -#: ../../.././include/i18n.php:121 -msgid "German Technical Cooperation-GTZ" -msgstr "الوكالة الالمانية للتعاون الفني- GTZ" - -#: ../../.././print_workorder.php:64 -#: ../../.././include/i18n.php:122 -msgid "Institutional Support to Aleppo Water establishment" -msgstr "مشروع الدعم المؤسسي لمؤسسة مياه حلب" - -#: ../../.././print_workorder.php:65 -#: ../../.././include/i18n.php:123 -msgid "Task Force" -msgstr "مجموعة عمل" - -#: ../../.././print_workorder.php:68 -#: ../../.././include/i18n.php:114 -msgid "Task force - " -msgstr "مجموعة عمل - " - -#: ../../.././print_workorder.php:68 -msgid "taskforce" -msgstr "مجموعة عمل" - # c:\program #: ../../.././query.php:45 msgid "Bill" @@ -1931,40 +2102,31 @@ msgid "Surveyed Subscribers" msgstr "المشتركين الممسوحين" -#: ../../.././taskforce_report.php:49 -msgid "Task force Action" -msgstr "اجراء مجموعة عمل" - #: ../../.././taskforce_report.php:52 -#: ../../.././include/i18n.php:111 -msgid "Illegal" -msgstr "وصله غير نظامية" +msgid "Illegal-TF4" +msgstr "وصله غير نظامية-TF4" -#: ../../.././taskforce_report.php:52 -#: ../../.././include/i18n.php:113 -msgid "Not Routed" -msgstr "مشتركون ليسو على المسار" - +# c:\program #: ../../.././taskforce_report.php:53 -#: ../../.././include/i18n.php:116 -msgid "Select task force type:" -msgstr "اختر نوع مجموعة العمل:" +msgid "Miss placed - wrong logbook number-TF2" +msgstr "مشترك على المسار مع رقم مجلد خطأ - TF2" +#: ../../.././taskforce_report.php:54 +msgid "Miss placed - wrong collection area-TF2" +msgstr "مشترك في منطقة جباية خطأ - TF2" + #: ../../.././taskforce_report.php:55 -#: ../../.././taskforce_report.php:76 -#: ../../.././include/i18n.php:119 -msgid "Create Task force list" -msgstr "انشاء قائمة مجموعة عمل" +msgid "Routed and zero consumption-TF1" +msgstr "مشترك على المسار مع كمية استهلاك صفر - TF1" #: ../../.././taskforce_report.php:56 -#: ../../.././taskforce_report.php:92 -#: ../../.././include/i18n.php:118 -msgid "Print Task force maps" -msgstr "طباعة خرائط مجموعات العمل" +msgid "Not Routed and zero consumption-Unkown-TF2" +msgstr "مشترك ليس على المسار مع كمية استهلاك صفر-غير معروف - TF2" -#: ../../.././taskforce_report.php:66 -msgid "Please select task force type." -msgstr "" +# c:\program +#: ../../.././taskforce_report.php:57 +msgid "Damaged-TF8" +msgstr "عدادات محطمة - TF8" # D:\dccss\dccss/admin/bill_loader.php:29 #: ../../.././admin/bill_loader.php:27 @@ -2166,7 +2328,7 @@ # c:\program #: ../../.././admin/shapefile_loader.php:82 msgid "Name: " -msgstr "الاسم:" +msgstr "اسم المشترك:" # C:\Program #: ../../.././admin/shapefile_loader.php:83 @@ -2305,6 +2467,29 @@ msgid "2" msgstr "" +# c:\program +#: ../../.././conf/dccssconfig.php:119 +msgid "Miss placed - wrong logbook number" +msgstr "مشترك على المسار مع رقم مجلد خطأ" + +#: ../../.././conf/dccssconfig.php:119 +msgid "Miss placed - wrong collection area" +msgstr "مشترك في منطقة جباية خطأ" + +#: ../../.././conf/dccssconfig.php:119 +msgid "Routed and zero consumption" +msgstr "مشترك على المسار مع كمية استهلاك صفر" + +#: ../../.././conf/dccssconfig.php:119 +msgid "Not Routed and zero consumption-Unkown" +msgstr "مشترك ليس على المسار مع كمية استهلاك صفر" + +# c:\program +#: ../../.././conf/dccssconfig.php:119 +#: ../../.././include/i18n.php:37 +msgid "Damaged" +msgstr "محطم" + # e:\program #: ../../.././include/dccsspage.php:187 #: ../../.././include/dcmpostgis.php:30 @@ -2473,7 +2658,7 @@ # e:\program #: ../../.././include/dcmmspear.php:118 msgid "name" -msgstr "الاسم" +msgstr "اسم المشترك" # e:\program #: ../../.././include/dcmmspear.php:134 @@ -2584,11 +2769,6 @@ msgstr "ليتر" # c:\program -#: ../../.././include/i18n.php:37 -msgid "Damaged" -msgstr "محطم" - -# c:\program #: ../../.././include/i18n.php:38 msgid "Disconnected" msgstr "مفصول" @@ -2848,18 +3028,37 @@ #: ../../.././include/i18n.php:115 msgid "Task Force Action" -msgstr "" +msgstr "اجراء مجموعة العمل" #: ../../.././include/i18n.php:117 msgid "Task force workorders" msgstr "اوامر عمل مجموعات العمل" +#: ../../.././include/i18n.php:123 +msgid "Task Force" +msgstr "مجموعة عمل" + # c:\program -#: ../../.././include/dataobject/Public_bill.php:32 -#: ../../.././include/dataobject/Public_subscriber.php:202 -msgid "Logbook" -msgstr "رقم المجلد" +#: ../../.././include/i18n.php:124 +msgid "subsequence" +msgstr "رقم التخصيص الفرعي" +#: ../../.././include/i18n.php:135 +msgid "routedandzerocons" +msgstr "على المسار مع كمية استهلاك صفر" + +#: ../../.././include/i18n.php:136 +msgid "routedandmissplaced" +msgstr "مشترك على المسار ولكن لرقم مجلد خطأ" + +#: ../../.././include/i18n.php:137 +msgid "collectionmissplaced" +msgstr "مشترك في منطقة جباية خطأ" + +#: ../../.././include/i18n.php:138 +msgid "notroutedandzerocons" +msgstr "مشترك ليس على المسار مع كمية استهلاك صفر" + # c:\program #: ../../.././include/dataobject/Public_bill.php:33 #: ../../.././include/dataobject/Public_subscriber.php:203 @@ -2867,30 +3066,12 @@ msgstr "رقم الاشتراك" # c:\program -#: ../../.././include/dataobject/Public_bill.php:34 -#: ../../.././include/dataobject/Public_subscriber.php:204 -msgid "Name" -msgstr "الاسم" - -# c:\program #: ../../.././include/dataobject/Public_bill.php:35 #: ../../.././include/dataobject/Public_subscriber.php:205 msgid "Meter" msgstr "متر" # c:\program -#: ../../.././include/dataobject/Public_bill.php:36 -#: ../../.././include/dataobject/Public_subscriber.php:206 -msgid "Sequence" -msgstr "رقم التخصيص " - -# c:\program -#: ../../.././include/dataobject/Public_bill.php:37 -#: ../../.././include/dataobject/Public_subscriber.php:207 -msgid "Subsequence" -msgstr "رقم التخصيص الفرعي" - -# c:\program #: ../../.././include/dataobject/Public_bill.php:53 msgid "[Get Suscriber Information]" msgstr "معلومات المشتركين" Modified: trunk/dccss/print_workorder.php =================================================================== --- trunk/dccss/print_workorder.php 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/print_workorder.php 2006-07-12 08:54:33 UTC (rev 320) @@ -26,12 +26,13 @@ include("include/dcmmaputil.php"); //print_r($_SESSION['TaskforceArray']); for ($m=0;$m<count($_SESSION['TaskforceArray']);$m++){ + $record=$m+1; //print_r($m); $DcssPage = new DccssPage(basename(__FILE__)); $strDirection = (0 == strncmp($_SESSION['language'],'ar', 2)) ? 'rtl' : 'ltr'; - +$date=date("F j, Y, g:i a"); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd"> <html lang="<?= $_SESSION["language"] ?>"> @@ -42,13 +43,13 @@ <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)) ? 'ltr' : - 'rtl' ?>" onload="if(window.print) window.print();"> -<table border="1" summary="Header" width="100%" height="4%" cellspacing="0" + dir="<?= (0 == strncmp($_SESSION['language'],'ar', 2)) ? 'rtl' : + 'ltr' ?>" > +<table border="1" summary="Header" width="98%" height="4%" cellspacing="0" cellpadding="0" nowrap="nowrap"> <tr> <?php - $query = "select dpsequence,logbooknumber,sequence,name,subscription, + $query = "select dpsequence,logbooknumber,sequence,subsequence,name,subscription, serialnumber from taskforce_".$_REQUEST['taskforce']." where dpsequence=". $_SESSION['TaskforceArray'][$m]['dpsequence']; //echo ($query); @@ -65,16 +66,60 @@ </td> <td align="center"> - </a><b align="middle"><?= _("Task force - ") ?><?= _($_REQUEST['taskforce']) ?></b></td> + </a><b align="middle"><?= _("Task force - ") ?><?= _($_REQUEST['label']) ?></b><br> + </a><b align="middle"><?php echo($record);echo(" "); echo _("of"); echo (" "); + echo(count($_SESSION['TaskforceArray'])); ?></b><br> + </a><b align="middle"><?= _("Date:") ?><?php echo($date); ?></b></td> </td> <td><img src="<?= $_SESSION["OrgLogoSmall"]?>" border="0" align="right" style="height: 1cm" /></td> </tr> </table> -<table border="1" summary="Map" width="100%" height="91%" cellspacing="0" +<table border="1" summary="Map" width="98%" height="70%" cellspacing="0" cellpadding="0" nowrap="nowrap"> <tr> - <td width="85%" valign="top"> <?php + <td width="30%" height="50%" valign="top"> + <table cellspacing="0" cellpadding="0"> <?php + //Customer information + /*echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[0]."</b></font></td>"); + echo("<td width=\"%95\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 0))."</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[1]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 1))."</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[2]."</b></font></td>"); + echo("<td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 2))."</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[3]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 3))."</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[4]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 4))."</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[5]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 5))."</td></tr>"); + */ + echo("<tr><td width=\"%50\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 0)).":</td>"); + echo("<td class=\"input\"><font size=\"1\"><b>".$row[0]."</b></font></td></tr>"); + echo("<tr><td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 1)).":</td>"); + echo("<td class=\"input\"><font size=\"1\"><b>".$row[1]."</b></font></td></tr>"); + echo("<tr><td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 2)).":</td>"); + echo("<td class=\"input\"><font size=\"1\"><b>". + ($row[2] == '' ? ' ' : _($row[2]))."</b></font></td></tr>"); + echo("<td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 3)).":</td>"); + echo("<td class=\"input\"><font size=\"1\"><b>".$row[3]."</b></font></td></tr>"); + echo("<tr><td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 4)).":</td>"); + echo("<td class=\"input\"><font size=\"1\"><b>".$row[4]."</b></font></td></tr>"); + echo("<tr><td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 5)).":</td>"); + echo("<td class=\"input\"><font size=\"1\"><b>".$row[5]."</b></font></td></tr>"); + + + + ?> + </table> + <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br><br> + <table> + <tr><td><font size=\"2\"><?= _("Finish date:") ?></td></tr> + <tr><td><font size=\"2\"><?= _("Responsible name:") ?></td></tr> + <tr><td><font size=\"2\"><?= _("Signiture:") ?></td></tr> + </table> + </td> + <td width="70%" height="50%" valign="top"> <?php $map_path="./"; $map = ms_newMapObj($map_path.sprintf($_SESSION["strMapFile"], substr($_SESSION['language'], 0, 2))); @@ -89,6 +134,7 @@ adjustScalebar($map); $objLayer = $map->getlayerbyname('DeliveryPoint'); + /* if ($objLayer->queryByAttributes("sequence","SEQUENCE=". $_SESSION['TaskforceArray'][$m]['dpsequence'],MS_MULTIPLE) == MS_SUCCESS) { @@ -111,9 +157,9 @@ $map->setextent($oExtents->minx-50,$oExtents->miny-50,$oExtents->maxx+50, $oExtents->maxy+50); } - } - /* - $query = "select box3d(the_geom) from deliverypoint where sequence=". + }*/ + + $query = "select X(the_geom),Y(the_geom) from deliverypoint where sequence=". $_SESSION['TaskforceArray'][$m]['dpsequence']; $resultextent = pg_query($query); $numrows = pg_numrows($resultextent); @@ -121,8 +167,9 @@ for($i=0; $i<$numrows;$i++) { $r = pg_fetch_row($resultextent, $i); - $box3d = $r[0]; - $box3d = str_replace("BOX3D(", "", $box3d); + $pointX = $r[0]; + $pointY=$r[1]; + /*$box3d = str_replace("BOX3D(", "", $box3d); $token = strtok($box3d, " "); $minx = $token; @@ -132,58 +179,90 @@ $token = strtok(" "); $maxx = $token+1; $token = strtok(" "); - $maxy = $token+1; + $maxy = $token+1;*/ } - $map->setextent($minx-50,$miny-50,$maxx+50,$maxy+50); - */ + //$map->setextent($minx-50,$miny-50,$maxx+50,$maxy+50); + $map->setextent($pointX-50,$pointY-50,$pointX+50,$pointY+50); + //Display the route lines + + $objLayer = $map->getlayerbyname('route'); $objLayer->set("status",MS_ON); $objLayer = $map->getlayerbyname('collection'); $objLayer->set("status", MS_ON); $objLayer = $map->getlayerbyname('grid'); $objLayer->set("status", MS_OFF); + $image=$map->draw(); - $image=$map->drawquery(); + //$image=$map->drawquery(); $pointObj = ms_newPointObj(); - $pointObj->setXY($oExtents->minx, $oExtents->miny); + //$pointObj->setXY($oExtents->minx, $oExtents->miny); + $pointObj->setXY($pointX, $pointY); $glrLayer = $map->getLayerByName("center"); $pointObj->draw($map, $glrLayer,$image, 0, 1); + $pointObj->free(); + $image_url=$image->saveWebImage("MS_PNG", 1, 1, 0); + $map->labelcache->free(); + $image->free(); - $image_url=$image->saveWebImage("MS_PNG", 1, 1, 0); + $map->freeQuery('*all*'); + ?> <a href="index.php?PHPSESSID=<?= session_id()?>"><img src="<?= $image_url ?>" alt="Workorder Map" style="width: 20cm; height: 14cm;"/></a> </td> - <td width=30% height=95% valign="top"> - <table cellspacing="0" cellpadding="0"> <?php - //Customer information - echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[0]."</b></font></td>"); - echo("<td width=\"%40\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 0)).":</td></tr>"); - echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[1]."</b></font></td>"); - echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 1)).":</td></tr>"); - echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[2]."</b></font></td>"); - echo("<td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 2)).":</td></tr>"); - echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[3]."</b></font></td>"); - echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 3)).":</td></tr>"); - echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[4]."</b></font></td>"); - echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 4)).":</td></tr>"); - echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[5]."</b></font></td>"); - echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 5)).":</td></tr>"); - - ?> - </table> - </td> + </tr> </table> +<table border="1" summary="Header2" width="98%" height="4%" cellspacing="0" + cellpadding="0" cellborder="1" > + +<th><?= _("Check") ?></th> + <th><font size=\"1\">1.<?= _("Billing") ?></th><th><font size=\"1\">2.<?= _("Meter readings unit") ?></th> + <th><font size=\"1\">3.<?= _("Meter Archiving") ?></th><th><font size=\"1\">4.<?= _("Subscription Archiving") ?></th> + <th><font size=\"1\">5.<?= _("Field check") ?></th><th><font size=\"1\">6.<?= _("Billing data update") ?></th> + <th><font size=\"1\">7.<?= _("CSS data update") ?></th> + + <tr><td class=label> <font size=\"1\"><?= _("Logbook")?></td><?php + for ($e=0;$e<7;$e++){ + echo('<td></td>'); + } + ?></tr> + <tr><td class=label> <font size=\"1\"><?= _("Sequence")?></td><?php + for ($e=0;$e<7;$e++){ + echo('<td></td>'); + } + ?></tr> + <tr><td class=label> <font size=\"1\"><?= _("Subsequence")?></td><?php + for ($e=0;$e<7;$e++){ + echo('<td></td>'); + } + ?></tr> + <tr><td class=label> <font size=\"1\"><?= _("Name")?></td><?php + for ($e=0;$e<7;$e++){ + echo('<td></td>'); + } + ?></tr> + <tr><td class=label> <font size=\"1\"><?= _("Serial number")?></td><?php + for ($e=0;$e<7;$e++){ + echo('<td></td>'); + } + ?></tr> + <tr><td class=label> <font size=\"1\"><?= _("Subscription number")?></td><?php + for ($e=0;$e<7;$e++){ + echo('<td></td>'); + } + ?></tr> +</table> </body> </html> <?php - } - ?> +} +?> Modified: trunk/dccss/taskforce_report.php =================================================================== --- trunk/dccss/taskforce_report.php 2006-07-05 06:37:42 UTC (rev 319) +++ trunk/dccss/taskforce_report.php 2006-07-12 08:54:33 UTC (rev 320) @@ -49,9 +49,14 @@ $Taskforceform->addElement('header', null, _('Task force Action')); //$Taskforceform->addElement('checkbox', 'meternumber', //_('Query Meter Number')); - +$arrTask= array("illegal" => _("Illegal-TF4"),'routedandmissplaced' => +_("Miss placed - wrong logbook number-TF2"),'collectionmissplaced'=> +_("Miss placed - wrong collection area-TF2"),'routedandzerocons'=> +_("Routed and zero consumption-TF1"), +'notroutedandzerocons'=>_("Not Routed and zero consumption-Unkown-TF2"), +'damaged'=>_("Damaged-TF8")); $Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), -$_SESSION['arrTaskforce']); +$arrTask); $objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); $objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); @@ -95,7 +100,8 @@ $result=pg_query($strQuery); $arrrows=pg_fetch_all($result); $_SESSION['TaskforceArray']=$arrrows; - header('location:print_workorder?taskforce='.$_POST['TaskForce']); + header('location:print_workorder?taskforce='.$_POST['TaskForce'].'&label='. + $arrTask[$Taskforceform->exportvalue('TaskForce')]); // print_r($arrrows); break; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-05 06:38:08
|
Revision: 319 Author: maher_karim Date: 2006-07-04 23:37:42 -0700 (Tue, 04 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=319&view=rev Log Message: ----------- 2006-07-05 Maher Abdel karim <mah...@do...> * script/create_css_ddl.sql: add route table.add id field to metercabinet layer. Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/doc/development/data_model.vsd trunk/dccss/script/create_css_ddl.sql Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-03 13:40:33 UTC (rev 318) +++ trunk/dccss/changelog 2006-07-05 06:37:42 UTC (rev 319) @@ -1,3 +1,8 @@ +2006-07-05 Maher Abdel karim <mah...@do...> + + * script/create_css_ddl.sql: add route table.add id field to + metercabinet layer. + 2006-07-03 Maher Abdel karim <mah...@do...> * taskforce_report.php:add taskforce type to request. Modified: trunk/dccss/doc/development/data_model.vsd =================================================================== (Binary files differ) Modified: trunk/dccss/script/create_css_ddl.sql =================================================================== --- trunk/dccss/script/create_css_ddl.sql 2006-07-03 13:40:33 UTC (rev 318) +++ trunk/dccss/script/create_css_ddl.sql 2006-07-05 06:37:42 UTC (rev 319) @@ -160,9 +160,12 @@ 'Table that allows to convert different volume units to cubic meters.'; create table MeterCabinet ( - PewssaID varchar(16) primary key + PewssaID varchar(16) primary key, + id integer ); - +create table route( +logbookno integer; +); create table center ( id varchar(64), gid serial @@ -735,3 +738,5 @@ GRANT ALL ON TABLE subscriber_seq TO GROUP dccssadministrator; grant all on table MeterLocation to group dccssuser; grant all on table MeterLocation to group dccssadministrator; +grant all on table route to group dccssuser; +grant all on table route to group dccssadministrator; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-03 13:41:02
|
Revision: 318 Author: maher_karim Date: 2006-07-03 06:40:33 -0700 (Mon, 03 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=318&view=rev Log Message: ----------- Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/conf/dccss_pewssa_ar.map trunk/dccss/conf/dccss_pewssa_en.map trunk/dccss/conf/dccssconfig.php.default trunk/dccss/print_workorder.php trunk/dccss/script/create_views.sql trunk/dccss/taskforce_report.php Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/changelog 2006-07-03 13:40:33 UTC (rev 318) @@ -1,3 +1,15 @@ +2006-07-03 Maher Abdel karim <mah...@do...> + + * taskforce_report.php:add taskforce type to request. + * print_workorder.php:control the layer display. + * script/create_views.sql: add more task force views. + * conf/dccss_pewssa_en.map: + * conf/dccss_pewssa_en.map:Add collection area, and route layers. + * doc/development/data_model.vsd:updated data model to include the + collection area, and meter cabinet in the data model.These are used for + task force. + * conf/dccssconfig.php.default: Add an editable taskforce list. + 2006-06-30 Maher Abdel karim <mah...@do...> * taskforce_report.php:add taskforce type to request. Modified: trunk/dccss/conf/dccss_pewssa_ar.map =================================================================== --- trunk/dccss/conf/dccss_pewssa_ar.map 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/conf/dccss_pewssa_ar.map 2006-07-03 13:40:33 UTC (rev 318) @@ -81,6 +81,8 @@ STATUS on COLOR 255 255 0 END #QUERYMAP +#Collection area boundaries. + LAYER #building TRANSPARENCY 100 @@ -274,7 +276,7 @@ END TOLERANCE 50 END # Layer -# Empty layer, used for AreaOfInterest center points +# Empty layer, layer connectiontype PostGIS CONNECTION "dbname=dccss user=dccss password=dccss host=localhost" @@ -298,10 +300,10 @@ END layer connectiontype PostGIS - CONNECTION "dbname=dccss user=dccss password=dccss host=localhost" + CONNECTION "dbname=dccss user=dummy password=dummy host=localhost" name "route" type line - status On + status Off labelitem "logbookno" DATA "the_geom from route" CLASS @@ -309,9 +311,16 @@ TEMPLATE 'template.html' #PEN STYLE - SIZE 20 + SIZE 30 COLOR 100 102 100 END #STYLE + #label + #color 100 102 100 + #position cc + #font arial + #type truetype + #size 20 + #end END METADATA "DESCRIPTION" "route line" @@ -319,5 +328,40 @@ END TOLERANCE 15 END + + + LAYER #collection + TRANSPARENCY 100 + NAME 'collection' + + TOLERANCE 3 + TOLERANCEUNITS pixels + CONNECTIONTYPE postgis + CONNECTION "dbname=dccss user=dummy password=dummy host=localhost" + DATA "the_geom from collect using unique id using SRID=-1" + labelitem "str_reverse(shape_arabic(dcmmstranslation('ar',name)))" + HEADER 'header.html' + FOOTER 'footer.html' + LABELCACHE on + #MINSCALE 1000 + STATUS OFF + + TRANSFORM true + TYPE polygon + CLASS + NAME 'collection' + outlinecolor 225 200 175 + SIZE 3 + label + color 10 15 10 + position auto + font arial + type truetype + size 30 + end + END #CLASS + + END #LAYER + END #MAP Modified: trunk/dccss/conf/dccss_pewssa_en.map =================================================================== --- trunk/dccss/conf/dccss_pewssa_en.map 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/conf/dccss_pewssa_en.map 2006-07-03 13:40:33 UTC (rev 318) @@ -290,6 +290,71 @@ "RESULT_FIELDS" "" END TOLERANCE 15 +END +layer + connectiontype PostGIS + CONNECTION "dbname=dccss user=dummy password=dummy host=localhost" + name "route" + type line + status Off + labelitem "logbookno" + DATA "the_geom from route" + CLASS + NAME "route" + TEMPLATE 'template.html' + #PEN + STYLE + SIZE 30 + COLOR 100 102 100 + END #STYLE + #label + #color 100 102 100 + #position cc + #font arial + #type truetype + #size 20 + #end + END + METADATA + "DESCRIPTION" "route line" + "RESULT_FIELDS" "" + END + TOLERANCE 15 END + + + LAYER #collection + TRANSPARENCY 100 + NAME 'collection' + + TOLERANCE 3 + TOLERANCEUNITS pixels + CONNECTIONTYPE postgis + CONNECTION "dbname=dccss user=dummy password=dummy host=localhost" + DATA "the_geom from collect using unique id using SRID=-1" + labelitem "dcmmstranslation('en',name)" + HEADER 'header.html' + FOOTER 'footer.html' + LABELCACHE on + #MINSCALE 1000 + STATUS OFF + + TRANSFORM true + TYPE polygon + CLASS + NAME 'collection' + outlinecolor 225 200 175 + SIZE 3 + label + color 10 15 10 + position auto + font arial + type truetype + size 30 + end + END #CLASS + + END #LAYER + END #MAP Modified: trunk/dccss/conf/dccssconfig.php.default =================================================================== --- trunk/dccss/conf/dccssconfig.php.default 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/conf/dccssconfig.php.default 2006-07-03 13:40:33 UTC (rev 318) @@ -108,5 +108,20 @@ * Set the DCCSS administrator group name */ $_SESSION['DCCSSadministratorGroup']='dccssadministrator'; +/** +** CSS survey Performance +*/ +$_SESSION['Planned']=array(0=>array(_('11'),2000),1=>array(_('12'),17500), +2=>array(_('1'),35000),3=>array(_('2'),45000)); +/** +* Set the Task force types +*/ +$_SESSION['arrTaskforce'] = array('illegal'=>_('Illegal'),'routedandmissplaced'=> +_('Miss placed - wrong logbook number'),'collectionmissplaced'=> +_("Miss placed - wrong collection area"),'routedandzerocons'=> +_("Routed and zero consumption") +,'notroutedandzerocons'=>_("Not Routed and zero consumption-Unkown"), +'damaged'=>_("Damaged")); + ?> Modified: trunk/dccss/print_workorder.php =================================================================== --- trunk/dccss/print_workorder.php 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/print_workorder.php 2006-07-03 13:40:33 UTC (rev 318) @@ -137,14 +137,21 @@ $map->setextent($minx-50,$miny-50,$maxx+50,$maxy+50); */ + + //Display the route lines + $objLayer = $map->getlayerbyname('route'); + $objLayer->set("status",MS_ON); + $objLayer = $map->getlayerbyname('collection'); + $objLayer->set("status", MS_ON); + $objLayer = $map->getlayerbyname('grid'); + $objLayer->set("status", MS_OFF); + $image=$map->draw(); $image=$map->drawquery(); $pointObj = ms_newPointObj(); $pointObj->setXY($oExtents->minx, $oExtents->miny); $glrLayer = $map->getLayerByName("center"); $pointObj->draw($map, $glrLayer,$image, 0, 1); - //Display the route lines - $objLayer = $map->getlayerbyname('route'); - $objLayer->set("status", MS_ON); + $image_url=$image->saveWebImage("MS_PNG", 1, 1, 0); ?> <a href="index.php?PHPSESSID=<?= session_id()?>"><img src="<?= Modified: trunk/dccss/script/create_views.sql =================================================================== --- trunk/dccss/script/create_views.sql 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/script/create_views.sql 2006-07-03 13:40:33 UTC (rev 318) @@ -361,8 +361,39 @@ route.logbookno and deliverypoint.geocode=subscriber.geocode and subscriber.logbooknumber <> 9999 order by logbooknumber ; +create or replace view taskforce_collectionmissplaced as +select deliverypoint.sequence as dpsequence, subscriber.logbooknumber, +subscriber."sequence", subscriber.subsequence, +subscriber.name, subscriber.subscription, + subscriber.serialnumber from subscriber,deliverypoint,collect where + deliverypoint.geocode=subscriber.geocode and +intersects(collect.the_geom,deliverypoint.the_geom) and collect.id=1 and +subscriber.logbooknumber in (2460,2481,2420,2428, +2430,2466,2413,2417, +2311,2309,2308,2358,2338,2353,2329,2364,2376,2391,2333,2366,2368,2370,2442, +2374,2372,2447,2405,2402,2444,2348,2381,2342,2316,2306,2320,2324,2399,2490,2468, +2471, +2464,2424,2426,2422,2415,2450,2455,2439,2434,2484,2486,2396,2407,2300,2303,2330, +2331,2343,2365) +union all +select deliverypoint.sequence as dpsequence, subscriber.logbooknumber, +subscriber."sequence", subscriber.subsequence, +subscriber.name, subscriber.subscription, + subscriber.serialnumber from subscriber,deliverypoint,collect where + deliverypoint.geocode=subscriber.geocode and +intersects(collect.the_geom,deliverypoint.the_geom) and collect.id=2 and +subscriber.logbooknumber in (2530,2532,2535,2537,2538, +2541,2543,2545,2550,2553,2558,2560,2563,2565,2568,2575,2578,2586,2585,2587, +2588,2589,2590,2591,2593,2592,2595,2598, +2601,2603,2604,2606,2610,2613,2617,2620,2623,2628,2631,2634,2637,3640,2641, +2642,2644,2646,2648,3652,2655,2662,2664, +2666,2667,2670,2672,2674,2677 +,2678,2680); + + -- user access rights grant all on LandmarkView to public; +grant all on taskforce_collectionmissplaced to public; grant all on taskforce_routedandmissplaced to public; grant all on taskforce_illegal to public; grant all on TermView to public; Modified: trunk/dccss/taskforce_report.php =================================================================== --- trunk/dccss/taskforce_report.php 2006-07-02 06:31:32 UTC (rev 317) +++ trunk/dccss/taskforce_report.php 2006-07-03 13:40:33 UTC (rev 318) @@ -49,13 +49,13 @@ $Taskforceform->addElement('header', null, _('Task force Action')); //$Taskforceform->addElement('checkbox', 'meternumber', //_('Query Meter Number')); -$arrTaskforce = array('illegal'=>_('Illegal'),'routedandmissplaced'=>_('Not Routed')); + $Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), -$arrTaskforce); +$_SESSION['arrTaskforce']); $objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); $objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); -print_r($_POST); + $grpButton = new HTML_QuickForm_Group('ButtonGroup', null, array($objSubmit,$objPrintSubmit)); $Taskforceform->addElement($grpButton); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-07-02 06:33:15
|
Revision: 317 Author: maher_karim Date: 2006-07-01 23:31:32 -0700 (Sat, 01 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=317&view=rev Log Message: ----------- 2006-06-30 Maher Abdel karim <mah...@do...> * taskforce_report.php:add taskforce type to request. * print_workorder.php:prepare task force map based on request. * script/create_views.sql: add taskforce_routedandmissplaced. * include/i18n.php: * locale/ar/dccss.po:add translations. Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/conf/dccss_pewssa_ar.map trunk/dccss/conf/dccss_pewssa_en.map trunk/dccss/etc/dccss_flyer.doc trunk/dccss/include/i18n.php trunk/dccss/locale/ar/LC_MESSAGES/dccss.po trunk/dccss/script/create_views.sql Added Paths: ----------- trunk/dccss/print_workorder.php trunk/dccss/taskforce_report.php Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-07-02 06:23:30 UTC (rev 316) +++ trunk/dccss/changelog 2006-07-02 06:31:32 UTC (rev 317) @@ -1,8 +1,21 @@ +2006-06-30 Maher Abdel karim <mah...@do...> + + * taskforce_report.php:add taskforce type to request. + * print_workorder.php:prepare task force map based on request. + * script/create_views.sql: add taskforce_routedandmissplaced. + * include/i18n.php: + * locale/ar/dccss.po:add translations. + +2006-06-28 Maher Abdel karim <mah...@do...> + + * conf/dccss_pewssa_en.map: + * conf/dccss_pewssa_en.map:Adjust the center layer symbol, and size. + 2006-06-26 Maher Abdel karim <mah...@do...> * script/create_views.sql:Create task force views. - * Taskforce_report.php:Add task force report which create list for task - force actions, and create maps for them. + * taskforce_report.php:Add task force report which create list for task + force actions, and create maps for them.Adjut file name, and copyright. * report.php:Add link for taskforce_report.php 2006-04-16 Steffen Macke <Ste...@do...> Modified: trunk/dccss/conf/dccss_pewssa_ar.map =================================================================== --- trunk/dccss/conf/dccss_pewssa_ar.map 2006-07-02 06:23:30 UTC (rev 316) +++ trunk/dccss/conf/dccss_pewssa_ar.map 2006-07-02 06:31:32 UTC (rev 317) @@ -285,8 +285,8 @@ CLASS NAME "Center Point" #template "ttt_query.html" - SYMBOL "circle" - SIZE 10 + SYMBOL "SQUARE" + SIZE 30 color 255 0 0 outlinecolor 255 255 255 END @@ -296,5 +296,28 @@ END TOLERANCE 15 END +layer + connectiontype PostGIS + CONNECTION "dbname=dccss user=dccss password=dccss host=localhost" + name "route" + type line + status On + labelitem "logbookno" + DATA "the_geom from route" + CLASS + NAME "route" + TEMPLATE 'template.html' + #PEN + STYLE + SIZE 20 + COLOR 100 102 100 + END #STYLE + END + METADATA + "DESCRIPTION" "route line" + "RESULT_FIELDS" "" + END + TOLERANCE 15 +END END #MAP Modified: trunk/dccss/conf/dccss_pewssa_en.map =================================================================== --- trunk/dccss/conf/dccss_pewssa_en.map 2006-07-02 06:23:30 UTC (rev 316) +++ trunk/dccss/conf/dccss_pewssa_en.map 2006-07-02 06:31:32 UTC (rev 317) @@ -82,7 +82,7 @@ END #QUERYMAP LAYER #building - TRANSPARENCY 100 + NAME 'building' TOLERANCE 3 @@ -90,29 +90,24 @@ connectiontype PostGIS CONNECTION "dbname=dccss user=dccss password=dccss host=localhost" data "the_geom from building using SRID=-1" - HEADER 'header.html' - FOOTER 'footer.html' + LABELCACHE on -# TILEINDEX '' -# TILEITEM '' STATUS on - DEBUG false - TRANSFORM true TYPE polygon CLASS NAME 'building' - TEMPLATE 'template.html' - #RASTERFILL_STYLE_SOLID + template "ttt_query.html" + STYLE COLOR 255 251 195 - BACKGROUNDCOLOR 255 255 255 - END #STYLE - #OUTLINE SYMBOL - STYLE - OUTLINECOLOR 0 0 0 - SIZE 1 - END + #BACKGROUNDCOLOR 255 255 255 + END END #CLASS + METADATA + "DESCRIPTION" "building" + "RESULT_FIELDS" "gid" + END + END #LAYER LAYER #landmark @@ -156,7 +151,7 @@ STATUS default TOLERANCE 3 TOLERANCEUNITS pixels - DATA 'C:\Program Files\dccss\dccss\data\water\pressurizedmain.shp' + DATA 'C:\Program Files\dccss\data\water\pressurizedmain.shp' HEADER 'header.html' FOOTER 'footer.html' LABELCACHE on @@ -183,7 +178,7 @@ TOLERANCE 3 TOLERANCEUNITS pixels - DATA 'C:\Program Files\dccss\dccss\data\sewer\gravitymain.shp' + DATA 'C:\Program Files\dccss\data\sewer\gravitymain.shp' HEADER 'header.html' FOOTER 'footer.html' LABELCACHE on @@ -251,7 +246,8 @@ TYPE POINT STATUS DEFAULT CONNECTION "dbname=dccss user=dccss password=dccss host=localhost" - DATA "the_geom from DeliveryPoint using unique sequence using SRID=-1" + #DATA "E:/data/jv/customer/deliverypoint" + DATA "the_geom from DeliveryPoint using SRID=-1" labelitem "sequence" CLASS NAME 'DeliveryPoint' @@ -269,7 +265,7 @@ END METADATA "DESCRIPTION" "DeliveryPoint" - "RESULT_FIELDS" "sequence geocode owner" + "RESULT_FIELDS" "sequence geocode owner shopcount" END TOLERANCE 50 END # Layer @@ -284,8 +280,8 @@ CLASS NAME "Center Point" #template "ttt_query.html" - SYMBOL "circle" - SIZE 10 + SYMBOL "SQUARE" + SIZE 30 color 255 0 0 outlinecolor 255 255 255 END Modified: trunk/dccss/etc/dccss_flyer.doc =================================================================== (Binary files differ) Modified: trunk/dccss/include/i18n.php =================================================================== --- trunk/dccss/include/i18n.php 2006-07-02 06:23:30 UTC (rev 316) +++ trunk/dccss/include/i18n.php 2006-07-02 06:31:32 UTC (rev 317) @@ -103,7 +103,24 @@ _("Table"); _("Legal Connection"); _("legal connection"); -_("Unsuitable") +_("Unsuitable"); +_("dpsequence"); +_("logbooknumber"); +_("subscription"); +_("serialnumber"); +_("Illegal"); +_("illegal"); +_("Not Routed"); +_("Task force - "); +_("Task Force Action"); +_("Select task force type:"); +_("Task force workorders"); +_("Print Task force maps"); +_("Create Task force list"); +_("DCCSS Task force Report"); +_("German Technical Cooperation-GTZ"); +_("Institutional Support to Aleppo Water establishment"); +_("Task Force"); ?> Modified: trunk/dccss/locale/ar/LC_MESSAGES/dccss.po =================================================================== --- trunk/dccss/locale/ar/LC_MESSAGES/dccss.po 2006-07-02 06:23:30 UTC (rev 316) +++ trunk/dccss/locale/ar/LC_MESSAGES/dccss.po 2006-07-02 06:31:32 UTC (rev 317) @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: DCCSS\n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2006-04-16 08:17+0200\n" -"Last-Translator: Steffen Macke <Ste...@do...>\n" +"PO-Revision-Date: 2006-06-29 12:34+0200\n" +"Last-Translator: t <t>\n" "Language-Team: Dorsch <mah...@do...>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -25,29 +25,273 @@ msgstr "الرجاء زيارة %shttp://dccss.sourceforge.net%s للحصول على اخر الاخبار و التحديثات " # C:\Program -#: ../../.././about.php:61 +#: ../../.././about.php:59 #, php-format msgid "DCCSS uses icons of the %sGNOME%s project." msgstr "" # C:\Program -#: ../../.././about.php:64 +#: ../../.././about.php:62 #, php-format msgid "DCCSS uses %sPostGIS%s." msgstr "يستخدم DCCSS %sPostGIS%s" # C:\Program -#: ../../.././about.php:72 +#: ../../.././about.php:70 #, php-format msgid "DCCSS uses the %sPostgreSQL%s data base management system." msgstr "يستخدم DCCSS قواعد البيانات %sPostgreSQl %s" # C:\Program -#: ../../.././about.php:92 +#: ../../.././about.php:90 msgid "Authors" msgstr "المحررون" +# e:\program +#: ../../.././Copy of map.php:168 +#: ../../.././map.php:168 +#: ../../.././back/map.php:124 +#: ../../.././back/map_layerselection.php:168 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:143 +#, php-format +msgid "Moving DeliveryPoint %s." +msgstr "تحريك نقطة الوصول رقم %s" + +# e:\program +#: ../../.././Copy of map.php:196 +#: ../../.././map.php:196 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid "Deleted DeliveryPoint." +msgstr "تم تحريك نقطة الوصول" + +# D:\dccss\dccss/map.php:134 +#: ../../.././Copy of map.php:196 +#: ../../.././map.php:196 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid " " +msgstr "" + +# e:\program +#: ../../.././Copy of map.php:196 +#: ../../.././map.php:196 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid "DeliveryPointID:" +msgstr "نقطة الوصول" + # c:\program +#: ../../.././Copy of map.php:196 +#: ../../.././map.php:196 +#: ../../.././back/map.php:152 +#: ../../.././back/map_layerselection.php:196 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:171 +msgid "sequence" +msgstr "التسلسل:" + +# c:\program +#: ../../.././Copy of map.php:235 +#: ../../.././map.php:235 +#: ../../.././back/map.php:191 +#: ../../.././back/map_layerselection.php:235 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:210 +msgid "NO geocode value returned" +msgstr "لم يتم ارسال اي رمز جغرافي" + +# e:\program +#: ../../.././Copy of map.php:262 +#: ../../.././map.php:262 +#: ../../.././back/map.php:218 +#: ../../.././back/map_layerselection.php:262 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:237 +msgid "Moved DeliveryPoint." +msgstr "تم تحريك نقطة الوصول" + +# e:\program +#: ../../.././Copy of map.php:408 +#: ../../.././map.php:473 +#: ../../.././back/map.php:521 +#: ../../.././back/map_layerselection.php:409 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:383 +msgid "Legend" +msgstr "مفتاح الخريطة" + +# c:\program +#: ../../.././Copy of map.php:430 +#: ../../.././map.php:495 +#: ../../.././back/map.php:543 +#: ../../.././back/map_layerselection.php:431 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:405 +msgid "Display the Water network" +msgstr "اظهار شبكة المياه" + +# e:\program +#: ../../.././Copy of map.php:431 +#: ../../.././map.php:496 +#: ../../.././back/map.php:544 +#: ../../.././back/map_layerselection.php:432 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:406 +msgid "Water Network" +msgstr "شبكة المياه" + +# e:\program +#: ../../.././Copy of map.php:443 +#: ../../.././map.php:508 +#: ../../.././back/map.php:556 +#: ../../.././back/map_layerselection.php:444 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:418 +msgid "Landmark" +msgstr "معلم" + +# c:\program +#: ../../.././Copy of map.php:451 +#: ../../.././map.php:516 +#: ../../.././back/map.php:564 +#: ../../.././back/map_layerselection.php:452 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:426 +msgid "Refresh the map display" +msgstr "تحديث الخريطة" + +# e:\program +#: ../../.././Copy of map.php:452 +#: ../../.././map.php:517 +#: ../../.././back/map.php:565 +#: ../../.././back/map_layerselection.php:453 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:427 +msgid "Redraw Map" +msgstr "اعادة رسم الخريطة" + +# c:\program +#: ../../.././Copy of map.php:460 +#: ../../.././map.php:525 +#: ../../.././back/map.php:573 +#: ../../.././back/map_layerselection.php:461 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:435 +msgid "Zoom to grid" +msgstr "التكبير الى الشبكة" + +# c:\program +#: ../../.././Copy of map.php:483 +#: ../../.././map.php:548 +#: ../../.././back/map.php:596 +#: ../../.././back/map_layerselection.php:484 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:458 +msgid "Full View" +msgstr "منظر عام" + +# c:\program +#: ../../.././Copy of map.php:508 +#: ../../.././map.php:574 +#: ../../.././back/map.php:621 +#: ../../.././back/map_layerselection.php:509 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:483 +msgid "Select the map size from the list." +msgstr "اختر حجم الخريطة من القائمة" + +# e:\program +#: ../../.././Copy of map.php:509 +#: ../../.././map.php:575 +#: ../../.././back/map.php:622 +#: ../../.././back/map_layerselection.php:510 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:484 +msgid "Map Size" +msgstr "حجم الخريطة" + +# e:\program +#: ../../.././Copy of map.php:551 +#: ../../.././map.php:617 +#: ../../.././back/map.php:659 +#: ../../.././back/map_layerselection.php:552 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:526 +msgid "Keymap" +msgstr "خريطة الدليل" + +# e:\program +#: ../../.././Copy of map.php:555 +#: ../../.././map.php:621 +#: ../../.././back/map.php:663 +#: ../../.././back/map_layerselection.php:556 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:530 +msgid "Click on the key map to view an area." +msgstr "اضغط على خريطة الدليل لاظهار منطقة" + +# e:\program +#: ../../.././Copy of map.php:566 +#: ../../.././map.php:632 +#: ../../.././back/map.php:674 +#: ../../.././back/map_layerselection.php:567 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:541 +msgid "Zoom in further to display more detailed map information." +msgstr "كبر اكثر من اجل اظهار تفاصيل اكثر للخريطة." + +# e:\program +#: ../../.././Copy of map.php:568 +#: ../../.././map.php:634 +#: ../../.././back/map.php:676 +#: ../../.././back/map_layerselection.php:569 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:543 +msgid "Zoom In" +msgstr "تكبير" + +# e:\program +#: ../../.././Copy of map.php:576 +#: ../../.././map.php:642 +#: ../../.././back/map.php:684 +#: ../../.././back/map_layerselection.php:577 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:551 +msgid "Zoom out to display a larger area of the map." +msgstr "صغر من اجل اظهار منطقة اكبر من الخريطة." + +# e:\program +#: ../../.././Copy of map.php:578 +#: ../../.././map.php:644 +#: ../../.././back/map.php:686 +#: ../../.././back/map_layerselection.php:579 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:553 +msgid "Zoom Out" +msgstr "تصغير" + +# e:\program +#: ../../.././Copy of map.php:586 +#: ../../.././map.php:652 +#: ../../.././back/map.php:694 +#: ../../.././back/map_layerselection.php:587 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:561 +msgid "Move the map view without zooming in or out." +msgstr "التحرك في الخريطة بدون تكبير او تصغير." + +# e:\program +#: ../../.././Copy of map.php:588 +#: ../../.././map.php:654 +#: ../../.././back/map.php:696 +#: ../../.././back/map_layerselection.php:589 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:563 +msgid "Pan" +msgstr "تحريك" + +# e:\program +#: ../../.././Copy of map.php:596 +#: ../../.././map.php:662 +#: ../../.././back/map.php:704 +#: ../../.././back/map_layerselection.php:597 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:571 +msgid "Display information about elements in the map." +msgstr "اظهار المعلومات المتعلقة بالعناصر الموجودة في الخريطة." + +# e:\program +#: ../../.././Copy of map.php:598 +#: ../../.././map.php:664 +#: ../../.././back/map.php:706 +#: ../../.././back/map_layerselection.php:599 +#: ../../.././back/map_workingqueryexamplefor ghazi.php:573 +msgid "Identify" +msgstr "اداة التعريف" + +# c:\program #: ../../.././dataentry_performance_report.php:38 #: ../../.././dataentry_performance_report.php:39 msgid "Data Entry Performance Report" @@ -94,6 +338,7 @@ # e:\program #: ../../.././deliverypointpage.php:37 +#: ../../.././back/deliverypointpage.php:37 #: ../../.././include/dcmmaputil.php:191 #: ../../.././include/dcmmaputil.php:228 #: ../../.././include/dcmmaputil.php:229 @@ -102,6 +347,7 @@ # e:\program #: ../../.././deliverypointpage.php:116 +#: ../../.././back/deliverypointpage.php:116 msgid "FATAL ERROR: No id provided in request." msgstr "خطأ نظام: لا يوجد رقم وصول في الطلب" @@ -110,16 +356,21 @@ #: ../../.././deliverypointpage.php:137 #: ../../.././deliverypointpage.php:146 #: ../../.././deliverypointpage.php:196 +#: ../../.././back/deliverypointpage.php:137 +#: ../../.././back/deliverypointpage.php:146 +#: ../../.././back/deliverypointpage.php:196 msgid "View on Map" msgstr "اظهار على الخريطة" # e:\program #: ../../.././deliverypointpage.php:143 +#: ../../.././back/deliverypointpage.php:143 msgid "Delivery Point #" msgstr "رمز العنوان# :" # e:\program #: ../../.././deliverypointpage.php:162 +#: ../../.././back/deliverypointpage.php:162 msgid "" "FATAL ERROR: No Record found for the provided Deliverypoint in the\n" "\t request.</p>" @@ -128,6 +379,7 @@ # c:\program #: ../../.././deliverypointpage.php:169 #: ../../.././subscriberpage.php:223 +#: ../../.././back/deliverypointpage.php:169 #: ../../.././include/dataobject/Public_deliverypoint.php:165 #: ../../.././include/dataobject/Public_subscriber.php:112 msgid "Submit" @@ -136,16 +388,19 @@ # c:\program #: ../../.././deliverypointpage.php:181 #: ../../.././subscriberpage.php:110 +#: ../../.././back/deliverypointpage.php:181 msgid "Failed to save record(s)." msgstr "لم تتم عملية حفظ السجل/السجلات بنجاح" # c:\program #: ../../.././deliverypointpage.php:190 +#: ../../.././back/deliverypointpage.php:190 msgid "Record(s) successfully saved." msgstr "تمت عملية حفظ السجل/السجلات بنجاح" # e:\program #: ../../.././deliverypointpage.php:192 +#: ../../.././back/deliverypointpage.php:192 msgid "Add Subscriber" msgstr "اضافة مشترك" @@ -153,6 +408,7 @@ #: ../../.././deliverypointpage.php:222 #: ../../.././query.php:121 #: ../../.././subscriberpage.php:185 +#: ../../.././back/deliverypointpage.php:222 msgid "Back to delivery point" msgstr "البحث عن نقطة المدخل باستخدام رقم التعريف" @@ -305,10 +561,14 @@ # c:\program #: ../../.././logbook_report.php:65 #: ../../.././logbook_report_subscriber.php:63 +#: ../../.././map.php:694 #: ../../.././meter_query_report.php:64 #: ../../.././query.php:64 +#: ../../.././querybuilder.php:52 +#: ../../.././taskforce_report.php:70 #: ../../.././admin/move_subscriber.php:76 #: ../../.././admin/purge_subscriber.php:63 +#: ../../.././back/map_layerselection.php:629 #: ../../.././include/i18n.php:62 #: ../../.././include/i18n.php:73 #: ../../.././include/dataobject/Public_deliverypoint.php:117 @@ -318,17 +578,20 @@ # D:\dccss\dccss/logbook_report.php:52 #: ../../.././logbook_report.php:80 +#: ../../.././back/Empty_logbook_report.php:45 msgid "PEWSSA Water Subscription Survey" msgstr "مشروع المسح الميداني لاشتراكات المياه مدينة حلب" # c:\program #: ../../.././logbook_report.php:81 #: ../../.././logbook_report_subscriber.php:86 +#: ../../.././back/Empty_logbook_report.php:46 msgid "Grid Number:" msgstr "رقم اللوحة:" # c:\program #: ../../.././logbook_report.php:82 +#: ../../.././back/Empty_logbook_report.php:47 msgid "Form Number:" msgstr "رقم النموذج::" @@ -336,50 +599,60 @@ #: ../../.././logbook_report.php:84 #: ../../.././logbook_report.php:131 #: ../../.././logbook_report_subscriber.php:87 +#: ../../.././back/Empty_logbook_report.php:49 +#: ../../.././back/Empty_logbook_report.php:92 msgid "Delivery Point #:" msgstr "رمز العنوان# :" # c:\program #: ../../.././logbook_report.php:85 +#: ../../.././back/Empty_logbook_report.php:50 #: ../../.././include/dataobject/Public_deliverypoint.php:138 msgid "Survey Date:" msgstr "تاريخ جمع المعلومات :" # c:\program #: ../../.././logbook_report.php:88 +#: ../../.././back/Empty_logbook_report.php:53 msgid "Property Information" msgstr "معلومات العقار" # c:\program #: ../../.././logbook_report.php:90 +#: ../../.././back/Empty_logbook_report.php:55 msgid "1.Property Type:" msgstr "1.نوع العقار" # c:\program #: ../../.././logbook_report.php:92 +#: ../../.././back/Empty_logbook_report.php:57 #: ../../.././include/i18n.php:75 msgid "Arabic" msgstr "دار عربي" # c:\program #: ../../.././logbook_report.php:93 +#: ../../.././back/Empty_logbook_report.php:58 #: ../../.././include/i18n.php:78 msgid "Apartment Building" msgstr "مجمع سكني" # c:\program #: ../../.././logbook_report.php:94 +#: ../../.././back/Empty_logbook_report.php:59 msgid "Commercial Center" msgstr "مجمع تجاري" # c:\program #: ../../.././logbook_report.php:95 +#: ../../.././back/Empty_logbook_report.php:60 #: ../../.././include/i18n.php:82 msgid "Government Dept." msgstr "دوائر رسمية" # c:\program #: ../../.././logbook_report.php:96 +#: ../../.././back/Empty_logbook_report.php:61 #: ../../.././include/i18n.php:76 msgid "Factory" msgstr "مصنع" @@ -388,24 +661,29 @@ #: ../../.././logbook_report.php:97 #: ../../.././logbook_report.php:176 #: ../../.././logbook_report_subscriber.php:133 +#: ../../.././back/Empty_logbook_report.php:62 +#: ../../.././back/Empty_logbook_report.php:136 #: ../../.././include/i18n.php:45 msgid "Hospital" msgstr "مشفى" # c:\program #: ../../.././logbook_report.php:98 +#: ../../.././back/Empty_logbook_report.php:63 #: ../../.././include/i18n.php:79 msgid "Religious" msgstr "دور عباده" # c:\program #: ../../.././logbook_report.php:99 +#: ../../.././back/Empty_logbook_report.php:64 #: ../../.././include/i18n.php:83 msgid "Villa" msgstr "فيلا" # c:\program #: ../../.././logbook_report.php:100 +#: ../../.././back/Empty_logbook_report.php:65 #: ../../.././include/i18n.php:77 msgid "Farm" msgstr "مزرعة" @@ -414,32 +692,39 @@ #: ../../.././logbook_report.php:101 #: ../../.././logbook_report.php:156 #: ../../.././logbook_report_subscriber.php:113 +#: ../../.././back/Empty_logbook_report.php:66 +#: ../../.././back/Empty_logbook_report.php:117 #: ../../.././include/i18n.php:81 msgid "Other" msgstr "أخرى" # D:\dccss\dccss/logbook_report.php:75 #: ../../.././logbook_report.php:103 +#: ../../.././back/Empty_logbook_report.php:68 msgid "2.No. of Floors :" msgstr "2.عدد الطوابق" # D:\dccss\dccss/logbook_report.php:75 #: ../../.././logbook_report.php:104 +#: ../../.././back/Empty_logbook_report.php:69 msgid "3.No. of Flats:" msgstr "3.عدد الشقق" # D:\dccss\dccss/logbook_report.php:76 #: ../../.././logbook_report.php:105 +#: ../../.././back/Empty_logbook_report.php:70 msgid "4.No. of Shops:" msgstr "4.عدد المحلات" # c:\program #: ../../.././logbook_report.php:106 +#: ../../.././back/Empty_logbook_report.php:71 msgid "5.No. of Subscriptions:" msgstr "5.عدد الاشتراكات" # c:\program #: ../../.././logbook_report.php:107 +#: ../../.././back/Empty_logbook_report.php:72 msgid "6.Sewer Network :" msgstr "6.يوجد شبكة صرف صحي :" @@ -450,6 +735,10 @@ #: ../../.././logbook_report.php:143 #: ../../.././logbook_report_subscriber.php:98 #: ../../.././logbook_report_subscriber.php:101 +#: ../../.././back/Empty_logbook_report.php:73 +#: ../../.././back/Empty_logbook_report.php:75 +#: ../../.././back/Empty_logbook_report.php:101 +#: ../../.././back/Empty_logbook_report.php:104 #: ../../.././include/i18n.php:27 #: ../../.././include/dataobject/Public_deliverypoint.php:152 #: ../../.././include/dataobject/Public_deliverypoint.php:153 @@ -464,6 +753,10 @@ #: ../../.././logbook_report.php:144 #: ../../.././logbook_report_subscriber.php:99 #: ../../.././logbook_report_subscriber.php:102 +#: ../../.././back/Empty_logbook_report.php:74 +#: ../../.././back/Empty_logbook_report.php:75 +#: ../../.././back/Empty_logbook_report.php:102 +#: ../../.././back/Empty_logbook_report.php:105 #: ../../.././include/i18n.php:25 #: ../../.././include/dataobject/Public_deliverypoint.php:152 #: ../../.././include/dataobject/Public_deliverypoint.php:153 @@ -473,37 +766,44 @@ # D:\dccss\dccss/logbook_report.php:79 #: ../../.././logbook_report.php:109 +#: ../../.././back/Empty_logbook_report.php:74 msgid "7.Manhole exists " msgstr "7.يوجد ريجار داخل او خارج العقار" # D:\dccss\dccss/logbook_report.php:81 #: ../../.././logbook_report.php:112 +#: ../../.././back/Empty_logbook_report.php:77 msgid "8.Supplying neighbour Delivery point # :" msgstr "8.رمز عنوان نقطة التوصيل من الجيران(ان وجدت)" # c:\program #: ../../.././logbook_report.php:114 +#: ../../.././back/Empty_logbook_report.php:79 msgid "9.Supply Type :" msgstr "9.طريقة التزويد :" # D:\dccss\dccss/logbook_report.php:83 #: ../../.././logbook_report.php:115 +#: ../../.././back/Empty_logbook_report.php:80 msgid "PEWSSA" msgstr "عداد لمؤسسة المياه" # c:\program #: ../../.././logbook_report.php:116 +#: ../../.././back/Empty_logbook_report.php:81 #: ../../.././include/i18n.php:69 msgid "Tanker" msgstr "صهاريج" # D:\dccss\dccss/logbook_report.php:85 #: ../../.././logbook_report.php:117 +#: ../../.././back/Empty_logbook_report.php:82 msgid "Neighbour" msgstr "من الجيران" # c:\program #: ../../.././logbook_report.php:118 +#: ../../.././back/Empty_logbook_report.php:83 #: ../../.././include/i18n.php:70 msgid "Tube Well" msgstr "بئر ماء" @@ -511,208 +811,247 @@ # C:\Program #: ../../.././logbook_report.php:119 #: ../../.././logbook_report.php:149 +#: ../../.././back/Empty_logbook_report.php:84 +#: ../../.././back/Empty_logbook_report.php:110 #: ../../.././include/i18n.php:104 msgid "Legal Connection" msgstr "وصله نظاميه" # D:\dccss\dccss/logbook_report.php:86 #: ../../.././logbook_report.php:120 +#: ../../.././back/Empty_logbook_report.php:85 msgid "10.Cabinet No.(PEWSSA) :" msgstr "10.رقم كابينة المؤسسة" # c:\program #: ../../.././logbook_report.php:121 +#: ../../.././back/Empty_logbook_report.php:86 msgid "11.Surveyour Name:" msgstr "11.اسم منظم الكشف :" # c:\program #: ../../.././logbook_report.php:121 +#: ../../.././back/Empty_logbook_report.php:86 msgid "12.Surveyour No.:" msgstr "12.رقم منظم الكشف" # D:\dccss\dccss/logbook_report.php:90 #: ../../.././logbook_report.php:123 +#: ../../.././back/Empty_logbook_report.php:88 msgid "Signature:" msgstr "التوقيع" # c:\program #: ../../.././logbook_report.php:129 #: ../../.././logbook_report_subscriber.php:84 +#: ../../.././back/Empty_logbook_report.php:90 msgid "Subscription Information" msgstr "المعلومات الخاصة بالاشتراك" # c:\program #: ../../.././logbook_report.php:132 #: ../../.././logbook_report_subscriber.php:88 +#: ../../.././back/Empty_logbook_report.php:93 msgid "Subscription Serial No.:" msgstr "تسلسل الاشتراك :" # c:\program #: ../../.././logbook_report.php:133 #: ../../.././logbook_report_subscriber.php:89 +#: ../../.././back/Empty_logbook_report.php:94 msgid "Survey Date.:" msgstr "تاريخ جمع المعلومات :" # D:\dccss\dccss/logbook_report.php:86 #: ../../.././logbook_report.php:135 +#: ../../.././back/Empty_logbook_report.php:96 msgid "13.Cabinet No.(PEWSSA) : " msgstr "13.رقم كابينة المؤسسة" # c:\program #: ../../.././logbook_report.php:135 +#: ../../.././back/Empty_logbook_report.php:96 msgid "14.Meter Number: " msgstr "14.رقم العداد" # c:\program #: ../../.././logbook_report.php:136 +#: ../../.././back/Empty_logbook_report.php:97 msgid "15.Meter Reading:" msgstr "15.قراءة العداد :" # c:\program #: ../../.././logbook_report.php:138 +#: ../../.././back/Empty_logbook_report.php:99 msgid "16.Meter location Code:" msgstr "16.رمز موقع العداد :" # c:\program #: ../../.././logbook_report.php:139 +#: ../../.././back/Empty_logbook_report.php:100 msgid "17.Connection Before Meter:" msgstr "17.هل يوجد وصلة مكان او قبل العداد :" # c:\program #: ../../.././logbook_report.php:142 +#: ../../.././back/Empty_logbook_report.php:103 msgid "18.Meter Sealing:" msgstr "18.العداد مختوم :" # c:\program #: ../../.././logbook_report.php:144 +#: ../../.././back/Empty_logbook_report.php:105 msgid "19.Flat No.:" msgstr "19.رقم الشقة :" # c:\program #: ../../.././logbook_report.php:145 +#: ../../.././back/Empty_logbook_report.php:106 msgid "20.Floor No.:" msgstr "20.رقم الطابق:" # D:\dccss\dccss/logbook_report.php:105 #: ../../.././logbook_report.php:146 +#: ../../.././back/Empty_logbook_report.php:107 msgid "21.Meter No.(logbook):" msgstr "21.رقم العداد حسب المجلد" # c:\program #: ../../.././logbook_report.php:147 +#: ../../.././back/Empty_logbook_report.php:108 msgid "22.Meter Type:" msgstr "22.نوع العداد" # c:\program #: ../../.././logbook_report.php:149 #: ../../.././logbook_report_subscriber.php:107 +#: ../../.././back/Empty_logbook_report.php:110 msgid " Defence Factories " msgstr "معامل الدفاع" # c:\program #: ../../.././logbook_report.php:150 #: ../../.././logbook_report_subscriber.php:107 +#: ../../.././back/Empty_logbook_report.php:111 msgid " Chinese " msgstr "صيني" # c:\program #: ../../.././logbook_report.php:152 #: ../../.././logbook_report_subscriber.php:109 +#: ../../.././back/Empty_logbook_report.php:113 msgid " French " msgstr "فرنسي" # c:\program #: ../../.././logbook_report.php:152 #: ../../.././logbook_report_subscriber.php:109 +#: ../../.././back/Empty_logbook_report.php:113 msgid " Other " msgstr "أخرى" # c:\program #: ../../.././logbook_report.php:153 +#: ../../.././back/Empty_logbook_report.php:114 msgid "23.Meter Diameter:" msgstr "23.قطر العداد" # c:\program #: ../../.././logbook_report.php:157 +#: ../../.././back/Empty_logbook_report.php:118 msgid "24.Meter Status:" msgstr "24.حالة العداد :" # c:\program #: ../../.././logbook_report.php:158 #: ../../.././logbook_report_subscriber.php:115 +#: ../../.././back/Empty_logbook_report.php:119 msgid " Working " msgstr "عامل" # c:\program #: ../../.././logbook_report.php:158 #: ../../.././logbook_report_subscriber.php:115 +#: ../../.././back/Empty_logbook_report.php:119 msgid " Not working " msgstr "معطل" # c:\program #: ../../.././logbook_report.php:160 #: ../../.././logbook_report_subscriber.php:117 +#: ../../.././back/Empty_logbook_report.php:121 msgid " Damaged " msgstr "محطم" # c:\program #: ../../.././logbook_report.php:160 #: ../../.././logbook_report_subscriber.php:117 +#: ../../.././back/Empty_logbook_report.php:121 msgid " Disconnected " msgstr "مفصول" # c:\program #: ../../.././logbook_report.php:161 #: ../../.././logbook_report_subscriber.php:118 +#: ../../.././back/Empty_logbook_report.php:122 msgid " Turned over " msgstr "مائل" # c:\program #: ../../.././logbook_report.php:162 #: ../../.././logbook_report_subscriber.php:119 +#: ../../.././back/Empty_logbook_report.php:123 msgid "Reversed " msgstr "معكوس" # c:\program #: ../../.././logbook_report.php:163 +#: ../../.././back/Empty_logbook_report.php:124 msgid "25.Leakage:" msgstr "25.يوجد تسرب:" # e:\program #: ../../.././logbook_report.php:164 #: ../../.././logbook_report_subscriber.php:121 +#: ../../.././back/Empty_logbook_report.php:125 msgid " None " msgstr "لا يوجد" # D:\dccss\dccss/logbook_report.php:119 #: ../../.././logbook_report.php:164 #: ../../.././logbook_report_subscriber.php:121 +#: ../../.././back/Empty_logbook_report.php:125 msgid " Minor " msgstr "قليل" # D:\dccss\dccss/logbook_report.php:119 #: ../../.././logbook_report.php:165 #: ../../.././logbook_report_subscriber.php:122 +#: ../../.././back/Empty_logbook_report.php:126 msgid " Major " msgstr "كبير" # c:\program #: ../../.././logbook_report.php:166 +#: ../../.././back/Empty_logbook_report.php:127 msgid "26.Logbook No.:" msgstr "26.رقم المجلد :" # c:\program #: ../../.././logbook_report.php:167 +#: ../../.././back/Empty_logbook_report.php:128 msgid "27.Sequence:" msgstr "27.رقم التخصيص :" # c:\program #: ../../.././logbook_report.php:168 +#: ../../.././back/Empty_logbook_report.php:129 msgid "28.Subscription No.:" msgstr "28.رقم الاشتراك" # c:\program #: ../../.././logbook_report.php:170 +#: ../../.././back/Empty_logbook_report.php:130 msgid "29.Subscriber is the Owner:" msgstr "29.المشترك مالك :" @@ -721,28 +1060,34 @@ #: ../../.././logbook_report.php:202 #: ../../.././logbook_report_subscriber.php:128 #: ../../.././logbook_report_subscriber.php:157 +#: ../../.././back/Empty_logbook_report.php:131 +#: ../../.././back/Empty_logbook_report.php:162 msgid " Yes " msgstr "نعم" # e:\program #: ../../.././logbook_report.php:172 #: ../../.././logbook_report_subscriber.php:129 +#: ../../.././back/Empty_logbook_report.php:132 msgid " No " msgstr "لا" # c:\program #: ../../.././logbook_report.php:173 +#: ../../.././back/Empty_logbook_report.php:133 msgid "30.Name:" msgstr "30.اسم المستفيد :" # c:\program #: ../../.././logbook_report.php:174 +#: ../../.././back/Empty_logbook_report.php:134 msgid "31.Type of use:" msgstr "31.نوع الاستخدام:" # c:\program #: ../../.././logbook_report.php:175 #: ../../.././logbook_report_subscriber.php:132 +#: ../../.././back/Empty_logbook_report.php:135 #: ../../.././include/i18n.php:43 msgid "Domestic" msgstr "منزلي" @@ -750,18 +1095,21 @@ # c:\program #: ../../.././logbook_report.php:177 #: ../../.././logbook_report_subscriber.php:134 +#: ../../.././back/Empty_logbook_report.php:137 msgid " Government Department " msgstr "دائرة رسمية :" # c:\program #: ../../.././logbook_report.php:178 #: ../../.././logbook_report_subscriber.php:135 +#: ../../.././back/Empty_logbook_report.php:138 msgid " Religous Site " msgstr "دور عبادة" # c:\program #: ../../.././logbook_report.php:179 #: ../../.././logbook_report_subscriber.php:136 +#: ../../.././back/Empty_logbook_report.php:139 #: ../../.././include/i18n.php:42 msgid "Commercial" msgstr "تجاري" @@ -769,155 +1117,182 @@ # e:\program #: ../../.././logbook_report.php:180 #: ../../.././logbook_report_subscriber.php:137 +#: ../../.././back/Empty_logbook_report.php:140 msgid " Hotel " msgstr "فندق" # c:\program #: ../../.././logbook_report.php:181 #: ../../.././logbook_report_subscriber.php:138 +#: ../../.././back/Empty_logbook_report.php:141 msgid " Swimming Pool " msgstr "مسبح" # c:\program #: ../../.././logbook_report.php:182 #: ../../.././logbook_report_subscriber.php:139 +#: ../../.././back/Empty_logbook_report.php:142 msgid " Sport Center " msgstr "مركز رياضي" # c:\program #: ../../.././logbook_report.php:183 #: ../../.././logbook_report_subscriber.php:140 +#: ../../.././back/Empty_logbook_report.php:143 msgid " Restaurant " msgstr "مطعم" # e:\program #: ../../.././logbook_report.php:184 #: ../../.././logbook_report_subscriber.php:141 +#: ../../.././back/Empty_logbook_report.php:144 msgid "Station " msgstr "محطة" # c:\program #: ../../.././logbook_report.php:185 #: ../../.././logbook_report_subscriber.php:142 +#: ../../.././back/Empty_logbook_report.php:145 msgid "Students Dormitory " msgstr "سكن طلاب" # c:\program #: ../../.././logbook_report.php:186 #: ../../.././logbook_report_subscriber.php:143 +#: ../../.././back/Empty_logbook_report.php:146 msgid " Public Park " msgstr "حديقة عامة" # c:\program #: ../../.././logbook_report.php:187 +#: ../../.././back/Empty_logbook_report.php:147 msgid "32.Meter Position:" msgstr "32.موضع العداد :" # c:\program #: ../../.././logbook_report.php:188 #: ../../.././logbook_report_subscriber.php:145 +#: ../../.././back/Empty_logbook_report.php:148 msgid " Suitable " msgstr "مناسب" # c:\program #: ../../.././logbook_report.php:189 #: ../../.././logbook_report_subscriber.php:146 +#: ../../.././back/Empty_logbook_report.php:149 msgid " Too High " msgstr "عالي" # c:\program #: ../../.././logbook_report.php:190 #: ../../.././logbook_report_subscriber.php:147 +#: ../../.././back/Empty_logbook_report.php:150 msgid " Indoors " msgstr "داخل المنزل" # c:\program #: ../../.././logbook_report.php:191 #: ../../.././logbook_report_subscriber.php:148 +#: ../../.././back/Empty_logbook_report.php:151 msgid " Cramped " msgstr "الكابينة ضيقة" # c:\program #: ../../.././logbook_report.php:192 #: ../../.././logbook_report_subscriber.php:149 +#: ../../.././back/Empty_logbook_report.php:152 msgid " Too dark " msgstr "مظلم" # c:\program #: ../../.././logbook_report.php:193 #: ../../.././logbook_report_subscriber.php:150 +#: ../../.././back/Empty_logbook_report.php:153 msgid " Dirty " msgstr "متسخة" # c:\program #: ../../.././logbook_report.php:193 #: ../../.././logbook_report_subscriber.php:150 +#: ../../.././back/Empty_logbook_report.php:153 msgid " UnSuitable " msgstr "غير مناسب" # C:\Program #: ../../.././logbook_report.php:195 +#: ../../.././back/Empty_logbook_report.php:155 msgid "33.meter Location DeliveryPoint Sequence:" msgstr "33.رمز العنوان لموقع العداد#:" # c:\program #: ../../.././logbook_report.php:196 +#: ../../.././back/Empty_logbook_report.php:156 msgid "34.No.of Persons Supplied:" msgstr "34.عدد الافراد المستفيدين من العداد :" # c:\program #: ../../.././logbook_report.php:197 +#: ../../.././back/Empty_logbook_report.php:157 msgid "35.No.of families supplied:" msgstr "35.عدد الاسر المستفيدة" # c:\program #: ../../.././logbook_report.php:197 +#: ../../.././back/Empty_logbook_report.php:157 msgid "36.Tel.No.:" msgstr "36.رقم الهاتف " # c:\program #: ../../.././logbook_report.php:198 +#: ../../.././back/Empty_logbook_report.php:158 msgid "37.Tank capacity:" msgstr "37.سعة الخزان:" # D:\dccss\dccss/logbook_report.php:150 #: ../../.././logbook_report.php:199 #: ../../.././logbook_report_subscriber.php:154 +#: ../../.././back/Empty_logbook_report.php:159 msgid "m<sup>3" msgstr "م<sup>3" # c:\program #: ../../.././logbook_report.php:200 #: ../../.././logbook_report_subscriber.php:155 +#: ../../.././back/Empty_logbook_report.php:160 msgid " Liter " msgstr "ليتر" # c:\program #: ../../.././logbook_report.php:201 #: ../../.././logbook_report_subscriber.php:156 +#: ../../.././back/Empty_logbook_report.php:161 msgid " Barrel " msgstr "برميل" # c:\program #: ../../.././logbook_report.php:202 +#: ../../.././back/Empty_logbook_report.php:162 msgid "38.Pump is Installed:" msgstr "38.هل يوجد مضخة :" # e:\program #: ../../.././logbook_report.php:203 #: ../../.././logbook_report_subscriber.php:158 +#: ../../.././back/Empty_logbook_report.php:163 msgid " No. " msgstr "لا" # c:\program #: ../../.././logbook_report.php:206 #: ../../.././logbook_report_subscriber.php:161 +#: ../../.././back/Empty_logbook_report.php:166 msgid "Notes" msgstr "ملاحظات" # D:\dccss\dccss/logbook_report.php:193 #: ../../.././logbook_report.php:209 #: ../../.././logbook_report_subscriber.php:164 +#: ../../.././back/Empty_logbook_report.php:169 msgid "The Quality of information related to items 10,11,25,26,27 as well as the delivery point are of paramount importance and any negligence in relation to these information could lead to termination of contract!" msgstr "ان دقة المعلوات الموجود في الحقول 110,11,25,26,27 و في الحقل رمز العنوان هي من مسؤولية الماسح الميداني و اي خطا قد يؤدي الى انهاء عقده" @@ -1130,142 +1505,20 @@ msgstr "الدخول" # e:\program -#: ../../.././map.php:107 -#, php-format -msgid "Moving DeliveryPoint %s." -msgstr "تحريك نقطة الوصول رقم %s" +#: ../../.././map.php:697 +#: ../../.././map.php:698 +#: ../../.././map.php:715 +#: ../../.././querybuilder.php:55 +#: ../../.././querybuilder.php:56 +#: ../../.././querybuilder.php:73 +#: ../../.././back/map_layerselection.php:632 +#: ../../.././back/map_layerselection.php:633 +#: ../../.././back/map_layerselection.php:650 +#: ../../.././include/header.php:290 +msgid "[Select One]" +msgstr "[اختر واحدة]" -# e:\program -#: ../../.././map.php:135 -msgid "Deleted DeliveryPoint." -msgstr "تم تحريك نقطة الوصول" - -# D:\dccss\dccss/map.php:134 -#: ../../.././map.php:135 -msgid " " -msgstr "" - -# e:\program -#: ../../.././map.php:135 -msgid "DeliveryPointID:" -msgstr "نقطة الوصول" - # c:\program -#: ../../.././map.php:135 -msgid "sequence" -msgstr "التسلسل:" - -# c:\program -#: ../../.././map.php:174 -msgid "NO geocode value returned" -msgstr "لم يتم ارسال اي رمز جغرافي" - -# e:\program -#: ../../.././map.php:201 -msgid "Moved DeliveryPoint." -msgstr "تم تحريك نقطة الوصول" - -# e:\program -#: ../../.././map.php:355 -msgid "Legend" -msgstr "مفتاح الخريطة" - -# c:\program -#: ../../.././map.php:377 -msgid "Display the Water network" -msgstr "اظهار شبكة المياه" - -# e:\program -#: ../../.././map.php:378 -msgid "Water Network" -msgstr "شبكة المياه" - -# e:\program -#: ../../.././map.php:390 -msgid "Landmark" -msgstr "معلم" - -# c:\program -#: ../../.././map.php:398 -msgid "Refresh the map display" -msgstr "تحديث الخريطة" - -# e:\program -#: ../../.././map.php:399 -msgid "Redraw Map" -msgstr "اعادة رسم الخريطة" - -# c:\program -#: ../../.././map.php:407 -msgid "Zoom to grid" -msgstr "التكبير الى الشبكة" - -# c:\program -#: ../../.././map.php:430 -msgid "Full View" -msgstr "منظر عام" - -# c:\program -#: ../../.././map.php:455 -msgid "Select the map size from the list." -msgstr "اختر حجم الخريطة من القائمة" - -# e:\program -#: ../../.././map.php:456 -msgid "Map Size" -msgstr "حجم الخريطة" - -# e:\program -#: ../../.././map.php:493 -msgid "Keymap" -msgstr "خريطة الدليل" - -# e:\program -#: ../../.././map.php:497 -msgid "Click on the key map to view an area." -msgstr "اضغط على خريطة الدليل لاظهار منطقة" - -# e:\program -#: ../../.././map.php:508 -msgid "Zoom in further to display more detailed map information." -msgstr "كبر اكثر من اجل اظهار تفاصيل اكثر للخريطة." - -# e:\program -#: ../../.././map.php:510 -msgid "Zoom In" -msgstr "تكبير" - -# e:\program -#: ../../.././map.php:518 -msgid "Zoom out to display a larger area of the map." -msgstr "صغر من اجل اظهار منطقة اكبر من الخريطة." - -# e:\program -#: ../../.././map.php:520 -msgid "Zoom Out" -msgstr "تصغير" - -# e:\program -#: ../../.././map.php:528 -msgid "Move the map view without zooming in or out." -msgstr "التحرك في الخريطة بدون تكبير او تصغير." - -# e:\program -#: ../../.././map.php:530 -msgid "Pan" -msgstr "تحريك" - -# e:\program -#: ../../.././map.php:538 -msgid "Display information about elements in the map." -msgstr "اظهار المعلومات المتعلقة بالعناصر الموجودة في الخريطة." - -# e:\program -#: ../../.././map.php:540 -msgid "Identify" -msgstr "اداة التعريف" - -# c:\program #: ../../.././meter_query_report.php:49 msgid "Query using Meter Serial Number" msgstr "الاستفسار عن مشتركباستخدام رقم العداد" @@ -1291,6 +1544,34 @@ msgid "Not working meter status report" msgstr "تقرير العدادات المعطلة" +#: ../../.././print_workorder.php:39 +msgid "Task force workorder" +msgstr "امر عمل مجموعة عمل" + +#: ../../.././print_workorder.php:63 +#: ../../.././include/i18n.php:121 +msgid "German Technical Cooperation-GTZ" +msgstr "الوكالة الالمانية للتعاون الفني- GTZ" + +#: ../../.././print_workorder.php:64 +#: ../../.././include/i18n.php:122 +msgid "Institutional Support to Aleppo Water establishment" +msgstr "مشروع الدعم المؤسسي لمؤسسة مياه حلب" + +#: ../../.././print_workorder.php:65 +#: ../../.././include/i18n.php:123 +msgid "Task Force" +msgstr "مجموعة عمل" + +#: ../../.././print_workorder.php:68 +#: ../../.././include/i18n.php:114 +msgid "Task force - " +msgstr "مجموعة عمل - " + +#: ../../.././print_workorder.php:68 +msgid "taskforce" +msgstr "مجموعة عمل" + # c:\program #: ../../.././query.php:45 msgid "Bill" @@ -1346,6 +1627,10 @@ msgid "Please enter the Query number." msgstr "ادخل قيمة البحث" +#: ../../.././querybuilder.php:35 +msgid "Query Builder" +msgstr "بناء الاستفسارات" + # c:\program #: ../../.././reports.php:34 msgid "Create No bill available status report" @@ -1452,6 +1737,13 @@ msgid "DCCSS Data Entry Performance Report" msgstr "تقرير DCCSS لاداء مدخلي البيانات" +# c:\program +#: ../../.././reports.php:68 +#: ../../.././reports.php:69 +#: ../../.././include/i18n.php:120 +msgid "DCCSS Task force Report" +msgstr "تقرير DCCSS لمجموعات العمل " + # e:\program #: ../../.././status_report.php:144 msgid "Total Number of delivery point surveyed" @@ -1639,6 +1931,41 @@ msgid "Surveyed Subscribers" msgstr "المشتركين الممسوحين" +#: ../../.././taskforce_report.php:49 +msgid "Task force Action" +msgstr "اجراء مجموعة عمل" + +#: ../../.././taskforce_report.php:52 +#: ../../.././include/i18n.php:111 +msgid "Illegal" +msgstr "وصله غير نظامية" + +#: ../../.././taskforce_report.php:52 +#: ../../.././include/i18n.php:113 +msgid "Not Routed" +msgstr "مشتركون ليسو على المسار" + +#: ../../.././taskforce_report.php:53 +#: ../../.././include/i18n.php:116 +msgid "Select task force type:" +msgstr "اختر نوع مجموعة العمل:" + +#: ../../.././taskforce_report.php:55 +#: ../../.././taskforce_report.php:76 +#: ../../.././include/i18n.php:119 +msgid "Create Task force list" +msgstr "انشاء قائمة مجموعة عمل" + +#: ../../.././taskforce_report.php:56 +#: ../../.././taskforce_report.php:92 +#: ../../.././include/i18n.php:118 +msgid "Print Task force maps" +msgstr "طباعة خرائط مجموعات العمل" + +#: ../../.././taskforce_report.php:66 +msgid "Please select task force type." +msgstr "" + # D:\dccss\dccss/admin/bill_loader.php:29 #: ../../.././admin/bill_loader.php:27 msgid "Billing Information Loader" @@ -1918,6 +2245,66 @@ msgid "Update Translations" msgstr "تحديث الترجمه" +#: ../../.././back/print_inspection.php:41 +msgid "DCCSS Inspection Sheet" +msgstr "" + +# c:\program +#: ../../.././back/print_inspection.php:74 +#: ../../.././include/dccsspage.php:269 +#: ../../.././include/dccsspage.php:273 +#: ../../.././include/header.php:148 +#: ../../.././include/header.php:152 +#: ../../.././include/i18n.php:72 +msgid "DCCSS" +msgstr "برنامج المسح الشامل للمشتركين" + +#: ../../.././back/print_inspection.php:78 +#, php-format +msgid "%s %s Workorder # %s Created %s " +msgstr "" + +#: ../../.././back/print_inspection.php:79 +msgid "strOrgName" +msgstr "" + +#: ../../.././back/print_inspection.php:165 +msgid "Actual Team:" +msgstr "" + +#: ../../.././back/print_inspection.php:166 +msgid "Start Date and Time:" +msgstr "" + +#: ../../.././back/print_inspection.php:167 +msgid "Completion Date and Time:" +msgstr "" + +#: ../../.././back/print_inspection.php:168 +msgid "Excavation Area in m<sup>2</sup>:" +msgstr "" + +# D:\dccss\dccss/logbook_report.php:90 +#: ../../.././back/print_inspection.php:169 +msgid "Supervisor Signature:" +msgstr "التوقيع" + +#: ../../.././conf/dccssconfig.php:116 +msgid "11" +msgstr "" + +#: ../../.././conf/dccssconfig.php:116 +msgid "12" +msgstr "" + +#: ../../.././conf/dccssconfig.php:117 +msgid "1" +msgstr "" + +#: ../../.././conf/dccssconfig.php:117 +msgid "2" +msgstr "" + # e:\program #: ../../.././include/dccsspage.php:187 #: ../../.././include/dcmpostgis.php:30 @@ -1932,15 +2319,6 @@ msgstr "الدخول الى النظام" # c:\program -#: ../../.././include/dccsspage.php:269 -#: ../../.././include/dccsspage.php:273 -#: ../../.././include/header.php:148 -#: ../../.././include/header.php:152 -#: ../../.././include/i18n.php:72 -msgid "DCCSS" -msgstr "برنامج المسح الشامل للمشتركين" - -# c:\program #: ../../.././include/dccsspage.php:272 #: ../../.././include/header.php:151 msgid "Click this link to go to the DCCSS main page." @@ -2118,11 +2496,6 @@ msgid "from the list" msgstr "من القائمة" -# e:\program -#: ../../.././include/header.php:290 -msgid "[Select One]" -msgstr "[اختر واحدة]" - # c:\program #: ../../.././include/header.php:334 #: ../../.././include/header.php:347 @@ -2180,18 +2553,19 @@ # c:\program #: ../../.././include/i18n.php:31 +#, fuzzy msgid "Major Leakage" -msgstr "كبير" +msgstr "يوجد تسرب:" # c:\program #: ../../.././include/i18n.php:32 +#, fuzzy msgid "Minor Leakage" -msgstr "قليل" +msgstr "يوجد تسرب:" -# c:\program #: ../../.././include/i18n.php:33 msgid "No Leak" -msgstr "لا يوجد تسرب" +msgstr "" # c:\program #: ../../.././include/i18n.php:34 @@ -2200,8 +2574,9 @@ # c:\program #: ../../.././include/i18n.php:35 +#, fuzzy msgid "Cubic Meter" -msgstr "متر مكعب" +msgstr "متر" # c:\program #: ../../.././include/i18n.php:36 @@ -2226,7 +2601,7 @@ # c:\program #: ../../.././include/i18n.php:40 msgid "Turned Over" -msgstr "مقلوب" +msgstr "مائل" # c:\program #: ../../.././include/i18n.php:41 @@ -2246,12 +2621,12 @@ # c:\program #: ../../.././include/i18n.php:47 msgid "Public Park" -msgstr "حديقة عامه" +msgstr "حديقة عامة" # c:\program #: ../../.././include/i18n.php:48 msgid "Religious Site" -msgstr "دور عباده" +msgstr "دور عبادة" # c:\program #: ../../.././include/i18n.php:49 @@ -2313,10 +2688,10 @@ msgid "Not Working" msgstr "معطل" -# c:\program +# e:\program #: ../../.././include/i18n.php:61 msgid "public.subscriber" -msgstr "جدول معلومات المشتركين" +msgstr "المشتركين" # c:\program #: ../../.././include/i18n.php:63 @@ -2326,23 +2701,22 @@ # c:\program #: ../../.././include/i18n.php:64 +#, fuzzy msgid "Flatcount" -msgstr "عدد الشقق" +msgstr "عدد الطوابق:" # c:\program #: ../../.././include/i18n.php:65 msgid "Cabinetid" msgstr "رقم كابينة المؤسسة" -# c:\program #: ../../.././include/i18n.php:66 msgid "Ground Tank" -msgstr "تنك ارضي" +msgstr "" -# c:\program #: ../../.././include/i18n.php:67 msgid "Individual Meter" -msgstr "عداد لمؤسسة المياه" +msgstr "" # c:\program #: ../../.././include/i18n.php:68 @@ -2354,17 +2728,18 @@ # c:\program #: ../../.././include/i18n.php:71 msgid "The value you have entered is not valid." -msgstr " %s: القيمة المدخلة غير مقبوله" +msgstr "القيمة المدخلة غير مقبوله" # c:\program #: ../../.././include/i18n.php:74 msgid "Subscriber Information Data Entry" -msgstr "واجهة ادخال معلومات المشتركين" +msgstr "معلومات المشتركين" # c:\program #: ../../.././include/i18n.php:80 +#, fuzzy msgid "Residential" -msgstr " مجمع سكني" +msgstr "تنظيف النموذج" # c:\program #: ../../.././include/i18n.php:84 @@ -2387,10 +2762,9 @@ msgid "Meter location code:" msgstr "رمز موقع العداد:" -# c:\program #: ../../.././include/i18n.php:92 msgid "Reading" -msgstr "القراءة" +msgstr "" # c:\program #: ../../.././include/i18n.php:93 @@ -2404,8 +2778,9 @@ # c:\program #: ../../.././include/i18n.php:96 +#, fuzzy msgid "No Bill Available report" -msgstr "تقرير الفواتير غير الموجوده" +msgstr "تقرير للاشتراكات الغير موجودة" # c:\program #: ../../.././include/i18n.php:97 @@ -2414,8 +2789,9 @@ # c:\program #: ../../.././include/i18n.php:98 +#, fuzzy msgid "Meter damaged report" -msgstr "تقرير العدادات المحطمة" +msgstr "قطر العداد:" # c:\program #: ../../.././include/i18n.php:99 @@ -2427,15 +2803,14 @@ msgid "Turnedover Meter status report" msgstr "تقرير العدادات المقلوبة" -# C:\Program #: ../../.././include/i18n.php:101 msgid "Count" -msgstr "العدد" +msgstr "" # e:\program #: ../../.././include/i18n.php:103 msgid "Table" -msgstr "اسم الجدول:" +msgstr "اسم الجدول" # C:\Program #: ../../.././include/i18n.php:105 @@ -2448,6 +2823,38 @@ msgstr "غير مناسب" # c:\program +#: ../../.././include/i18n.php:107 +msgid "dpsequence" +msgstr "رقم نقطة التوصيل" + +# c:\program +#: ../../.././include/i18n.php:108 +msgid "logbooknumber" +msgstr "رقم المجلد" + +# c:\program +#: ../../.././include/i18n.php:109 +msgid "subscription" +msgstr "رقم الاشتراك" + +# c:\program +#: ../../.././include/i18n.php:110 +msgid "serialnumber" +msgstr "رقم العداد" + +#: ../../.././include/i18n.php:112 +msgid "illegal" +msgstr "وصله غير نظامية" + +#: ../../.././include/i18n.php:115 +msgid "Task Force Action" +msgstr "" + +#: ../../.././include/i18n.php:117 +msgid "Task force workorders" +msgstr "اوامر عمل مجموعات العمل" + +# c:\program #: ../../.././include/dataobject/Public_bill.php:32 #: ../../.././include/dataobject/Public_subscriber.php:202 msgid "Logbook" Added: trunk/dccss/print_workorder.php =================================================================== --- trunk/dccss/print_workorder.php (rev 0) +++ trunk/dccss/print_workorder.php 2006-07-02 06:31:32 UTC (rev 317) @@ -0,0 +1,182 @@ +<?php +/* CSS -- DC Comprehensive Subscribers Survey + * + * nobillavailable_report.php - No Bill available report. + * + * 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. + */ + +include("include/header.php"); +include_once("conf/dccssconfig.php"); +include("include/dccsspostgis.php"); +include("include/dcmmaputil.php"); +//print_r($_SESSION['TaskforceArray']); +for ($m=0;$m<count($_SESSION['TaskforceArray']);$m++){ + //print_r($m); +$DcssPage = new DccssPage(basename(__FILE__)); + +$strDirection = (0 == strncmp($_SESSION['language'],'ar', 2)) ? 'rtl' : + 'ltr'; + +?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "xhtml1-strict.dtd"> +<html lang="<?= $_SESSION["language"] ?>"> +<head> + <title><?= _("Task force workorder"); ?></title> + <link rel="stylesheet" href="include/dccss.css" type="text/css" /> + <link rel="stylesheet" href="include/<?= $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)) ? 'ltr' : + 'rtl' ?>" onload="if(window.print) window.print();"> +<table border="1" summary="Header" width="100%" height="4%" cellspacing="0" + cellpadding="0" nowrap="nowrap"> + <tr> + <?php + $query = "select dpsequence,logbooknumber,sequence,name,subscription, + serialnumber from taskforce_".$_REQUEST['taskforce']." where dpsequence=". + $_SESSION['TaskforceArray'][$m]['dpsequence']; + //echo ($query); + $result = pg_query($query); + $numfields = pg_numfields($result); + $row = pg_fetch_array($result);?> + + <td align="left" ><a style="vertical-align: left;" + href="index.php?PHPSESSID=<?= session_id()?>"><img + style="vertical-align: left; height=1cm;" + src="images/gtz.jpg" border="0" align="left" /> + </a><b style="vertical-align: middle;"><?= _("German Technical Cooperation-GTZ") ?></b><br> + <b style="vertical-align: middle;"><?= _("Institutional Support to Aleppo Water establishment") ?></b><br> + + </td> + <td align="center"> + </a><b align="middle"><?= _("Task force - ") ?><?= _($_REQUEST['taskforce']) ?></b></td> + </td> + <td><img src="<?= $_SESSION["OrgLogoSmall"]?>" border="0" align="right" + style="height: 1cm" /></td> + </tr> +</table> +<table border="1" summary="Map" width="100%" height="91%" cellspacing="0" + cellpadding="0" nowrap="nowrap"> + <tr> + <td width="85%" valign="top"> <?php + $map_path="./"; + $map = ms_newMapObj($map_path.sprintf($_SESSION["strMapFile"], + substr($_SESSION['language'], 0, 2))); + if(array_key_exists("PATH_TRANSLATED", $_SERVER)) { + $map->set("shapepath", str_replace("print_workorder.php", "data", + str_replace("\\", "/", $_SERVER["PATH_TRANSLATED"]))); + } + $map->set("width", 1300); + $map->set("height", 900); + + setLayerAuthentication($map); + adjustScalebar($map); + + $objLayer = $map->getlayerbyname('DeliveryPoint'); + if ($objLayer->queryByAttributes("sequence","SEQUENCE=". + $_SESSION['TaskforceArray'][$m]['dpsequence'],MS_MULTIPLE) == + MS_SUCCESS) { + + //$oResult=$objLayer->getresult(1); + $ResultCount=$objLayer->getNumResults(); + // + //print_r($objLayer->getresult(0)); + $gbShowQueryResults = TRUE; + for ($i=0; $i < $ResultCount; $i++) { + $QueryResult=$objLayer->getResult($i); + $Risultato=$QueryResult->shapeindex; + $objLayer->open(); + $Shape=$objLayer->getShape(0,$Risultato); + // print_r ($Shape->values); + $oExtents=$Shape->bounds; + //print_r($oExtents); + $objLayer->close(); + + $map->setextent($oExtents->minx-50,$oExtents->miny-50,$oExtents->maxx+50, + $oExtents->maxy+50); + } + } + /* + $query = "select box3d(the_geom) from deliverypoint where sequence=". + $_SESSION['TaskforceArray'][$m]['dpsequence']; + $resultextent = pg_query($query); + $numrows = pg_numrows($resultextent); + + for($i=0; $i<$numrows;$i++) { + $r = pg_fetch_row($resultextent, $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; + } + $map->setextent($minx-50,$miny-50,$maxx+50,$maxy+50); + */ + + $image=$map->drawquery(); + $pointObj = ms_newPointObj(); + $pointObj->setXY($oExtents->minx, $oExtents->miny); + $glrLayer = $map->getLayerByName("center"); + $pointObj->draw($map, $glrLayer,$image, 0, 1); + //Display the route lines + $objLayer = $map->getlayerbyname('route'); + $objLayer->set("status", MS_ON); + $image_url=$image->saveWebImage("MS_PNG", 1, 1, 0); + ?> + <a href="index.php?PHPSESSID=<?= session_id()?>"><img src="<?= + $image_url ?>" alt="Workorder Map" style="width: 20cm; height: 14cm;"/></a> + </td> + <td width=30% height=95% valign="top"> + <table cellspacing="0" cellpadding="0"> <?php + //Customer information + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[0]."</b></font></td>"); + echo("<td width=\"%40\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 0)).":</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[1]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 1)).":</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[2]."</b></font></td>"); + echo("<td class=\"label\"><font size=\"1\">"._(pg_fieldname($result, 2)).":</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[3]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 3)).":</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[4]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 4)).":</td></tr>"); + echo("<tr><td class=\"input\"><font size=\"1\"><b>".$row[5]."</b></font></td>"); + echo("<td width=\"%26\" class=\"label\"> <font size=\"1\">"._(pg_fieldname($result, 5)).":</td></tr>"); + + ?> + </table> + </td> + </tr> + +</table> +</body> +</html> + <?php + + + + } + ?> Modified: trunk/dccss/script/create_views.sql =================================================================== --- trunk/dccss/script/create_views.sql 2006-07-02 06:23:30 UTC (rev 316) +++ trunk/dccss/script/create_views.sql 2006-07-02 06:31:32 UTC (rev 317) @@ -346,9 +346,24 @@ subscriber.name,subscriber.subscription,subscriber.serialnumber from subscriber,deliverypoint where subscriber.hasconnectionbefore=1 and subscriber.geocode=deliverypoint.geocode; - + + +-- Routed and miss placed customers +create or replace view taskforce_routedandmissplaced as +select distinct deliverypoint.sequence as +dpsequence, subscriber.logbooknumber,subscriber.sequence,subscriber.subsequence, +subscriber.name,subscriber.subscription,subscriber.serialnumber, +subscriber.id,route.logbookno as +routelogbook from subscriber,route, +deliverypoint where +intersects(route.the_geom,deliverypoint.the_geom) and +deliverypoint.geocode=subscriber.geocode and subscriber.logbooknumber<> +route.logbookno and deliverypoint.geocode=subscriber.geocode and +subscriber.logbooknumber <> 9999 order by logbooknumber ; + -- user access rights grant all on LandmarkView to public; +grant all on taskforce_routedandmissplaced to public; grant all on taskforce_illegal to public; grant all on TermView to public; grant all on RequiredTranslationView to public; Added: trunk/dccss/taskforce_report.php =================================================================== --- trunk/dccss/taskforce_report.php (rev 0) +++ trunk/dccss/taskforce_report.php 2006-07-02 06:31:32 UTC (rev 317) @@ -... [truncated message content] |
|
From: <mah...@us...> - 2006-07-02 06:24:35
|
Revision: 316 Author: maher_karim Date: 2006-07-01 23:23:30 -0700 (Sat, 01 Jul 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=316&view=rev Log Message: ----------- Removed file/folder Removed Paths: ------------- trunk/dccss/taskforce_report.php Deleted: trunk/dccss/taskforce_report.php =================================================================== --- trunk/dccss/taskforce_report.php 2006-06-27 14:00:32 UTC (rev 315) +++ trunk/dccss/taskforce_report.php 2006-07-02 06:23:30 UTC (rev 316) @@ -1,113 +0,0 @@ -<?php -/* CSS -- DC Comprehensive Subscribers Survey - * - * Taskforce_report.php - Create task force reports, and create the workorders. - * - * 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/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'); -//To create two buttons to deal with different actions -require_once('HTML/QuickForm/group.php'); -require_once('HTML/QuickForm/submit.php'); - -$DccssPage = new DccssPage('Task force workorders'); -$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']; - -$objBill = DB_DataObject::factory('public.bill'); -if(PEAR::isError($objBill)or(NULL == $objBill)) { - die(_($objBill->getMessage())); -} - -$Taskforceform = new HTML_QuickForm('printForm'); -// Add some elements to the form -$Taskforceform->addElement('header', null, _('Task force Action')); -//$Taskforceform->addElement('checkbox', 'meternumber', -//_('Query Meter Number')); -$arrTaskforce = array('illegal'=>'Illegal','notrouted'=>'Not Routed'); -$Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), -$arrTaskforce); -$objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); -$objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); - -print_r($_POST); -$grpButton = new HTML_QuickForm_Group('ButtonGroup', - null, array($objSubmit,$objPrintSubmit)); -$Taskforceform->addElement($grpButton); - -// Define filters and validation rules - -$Taskforceform->addRule('TaskForce', - _('Please select task force type.'), 'required', null, 'client'); - -$Taskforceform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" - >*</span><span style="font-size:80%;"> '. - _('denotes required field').'</span>'); -$DccssPage->add($Taskforceform->toHTML()); - -if($Taskforceform->validate()) { - $Taskforceform->process($Taskforceform, false); - switch ($_POST['ButtonGroup']['submit']){ - case "Create Task force list" : - - $strQuery = 'select * from taskforce_'. - $Taskforceform->exportValue('TaskForce'); - - - $objTable = new DbTable($DccssPage->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")); - } - $DccssPage->add($objTable->toHtml()); - break; - case "Print Task force maps": - $strQuery='select dpsequence from taskforce_'. - $Taskforceform->exportValue('TaskForce'); - $result=pg_query($strQuery); - $arrrows=pg_fetch_all($result); - $_SESSION['TaskforceArray']=$arrrows; - header('location:print_workorder'); - // print_r($arrrows); - break; - } - - - - -} - -echo $DccssPage->toHTML(); -?> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-27 14:00:54
|
Revision: 315 Author: maher_karim Date: 2006-06-27 07:00:32 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=315&view=rev Log Message: ----------- Renamed remotely Added Paths: ----------- trunk/dccss/taskforce_report.php Removed Paths: ------------- trunk/dccss/task_force_report.php Deleted: trunk/dccss/task_force_report.php =================================================================== --- trunk/dccss/task_force_report.php 2006-06-27 13:59:48 UTC (rev 314) +++ trunk/dccss/task_force_report.php 2006-06-27 14:00:32 UTC (rev 315) @@ -1,113 +0,0 @@ -<?php -/* CSS -- DC Comprehensive Subscribers Survey - * - * Taskforce_report.php - Create task force reports, and create the workorders. - * - * 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/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'); -//To create two buttons to deal with different actions -require_once('HTML/QuickForm/group.php'); -require_once('HTML/QuickForm/submit.php'); - -$DccssPage = new DccssPage('Task force workorders'); -$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']; - -$objBill = DB_DataObject::factory('public.bill'); -if(PEAR::isError($objBill)or(NULL == $objBill)) { - die(_($objBill->getMessage())); -} - -$Taskforceform = new HTML_QuickForm('printForm'); -// Add some elements to the form -$Taskforceform->addElement('header', null, _('Task force Action')); -//$Taskforceform->addElement('checkbox', 'meternumber', -//_('Query Meter Number')); -$arrTaskforce = array('illegal'=>'Illegal','notrouted'=>'Not Routed'); -$Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), -$arrTaskforce); -$objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); -$objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); - -print_r($_POST); -$grpButton = new HTML_QuickForm_Group('ButtonGroup', - null, array($objSubmit,$objPrintSubmit)); -$Taskforceform->addElement($grpButton); - -// Define filters and validation rules - -$Taskforceform->addRule('TaskForce', - _('Please select task force type.'), 'required', null, 'client'); - -$Taskforceform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" - >*</span><span style="font-size:80%;"> '. - _('denotes required field').'</span>'); -$DccssPage->add($Taskforceform->toHTML()); - -if($Taskforceform->validate()) { - $Taskforceform->process($Taskforceform, false); - switch ($_POST['ButtonGroup']['submit']){ - case "Create Task force list" : - - $strQuery = 'select * from taskforce_'. - $Taskforceform->exportValue('TaskForce'); - - - $objTable = new DbTable($DccssPage->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")); - } - $DccssPage->add($objTable->toHtml()); - break; - case "Print Task force maps": - $strQuery='select dpsequence from taskforce_'. - $Taskforceform->exportValue('TaskForce'); - $result=pg_query($strQuery); - $arrrows=pg_fetch_all($result); - $_SESSION['TaskforceArray']=$arrrows; - header('location:print_workorder'); - // print_r($arrrows); - break; - } - - - - -} - -echo $DccssPage->toHTML(); -?> - Copied: trunk/dccss/taskforce_report.php (from rev 314, trunk/dccss/task_force_report.php) =================================================================== --- trunk/dccss/taskforce_report.php (rev 0) +++ trunk/dccss/taskforce_report.php 2006-06-27 14:00:32 UTC (rev 315) @@ -0,0 +1,113 @@ +<?php +/* CSS -- DC Comprehensive Subscribers Survey + * + * Taskforce_report.php - Create task force reports, and create the workorders. + * + * 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/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'); +//To create two buttons to deal with different actions +require_once('HTML/QuickForm/group.php'); +require_once('HTML/QuickForm/submit.php'); + +$DccssPage = new DccssPage('Task force workorders'); +$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']; + +$objBill = DB_DataObject::factory('public.bill'); +if(PEAR::isError($objBill)or(NULL == $objBill)) { + die(_($objBill->getMessage())); +} + +$Taskforceform = new HTML_QuickForm('printForm'); +// Add some elements to the form +$Taskforceform->addElement('header', null, _('Task force Action')); +//$Taskforceform->addElement('checkbox', 'meternumber', +//_('Query Meter Number')); +$arrTaskforce = array('illegal'=>'Illegal','notrouted'=>'Not Routed'); +$Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), +$arrTaskforce); +$objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); +$objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); + +print_r($_POST); +$grpButton = new HTML_QuickForm_Group('ButtonGroup', + null, array($objSubmit,$objPrintSubmit)); +$Taskforceform->addElement($grpButton); + +// Define filters and validation rules + +$Taskforceform->addRule('TaskForce', + _('Please select task force type.'), 'required', null, 'client'); + +$Taskforceform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + >*</span><span style="font-size:80%;"> '. + _('denotes required field').'</span>'); +$DccssPage->add($Taskforceform->toHTML()); + +if($Taskforceform->validate()) { + $Taskforceform->process($Taskforceform, false); + switch ($_POST['ButtonGroup']['submit']){ + case "Create Task force list" : + + $strQuery = 'select * from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + + + $objTable = new DbTable($DccssPage->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")); + } + $DccssPage->add($objTable->toHtml()); + break; + case "Print Task force maps": + $strQuery='select dpsequence from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + $result=pg_query($strQuery); + $arrrows=pg_fetch_all($result); + $_SESSION['TaskforceArray']=$arrrows; + header('location:print_workorder'); + // print_r($arrrows); + break; + } + + + + +} + +echo $DccssPage->toHTML(); +?> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-27 13:59:58
|
Revision: 314 Author: maher_karim Date: 2006-06-27 06:59:48 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=314&view=rev Log Message: ----------- Removed file/folder Removed Paths: ------------- trunk/dccss/Taskforce_report.php Deleted: trunk/dccss/Taskforce_report.php =================================================================== --- trunk/dccss/Taskforce_report.php 2006-06-27 13:53:54 UTC (rev 313) +++ trunk/dccss/Taskforce_report.php 2006-06-27 13:59:48 UTC (rev 314) @@ -1,112 +0,0 @@ -<?php -/* CSS -- DC Comprehensive Subscribers Survey - * - * Taskforce_report.php - Create task force reports, and create the workorders. - * - * 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'); -//To create two buttons to deal with different actions -require_once('HTML/QuickForm/group.php'); -require_once('HTML/QuickForm/submit.php'); - -$DccssPage = new DccssPage('Task force workorders'); -$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']; - -$objBill = DB_DataObject::factory('public.bill'); -if(PEAR::isError($objBill)or(NULL == $objBill)) { - die(_($objBill->getMessage())); -} - -$Taskforceform = new HTML_QuickForm('printForm'); -// Add some elements to the form -$Taskforceform->addElement('header', null, _('Task force Action')); -//$Taskforceform->addElement('checkbox', 'meternumber', -//_('Query Meter Number')); -$arrTaskforce = array('illegal'=>'Illegal','notrouted'=>'Not Routed'); -$Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), -$arrTaskforce); -$objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); -$objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); - -print_r($_POST); -$grpButton = new HTML_QuickForm_Group('ButtonGroup', - null, array($objSubmit,$objPrintSubmit)); -$Taskforceform->addElement($grpButton); - -// Define filters and validation rules - -$Taskforceform->addRule('TaskForce', - _('Please select task force type.'), 'required', null, 'client'); - -$Taskforceform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" - >*</span><span style="font-size:80%;"> '. - _('denotes required field').'</span>'); -$DccssPage->add($Taskforceform->toHTML()); - -if($Taskforceform->validate()) { - $Taskforceform->process($Taskforceform, false); - switch ($_POST['ButtonGroup']['submit']){ - case "Create Task force list" : - - $strQuery = 'select * from taskforce_'. - $Taskforceform->exportValue('TaskForce'); - - - $objTable = new DbTable($DccssPage->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")); - } - $DccssPage->add($objTable->toHtml()); - - case "Print Task force maps": - $strQuery='select dpsequence from taskforce_'. - $Taskforceform->exportValue('TaskForce'); - $result=pg_query($strQuery); - $arrrows=pg_fetch_all($result); - $_SESSION['TaskforceArray']=$arrrows; - header('location:print_workorder'); - // print_r($arrrows); - } - - - - -} - -echo $DccssPage->toHTML(); -?> - This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-27 13:54:04
|
Revision: 313 Author: maher_karim Date: 2006-06-27 06:53:54 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=313&view=rev Log Message: ----------- 2006-06-26 Maher Abdel karim <mah...@do...> * script/create_views.sql:Create task force views. * taskforce_report.php:Add task force report which create list for task force actions, and create maps for them.Adjut file name, and copyright. * report.php:Add link for taskforce_report.php Modified Paths: -------------- trunk/dccss/task_force_report.php Modified: trunk/dccss/task_force_report.php =================================================================== --- trunk/dccss/task_force_report.php 2006-06-27 13:44:57 UTC (rev 312) +++ trunk/dccss/task_force_report.php 2006-06-27 13:53:54 UTC (rev 313) @@ -4,7 +4,7 @@ * Taskforce_report.php - Create task force reports, and create the workorders. * * 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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-27 13:45:22
|
Revision: 312 Author: maher_karim Date: 2006-06-27 06:44:57 -0700 (Tue, 27 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=312&view=rev Log Message: ----------- rename the file Added Paths: ----------- trunk/dccss/task_force_report.php Copied: trunk/dccss/task_force_report.php (from rev 311, trunk/dccss/Taskforce_report.php) =================================================================== --- trunk/dccss/task_force_report.php (rev 0) +++ trunk/dccss/task_force_report.php 2006-06-27 13:44:57 UTC (rev 312) @@ -0,0 +1,113 @@ +<?php +/* CSS -- DC Comprehensive Subscribers Survey + * + * Taskforce_report.php - Create task force reports, and create the workorders. + * + * 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'); +//To create two buttons to deal with different actions +require_once('HTML/QuickForm/group.php'); +require_once('HTML/QuickForm/submit.php'); + +$DccssPage = new DccssPage('Task force workorders'); +$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']; + +$objBill = DB_DataObject::factory('public.bill'); +if(PEAR::isError($objBill)or(NULL == $objBill)) { + die(_($objBill->getMessage())); +} + +$Taskforceform = new HTML_QuickForm('printForm'); +// Add some elements to the form +$Taskforceform->addElement('header', null, _('Task force Action')); +//$Taskforceform->addElement('checkbox', 'meternumber', +//_('Query Meter Number')); +$arrTaskforce = array('illegal'=>'Illegal','notrouted'=>'Not Routed'); +$Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), +$arrTaskforce); +$objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); +$objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); + +print_r($_POST); +$grpButton = new HTML_QuickForm_Group('ButtonGroup', + null, array($objSubmit,$objPrintSubmit)); +$Taskforceform->addElement($grpButton); + +// Define filters and validation rules + +$Taskforceform->addRule('TaskForce', + _('Please select task force type.'), 'required', null, 'client'); + +$Taskforceform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + >*</span><span style="font-size:80%;"> '. + _('denotes required field').'</span>'); +$DccssPage->add($Taskforceform->toHTML()); + +if($Taskforceform->validate()) { + $Taskforceform->process($Taskforceform, false); + switch ($_POST['ButtonGroup']['submit']){ + case "Create Task force list" : + + $strQuery = 'select * from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + + + $objTable = new DbTable($DccssPage->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")); + } + $DccssPage->add($objTable->toHtml()); + break; + case "Print Task force maps": + $strQuery='select dpsequence from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + $result=pg_query($strQuery); + $arrrows=pg_fetch_all($result); + $_SESSION['TaskforceArray']=$arrrows; + header('location:print_workorder'); + // print_r($arrrows); + break; + } + + + + +} + +echo $DccssPage->toHTML(); +?> + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-27 05:38:21
|
Revision: 311 Author: maher_karim Date: 2006-06-26 22:37:58 -0700 (Mon, 26 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=311&view=rev Log Message: ----------- 2006-06-26 Maher Abdel karim <mah...@do...> * script/create_views.sql:Create task force views. * Taskforce_report.php:Add task force report which create list for task force actions, and create maps for them. * report.php:Add link for taskforce_report.php Modified Paths: -------------- trunk/dccss/changelog trunk/dccss/reports.php trunk/dccss/script/create_views.sql Added Paths: ----------- trunk/dccss/Taskforce_report.php Added: trunk/dccss/Taskforce_report.php =================================================================== --- trunk/dccss/Taskforce_report.php (rev 0) +++ trunk/dccss/Taskforce_report.php 2006-06-27 05:37:58 UTC (rev 311) @@ -0,0 +1,112 @@ +<?php +/* CSS -- DC Comprehensive Subscribers Survey + * + * Taskforce_report.php - Create task force reports, and create the workorders. + * + * 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'); +//To create two buttons to deal with different actions +require_once('HTML/QuickForm/group.php'); +require_once('HTML/QuickForm/submit.php'); + +$DccssPage = new DccssPage('Task force workorders'); +$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']; + +$objBill = DB_DataObject::factory('public.bill'); +if(PEAR::isError($objBill)or(NULL == $objBill)) { + die(_($objBill->getMessage())); +} + +$Taskforceform = new HTML_QuickForm('printForm'); +// Add some elements to the form +$Taskforceform->addElement('header', null, _('Task force Action')); +//$Taskforceform->addElement('checkbox', 'meternumber', +//_('Query Meter Number')); +$arrTaskforce = array('illegal'=>'Illegal','notrouted'=>'Not Routed'); +$Taskforceform->addElement('select', 'TaskForce', _('Select task force type:'), +$arrTaskforce); +$objSubmit =& new HTML_QuickForm_submit('submit',_('Create Task force list')); +$objPrintSubmit =& new HTML_QuickForm_submit('submit',_('Print Task force maps')); + +print_r($_POST); +$grpButton = new HTML_QuickForm_Group('ButtonGroup', + null, array($objSubmit,$objPrintSubmit)); +$Taskforceform->addElement($grpButton); + +// Define filters and validation rules + +$Taskforceform->addRule('TaskForce', + _('Please select task force type.'), 'required', null, 'client'); + +$Taskforceform->setRequiredNote('<span style="font-size:80%; color:#ff0000;" + >*</span><span style="font-size:80%;"> '. + _('denotes required field').'</span>'); +$DccssPage->add($Taskforceform->toHTML()); + +if($Taskforceform->validate()) { + $Taskforceform->process($Taskforceform, false); + switch ($_POST['ButtonGroup']['submit']){ + case "Create Task force list" : + + $strQuery = 'select * from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + + + $objTable = new DbTable($DccssPage->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")); + } + $DccssPage->add($objTable->toHtml()); + + case "Print Task force maps": + $strQuery='select dpsequence from taskforce_'. + $Taskforceform->exportValue('TaskForce'); + $result=pg_query($strQuery); + $arrrows=pg_fetch_all($result); + $_SESSION['TaskforceArray']=$arrrows; + header('location:print_workorder'); + // print_r($arrrows); + } + + + + +} + +echo $DccssPage->toHTML(); +?> + Modified: trunk/dccss/changelog =================================================================== --- trunk/dccss/changelog 2006-06-13 11:11:27 UTC (rev 310) +++ trunk/dccss/changelog 2006-06-27 05:37:58 UTC (rev 311) @@ -1,3 +1,10 @@ +2006-06-26 Maher Abdel karim <mah...@do...> + + * script/create_views.sql:Create task force views. + * Taskforce_report.php:Add task force report which create list for task + force actions, and create maps for them. + * report.php:Add link for taskforce_report.php + 2006-04-16 Steffen Macke <Ste...@do...> * AUTHORS: Added Seth Nickell Modified: trunk/dccss/reports.php =================================================================== --- trunk/dccss/reports.php 2006-06-13 11:11:27 UTC (rev 310) +++ trunk/dccss/reports.php 2006-06-27 05:37:58 UTC (rev 311) @@ -64,6 +64,9 @@ <li><a href="dataentry_performance_report.php?PHPSESSID=<?= session_id()?>" title="<?= _("DCCSS Data Entry Performance Report") ?>"><?= _("DCCSS Data Entry Performance Report")?></a></li> + <li><a href="taskforce_report.php?PHPSESSID=<?= session_id()?>" + title="<?= _("DCCSS Task force Report") ?>"><?= + _("DCCSS Task force Report")?></a></li> </ul> <?php Modified: trunk/dccss/script/create_views.sql =================================================================== --- trunk/dccss/script/create_views.sql 2006-06-13 11:11:27 UTC (rev 310) +++ trunk/dccss/script/create_views.sql 2006-06-27 05:37:58 UTC (rev 311) @@ -331,8 +331,25 @@ insert into geometry_columns values ('', 'public', 'deliverypoint_fromcabinetes', 'the_geom', 2, -1, 'POINT'); + +--Task force views +create or replace view taskforce_illegal as +select * from (select deliverypoint.sequence as dpsequence, +subscriber.logbooknumber,subscriber.sequence,subscriber.subsequence, +subscriber.name,subscriber.subscription,subscriber.serialnumber from +subscriber,deliverypoint +where subscriber.hasconnectionbefore<>1 and subscriber.note +like '%وصلة غير%' and subscriber.geocode=deliverypoint.geocode) s +union all +select deliverypoint.sequence as dpsequence,subscriber.logbooknumber, +subscriber.sequence,subscriber.subsequence, +subscriber.name,subscriber.subscription,subscriber.serialnumber from +subscriber,deliverypoint where subscriber.hasconnectionbefore=1 +and subscriber.geocode=deliverypoint.geocode; + -- user access rights grant all on LandmarkView to public; +grant all on taskforce_illegal to public; grant all on TermView to public; grant all on RequiredTranslationView to public; grant all on MissingTranslationView to public; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-13 11:11:43
|
Revision: 310 Author: maher_karim Date: 2006-06-13 04:11:27 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=310&view=rev Log Message: ----------- 2006-06-13 Maher Abdel Karim <mah...@do...> * installer/win32/giconv.nsi: Updated version no. Modified Paths: -------------- trunk/giconv/ChangeLog Modified: trunk/giconv/ChangeLog =================================================================== --- trunk/giconv/ChangeLog 2006-06-13 11:08:50 UTC (rev 309) +++ trunk/giconv/ChangeLog 2006-06-13 11:11:27 UTC (rev 310) @@ -1,3 +1,7 @@ +2006-06-13 Maher Abdel Karim <mah...@do...> + + * installer/win32/giconv.nsi: Updated version no. + 2006-06-13 Steffen Macke <ste...@do...> * devcpp/config.h: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-13 11:09:10
|
Revision: 309 Author: maher_karim Date: 2006-06-13 04:08:50 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=309&view=rev Log Message: ----------- update the version no. Modified Paths: -------------- trunk/giconv/installer/win32/giconv.nsi Modified: trunk/giconv/installer/win32/giconv.nsi =================================================================== --- trunk/giconv/installer/win32/giconv.nsi 2006-06-13 10:22:00 UTC (rev 308) +++ trunk/giconv/installer/win32/giconv.nsi 2006-06-13 11:08:50 UTC (rev 309) @@ -101,8 +101,8 @@ VIAddVersionKey "CompanyName" "DC Water and Environment" VIAddVersionKey "LegalCopyright" "(c) 2006 DC Water and Environment" VIAddVersionKey "FileDescription" "giconv installer" -VIAddVersionKey "FileVersion" "0.0.1.0" -VIProductVersion "0.0.1.0" +VIAddVersionKey "FileVersion" "0.1.0.0" +VIProductVersion "0.1.0.0" ;-------------------------------- ;Modern UI Configuration This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sdt...@us...> - 2006-06-13 10:22:09
|
Revision: 308 Author: sdteffen Date: 2006-06-13 03:22:00 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=308&view=rev Log Message: ----------- These things should be ignored. Property Changed: ---------------- trunk/giconv/devcpp/ Property changes on: trunk/giconv/devcpp ___________________________________________________________________ Name: svn:ignore - giconv.layout iconv.dll iconv.exe *.exe giconv_private.h giconv_private.rc giconv_private.res + giconv.layout iconv.dll iconv.exe *.exe giconv_private.h giconv_private.rc giconv_private.res giconv_private.aps Makefile.win This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sdt...@us...> - 2006-06-13 10:21:09
|
Revision: 307 Author: sdteffen Date: 2006-06-13 03:20:56 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=307&view=rev Log Message: ----------- This file should not be committed. Adding to ignore list. Removed Paths: ------------- trunk/giconv/devcpp/Makefile.win Property Changed: ---------------- trunk/giconv/devcpp/ Property changes on: trunk/giconv/devcpp ___________________________________________________________________ Name: svn:ignore - giconv.layout iconv.dll iconv.exe *.exe + giconv.layout iconv.dll iconv.exe *.exe giconv_private.h giconv_private.rc giconv_private.res Deleted: trunk/giconv/devcpp/Makefile.win =================================================================== --- trunk/giconv/devcpp/Makefile.win 2006-06-13 10:14:52 UTC (rev 306) +++ trunk/giconv/devcpp/Makefile.win 2006-06-13 10:20:56 UTC (rev 307) @@ -1,42 +0,0 @@ -# Project: giconv -# Makefile created by Dev-C++ 4.9.9.2 - -CPP = g++.exe -D__DEBUG__ -CC = gcc.exe -D__DEBUG__ -WINDRES = windres.exe -RES = giconv_private.res -OBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) -LINKOBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) -LIBS = -L"C:/Program Files/Common Files/GTK/2.0/LIB" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -g3 -INCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." -CXXINCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." -BIN = giconv.exe -CXXFLAGS = $(CXXINCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -g3 -CFLAGS = $(INCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -g3 -RM = rm -f - -.PHONY: all all-before all-after clean clean-custom - -all: all-before giconv.exe all-after - - -clean: clean-custom - ${RM} $(OBJ) $(BIN) - -$(BIN): $(OBJ) - $(CC) $(LINKOBJ) -o "giconv.exe" $(LIBS) - -../src/main.o: ../src/main.c - $(CC) -c ../src/main.c -o ../src/main.o $(CFLAGS) - -../src/callbacks.o: ../src/callbacks.c - $(CC) -c ../src/callbacks.c -o ../src/callbacks.o $(CFLAGS) - -../src/interface.o: ../src/interface.c - $(CC) -c ../src/interface.c -o ../src/interface.o $(CFLAGS) - -../src/support.o: ../src/support.c - $(CC) -c ../src/support.c -o ../src/support.o $(CFLAGS) - -giconv_private.res: giconv_private.rc - $(WINDRES) -i giconv_private.rc --input-format=rc -o giconv_private.res -O coff This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sdt...@us...> - 2006-06-13 10:15:20
|
Revision: 306 Author: sdteffen Date: 2006-06-13 03:14:52 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=306&view=rev Log Message: ----------- * devcpp/config.h: * msvc/config.h: version number is now 0.1.0 * src/callbacks.c: Correct status bar output; cleaning NUL values from files before feeding them to iconv Modified Paths: -------------- trunk/giconv/ChangeLog trunk/giconv/devcpp/Makefile.win trunk/giconv/devcpp/config.h trunk/giconv/msvc/config.h trunk/giconv/src/callbacks.c Modified: trunk/giconv/ChangeLog =================================================================== --- trunk/giconv/ChangeLog 2006-06-13 09:13:35 UTC (rev 305) +++ trunk/giconv/ChangeLog 2006-06-13 10:14:52 UTC (rev 306) @@ -1,5 +1,9 @@ 2006-06-13 Steffen Macke <ste...@do...> + * devcpp/config.h: + * msvc/config.h: version number is now 0.1.0 + * src/callbacks.c: Correct status bar output; cleaning NUL values + from files before feeding them to iconv * installer/win32/giconv.nsi: Fixed from App Paths entry * callbacks.c: Trying to debug failure on Khalil's file. Modified: trunk/giconv/devcpp/Makefile.win =================================================================== --- trunk/giconv/devcpp/Makefile.win 2006-06-13 09:13:35 UTC (rev 305) +++ trunk/giconv/devcpp/Makefile.win 2006-06-13 10:14:52 UTC (rev 306) @@ -7,9 +7,9 @@ RES = giconv_private.res OBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) LINKOBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) -LIBS = -L"C:/Dev-Cpp/lib" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -g3 -INCS = -I"C:/Dev-Cpp/include" -I"." -CXXINCS = -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"C:/Dev-Cpp/include/c++/3.4.2/backward" -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32" -I"C:/Dev-Cpp/include/c++/3.4.2" -I"C:/Dev-Cpp/include" -I"." +LIBS = -L"C:/Program Files/Common Files/GTK/2.0/LIB" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -g3 +INCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." +CXXINCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." BIN = giconv.exe CXXFLAGS = $(CXXINCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -g3 CFLAGS = $(INCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -g3 Modified: trunk/giconv/devcpp/config.h =================================================================== --- trunk/giconv/devcpp/config.h 2006-06-13 09:13:35 UTC (rev 305) +++ trunk/giconv/devcpp/config.h 2006-06-13 10:14:52 UTC (rev 306) @@ -68,5 +68,5 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.0.1" +#define VERSION "0.1.0" Modified: trunk/giconv/msvc/config.h =================================================================== --- trunk/giconv/msvc/config.h 2006-06-13 09:13:35 UTC (rev 305) +++ trunk/giconv/msvc/config.h 2006-06-13 10:14:52 UTC (rev 306) @@ -56,5 +56,5 @@ #define STDC_HEADERS 1 /* Version number of package */ -#define VERSION "0.0.1" +#define VERSION "0.1.0" Modified: trunk/giconv/src/callbacks.c =================================================================== --- trunk/giconv/src/callbacks.c 2006-06-13 09:13:35 UTC (rev 305) +++ trunk/giconv/src/callbacks.c 2006-06-13 10:14:52 UTC (rev 306) @@ -129,7 +129,12 @@ GIOChannel *iochannel; gsize length; gint i; + gint context_id; + statusbar = lookup_widget(GTK_WIDGET(button), "statusbar_giconv"); + context_id = gtk_statusbar_get_context_id( + GTK_STATUSBAR (statusbar), "giconv"); + filechooserbutton_input = NULL; filechooserbutton_input = lookup_widget(GTK_WIDGET(button), "filechooserbutton_input"); filename_input = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(filechooserbutton_input)); @@ -150,17 +155,18 @@ * \todo g_free() */ cmd = g_strdup_printf ("'iconv.exe' -f AL_ARABI -t UTF-8 '%s'", filename_output); + g_shell_parse_argv(cmd, NULL, &args, NULL); /** * \todo Fix statusbar output. */ - statusbar = lookup_widget(GTK_WIDGET(button), "statusbar_iconv"); - gtk_statusbar_pop(statusbar, gtk_statusbar_get_context_id(statusbar, "giconv")); - gtk_statusbar_push(statusbar, gtk_statusbar_get_context_id(statusbar, "giconv"), cmd); + + gtk_statusbar_push(statusbar, context_id, cmd); - g_shell_parse_argv(cmd, NULL, &args, NULL); - iochannel = g_io_channel_new_file(filename_input, "r", &error); - g_io_channel_read_to_end(iochannel, &sout, &length, &error); - g_io_channel_close(iochannel); + g_file_get_contents(filename_input, + &sout, + &length, + &error); + for(i=0;i<length;i++){ if(0 == sout[i]) sout[i] = ' '; } @@ -170,27 +176,6 @@ fclose(fh); if((g_spawn_sync(NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &sout, &serror, &exit_status, &error))&&(0 == exit_status)) { - dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - error->message); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); -dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - serror); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); - dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_ERROR, - GTK_BUTTONS_CLOSE, - sout); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); /** @@ -203,6 +188,9 @@ /** * \todo Statusbar feedback. */ + g_free(sout); + sout = g_strdup_printf ("Wrote '%s'", filename_output); + gtk_statusbar_push(statusbar, context_id, sout); } else { dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -211,7 +199,7 @@ serror); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); -gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), GTK_DIALOG_DESTROY_WITH_PARENT, @@ -221,7 +209,6 @@ gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); } - g_free (cmd); g_free(filename_output); g_free(filename_input); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <mah...@us...> - 2006-06-13 09:13:55
|
Revision: 305 Author: maher_karim Date: 2006-06-13 02:13:35 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=305&view=rev Log Message: ----------- Trying to fix nul input. Modified Paths: -------------- trunk/giconv/devcpp/Makefile.win trunk/giconv/src/callbacks.c Modified: trunk/giconv/devcpp/Makefile.win =================================================================== --- trunk/giconv/devcpp/Makefile.win 2006-06-13 08:05:00 UTC (rev 304) +++ trunk/giconv/devcpp/Makefile.win 2006-06-13 09:13:35 UTC (rev 305) @@ -1,18 +1,18 @@ # Project: giconv # Makefile created by Dev-C++ 4.9.9.2 -CPP = g++.exe -CC = gcc.exe +CPP = g++.exe -D__DEBUG__ +CC = gcc.exe -D__DEBUG__ WINDRES = windres.exe RES = giconv_private.res OBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) LINKOBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) -LIBS = -L"C:/Program Files/Common Files/GTK/2.0/LIB" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -INCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." -CXXINCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." +LIBS = -L"C:/Dev-Cpp/lib" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -g3 +INCS = -I"C:/Dev-Cpp/include" -I"." +CXXINCS = -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"C:/Dev-Cpp/include/c++/3.4.2/backward" -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32" -I"C:/Dev-Cpp/include/c++/3.4.2" -I"C:/Dev-Cpp/include" -I"." BIN = giconv.exe -CXXFLAGS = $(CXXINCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -CFLAGS = $(INCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" +CXXFLAGS = $(CXXINCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -g3 +CFLAGS = $(INCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" -g3 RM = rm -f .PHONY: all all-before all-after clean clean-custom Modified: trunk/giconv/src/callbacks.c =================================================================== --- trunk/giconv/src/callbacks.c 2006-06-13 08:05:00 UTC (rev 304) +++ trunk/giconv/src/callbacks.c 2006-06-13 09:13:35 UTC (rev 305) @@ -126,6 +126,9 @@ GtkMessageDialog *dialog; GtkStatusbar *statusbar; FILE *fh; + GIOChannel *iochannel; + gsize length; + gint i; filechooserbutton_input = NULL; filechooserbutton_input = lookup_widget(GTK_WIDGET(button), "filechooserbutton_input"); @@ -146,7 +149,7 @@ /** * \todo g_free() */ - cmd = g_strdup_printf ("'iconv.exe' -f AL_ARABI -t UTF-8 '%s'", filename_input); + cmd = g_strdup_printf ("'iconv.exe' -f AL_ARABI -t UTF-8 '%s'", filename_output); /** * \todo Fix statusbar output. */ @@ -155,7 +158,16 @@ gtk_statusbar_push(statusbar, gtk_statusbar_get_context_id(statusbar, "giconv"), cmd); g_shell_parse_argv(cmd, NULL, &args, NULL); + iochannel = g_io_channel_new_file(filename_input, "r", &error); + g_io_channel_read_to_end(iochannel, &sout, &length, &error); + g_io_channel_close(iochannel); + for(i=0;i<length;i++){ + if(0 == sout[i]) sout[i] = ' '; + } + fh = g_fopen(filename_output, "wb"); + fwrite(sout, 1, strlen(sout), fh); + fclose(fh); if((g_spawn_sync(NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &sout, &serror, &exit_status, &error))&&(0 == exit_status)) { dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), @@ -163,20 +175,24 @@ GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, error->message); - gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, serror); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, sout); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_dialog_run (GTK_DIALOG (dialog)); - gtk_widget_destroy (dialog); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); + + /** * \todo Error handling. * \todo Formatting. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sdt...@us...> - 2006-06-13 08:05:19
|
Revision: 304 Author: sdteffen Date: 2006-06-13 01:05:00 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=304&view=rev Log Message: ----------- * installer/win32/giconv.nsi: Fixed from App Paths entry * callbacks.c: Trying to debug failure on Khalil's file. Modified Paths: -------------- trunk/giconv/ChangeLog trunk/giconv/devcpp/Makefile.win trunk/giconv/installer/win32/giconv.nsi trunk/giconv/src/callbacks.c Modified: trunk/giconv/ChangeLog =================================================================== --- trunk/giconv/ChangeLog 2006-06-13 07:38:27 UTC (rev 303) +++ trunk/giconv/ChangeLog 2006-06-13 08:05:00 UTC (rev 304) @@ -1,3 +1,8 @@ +2006-06-13 Steffen Macke <ste...@do...> + + * installer/win32/giconv.nsi: Fixed from App Paths entry + * callbacks.c: Trying to debug failure on Khalil's file. + 2006-06-12 Steffen Macke <ste...@do...> * devcpp/config.h: Modified: trunk/giconv/devcpp/Makefile.win =================================================================== --- trunk/giconv/devcpp/Makefile.win 2006-06-13 07:38:27 UTC (rev 303) +++ trunk/giconv/devcpp/Makefile.win 2006-06-13 08:05:00 UTC (rev 304) @@ -7,9 +7,9 @@ RES = giconv_private.res OBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) LINKOBJ = ../src/main.o ../src/callbacks.o ../src/interface.o ../src/support.o $(RES) -LIBS = -L"C:/Dev-Cpp/lib" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv -INCS = -I"C:/Dev-Cpp/include" -I"." -CXXINCS = -I"C:/Dev-Cpp/lib/gcc/mingw32/3.4.2/include" -I"C:/Dev-Cpp/include/c++/3.4.2/backward" -I"C:/Dev-Cpp/include/c++/3.4.2/mingw32" -I"C:/Dev-Cpp/include/c++/3.4.2" -I"C:/Dev-Cpp/include" -I"." +LIBS = -L"C:/Program Files/Common Files/GTK/2.0/LIB" -mwindows -L"$(GTK_BASEPATH)/lib" -lgtk-win32-2.0 -lgdk-win32-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lpangowin32-1.0 -lgdi32 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -lglib-2.0 -lintl -liconv +INCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." +CXXINCS = -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTK-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GLIB-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/PANGO-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/CAIRO" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/ATK-1.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/GTKGLEXT-1.0" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTK-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GLIB-2.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/LIB/GTKGLEXT-1.0/INCLUDE" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBGLADE-2.0" -I"C:/Program Files/Common Files/GTK/2.0/INCLUDE/LIBXML2" -I"." BIN = giconv.exe CXXFLAGS = $(CXXINCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" CFLAGS = $(INCS) -mms-bitfields -mwindows -DHAVE_CONFIG_H -I"$(GTK_BASEPATH)/include/gtk-2.0" -I"$(GTK_BASEPATH)/lib/gtk-2.0/include" -I"$(GTK_BASEPATH)/include/atk-1.0" -I"$(GTK_BASEPATH)/include/pango-1.0" -I"$(GTK_BASEPATH)/include/glib-2.0" -I"$(GTK_BASEPATH)/lib/glib-2.0/include" -I"$(GTK_BASEPATH)/include/cairo" -I"$(GTK_BASEPATH)/include" -DPACKAGE_PREFIX=\"\" -DPACKAGE_DATA_DIR=\"\" -DPACKAGE_LOCALE_DIR=\"\" Modified: trunk/giconv/installer/win32/giconv.nsi =================================================================== --- trunk/giconv/installer/win32/giconv.nsi 2006-06-13 07:38:27 UTC (rev 303) +++ trunk/giconv/installer/win32/giconv.nsi 2006-06-13 08:05:00 UTC (rev 304) @@ -89,9 +89,9 @@ ;Defines !define GICONV_REG_KEY "SOFTWARE\GICONV" -!define GICONV_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GICONV" -!define HKLM_APP_PATHS_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\GICONVw.exe" -!define HKLM_CMD_PATHS_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\GICONV.exe" +!define GICONV_UNINSTALL_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\givonv" +!define HKLM_APP_PATHS_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\giconv.exe" +!define HKLM_CMD_PATHS_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\giconv.exe" !define GICONV_STARTUP_RUN_KEY "SOFTWARE\Microsoft\Windows\CurrentVersion\Run" !define GICONV_UNINST_EXE "GICONV-${GICONV_VERSION}-uninstall.exe" Modified: trunk/giconv/src/callbacks.c =================================================================== --- trunk/giconv/src/callbacks.c 2006-06-13 07:38:27 UTC (rev 303) +++ trunk/giconv/src/callbacks.c 2006-06-13 08:05:00 UTC (rev 304) @@ -156,8 +156,27 @@ g_shell_parse_argv(cmd, NULL, &args, NULL); - if(g_spawn_sync(NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &sout, &serror, &exit_status, &error)) + if((g_spawn_sync(NULL, args, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &sout, &serror, &exit_status, &error))&&(0 == exit_status)) { + dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + error->message); + gtk_dialog_run (GTK_DIALOG (dialog)); +dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + serror); + dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_CLOSE, + sout); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); /** * \todo Error handling. * \todo Formatting. @@ -176,7 +195,8 @@ serror); gtk_dialog_run (GTK_DIALOG (dialog)); gtk_widget_destroy (dialog); - +gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); dialog = gtk_message_dialog_new (lookup_widget(GTK_WIDGET(button), "window_giconv"), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR, @@ -186,7 +206,6 @@ gtk_widget_destroy (dialog); } - g_free (cmd); g_free(filename_output); g_free(filename_input); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
|
From: <sdt...@us...> - 2006-06-13 07:49:28
|
Revision: 303 Author: sdteffen Date: 2006-06-13 00:38:27 -0700 (Tue, 13 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=303&view=rev Log Message: ----------- The actual implementation. Modified Paths: -------------- trunk/libiconv/ABOUT-NLS trunk/libiconv/COPYING.LIB trunk/libiconv/ChangeLog trunk/libiconv/Makefile.devel trunk/libiconv/Makefile.in trunk/libiconv/Makefile.vms trunk/libiconv/NEWS trunk/libiconv/NOTES trunk/libiconv/README trunk/libiconv/README.woe32 trunk/libiconv/aclocal.m4 trunk/libiconv/config.h.in trunk/libiconv/config.h.msvc trunk/libiconv/configure trunk/libiconv/configure.in trunk/libiconv/djgpp/Makefile.maint trunk/libiconv/djgpp/README.in trunk/libiconv/djgpp/config.bat trunk/libiconv/djgpp/config.sed trunk/libiconv/djgpp/config.site trunk/libiconv/djgpp/edtest.bat trunk/libiconv/djgpp/fnchange.in trunk/libiconv/djgpp/makefile.sed trunk/libiconv/djgpp/sources.sed trunk/libiconv/djgpp/stateful-check.sed trunk/libiconv/djgpp/translit-check.sed trunk/libiconv/include/iconv.h.in trunk/libiconv/include/iconv.h.msvc-shared trunk/libiconv/include/iconv.h.msvc-static trunk/libiconv/lib/Makefile.in trunk/libiconv/lib/Makefile.msvc trunk/libiconv/lib/Makefile.vms trunk/libiconv/lib/aliases.gperf trunk/libiconv/lib/aliases.h trunk/libiconv/lib/aliases2.h trunk/libiconv/lib/aliases_extra.h trunk/libiconv/lib/armscii_8.h trunk/libiconv/lib/ascii.h trunk/libiconv/lib/big5.h trunk/libiconv/lib/big5hkscs.h trunk/libiconv/lib/c99.h trunk/libiconv/lib/ces_big5.h trunk/libiconv/lib/ces_gbk.h trunk/libiconv/lib/cjk_variants.h trunk/libiconv/lib/cns11643.h trunk/libiconv/lib/cns11643_1.h trunk/libiconv/lib/cns11643_15.h trunk/libiconv/lib/cns11643_2.h trunk/libiconv/lib/cns11643_3.h trunk/libiconv/lib/cns11643_4.h trunk/libiconv/lib/cns11643_4a.h trunk/libiconv/lib/cns11643_4b.h trunk/libiconv/lib/cns11643_5.h trunk/libiconv/lib/cns11643_6.h trunk/libiconv/lib/cns11643_7.h trunk/libiconv/lib/cns11643_inv.h trunk/libiconv/lib/config.h.in trunk/libiconv/lib/config.h.msvc trunk/libiconv/lib/converters.h trunk/libiconv/lib/cp1046.h trunk/libiconv/lib/cp1124.h trunk/libiconv/lib/cp1125.h trunk/libiconv/lib/cp1129.h trunk/libiconv/lib/cp1133.h trunk/libiconv/lib/cp1161.h trunk/libiconv/lib/cp1162.h trunk/libiconv/lib/cp1163.h trunk/libiconv/lib/cp1250.h trunk/libiconv/lib/cp1251.h trunk/libiconv/lib/cp1252.h trunk/libiconv/lib/cp1253.h trunk/libiconv/lib/cp1254.h trunk/libiconv/lib/cp1255.h trunk/libiconv/lib/cp1256.h trunk/libiconv/lib/cp1257.h trunk/libiconv/lib/cp1258.h trunk/libiconv/lib/cp437.h trunk/libiconv/lib/cp737.h trunk/libiconv/lib/cp775.h trunk/libiconv/lib/cp850.h trunk/libiconv/lib/cp852.h trunk/libiconv/lib/cp853.h trunk/libiconv/lib/cp855.h trunk/libiconv/lib/cp856.h trunk/libiconv/lib/cp857.h trunk/libiconv/lib/cp858.h trunk/libiconv/lib/cp860.h trunk/libiconv/lib/cp861.h trunk/libiconv/lib/cp862.h trunk/libiconv/lib/cp863.h trunk/libiconv/lib/cp864.h trunk/libiconv/lib/cp865.h trunk/libiconv/lib/cp866.h trunk/libiconv/lib/cp869.h trunk/libiconv/lib/cp874.h trunk/libiconv/lib/cp922.h trunk/libiconv/lib/cp932.h trunk/libiconv/lib/cp932ext.h trunk/libiconv/lib/cp936ext.h trunk/libiconv/lib/cp943.h trunk/libiconv/lib/cp949.h trunk/libiconv/lib/cp950.h trunk/libiconv/lib/cp950ext.h trunk/libiconv/lib/dec_hanyu.h trunk/libiconv/lib/dec_kanji.h trunk/libiconv/lib/encodings.def trunk/libiconv/lib/encodings_aix.def trunk/libiconv/lib/encodings_dos.def trunk/libiconv/lib/encodings_extra.def trunk/libiconv/lib/encodings_local.def trunk/libiconv/lib/encodings_osf1.def trunk/libiconv/lib/euc_cn.h trunk/libiconv/lib/euc_jisx0213.h trunk/libiconv/lib/euc_jp.h trunk/libiconv/lib/euc_kr.h trunk/libiconv/lib/euc_tw.h trunk/libiconv/lib/flags.h trunk/libiconv/lib/flushwc.h trunk/libiconv/lib/gb12345.h trunk/libiconv/lib/gb12345ext.h trunk/libiconv/lib/gb18030.h trunk/libiconv/lib/gb18030ext.h trunk/libiconv/lib/gb18030uni.h trunk/libiconv/lib/gb2312.h trunk/libiconv/lib/gbk.h trunk/libiconv/lib/gbkext1.h trunk/libiconv/lib/gbkext2.h trunk/libiconv/lib/gbkext_inv.h trunk/libiconv/lib/genaliases.c trunk/libiconv/lib/genaliases2.c trunk/libiconv/lib/genflags.c trunk/libiconv/lib/gentranslit.c trunk/libiconv/lib/georgian_academy.h trunk/libiconv/lib/georgian_ps.h trunk/libiconv/lib/hkscs.h trunk/libiconv/lib/hp_roman8.h trunk/libiconv/lib/hz.h trunk/libiconv/lib/iconv.c trunk/libiconv/lib/iso2022_cn.h trunk/libiconv/lib/iso2022_cnext.h trunk/libiconv/lib/iso2022_jp.h trunk/libiconv/lib/iso2022_jp1.h trunk/libiconv/lib/iso2022_jp2.h trunk/libiconv/lib/iso2022_jp3.h trunk/libiconv/lib/iso2022_kr.h trunk/libiconv/lib/iso646_cn.h trunk/libiconv/lib/iso646_jp.h trunk/libiconv/lib/iso8859_1.h trunk/libiconv/lib/iso8859_10.h trunk/libiconv/lib/iso8859_13.h trunk/libiconv/lib/iso8859_14.h trunk/libiconv/lib/iso8859_15.h trunk/libiconv/lib/iso8859_16.h trunk/libiconv/lib/iso8859_2.h trunk/libiconv/lib/iso8859_3.h trunk/libiconv/lib/iso8859_4.h trunk/libiconv/lib/iso8859_5.h trunk/libiconv/lib/iso8859_6.h trunk/libiconv/lib/iso8859_7.h trunk/libiconv/lib/iso8859_8.h trunk/libiconv/lib/iso8859_9.h trunk/libiconv/lib/isoir165.h trunk/libiconv/lib/isoir165ext.h trunk/libiconv/lib/java.h trunk/libiconv/lib/jisx0201.h trunk/libiconv/lib/jisx0208.h trunk/libiconv/lib/jisx0212.h trunk/libiconv/lib/jisx0213.h trunk/libiconv/lib/johab.h trunk/libiconv/lib/johab_hangul.h trunk/libiconv/lib/koi8_r.h trunk/libiconv/lib/koi8_ru.h trunk/libiconv/lib/koi8_t.h trunk/libiconv/lib/koi8_u.h trunk/libiconv/lib/ksc5601.h trunk/libiconv/lib/loop_unicode.h trunk/libiconv/lib/loop_wchar.h trunk/libiconv/lib/loops.h trunk/libiconv/lib/mac_arabic.h trunk/libiconv/lib/mac_centraleurope.h trunk/libiconv/lib/mac_croatian.h trunk/libiconv/lib/mac_cyrillic.h trunk/libiconv/lib/mac_greek.h trunk/libiconv/lib/mac_hebrew.h trunk/libiconv/lib/mac_iceland.h trunk/libiconv/lib/mac_roman.h trunk/libiconv/lib/mac_romania.h trunk/libiconv/lib/mac_thai.h trunk/libiconv/lib/mac_turkish.h trunk/libiconv/lib/mac_ukraine.h trunk/libiconv/lib/mulelao.h trunk/libiconv/lib/nextstep.h trunk/libiconv/lib/relocatable.c trunk/libiconv/lib/relocatable.h trunk/libiconv/lib/riscos1.h trunk/libiconv/lib/shift_jisx0213.h trunk/libiconv/lib/sjis.h trunk/libiconv/lib/tcvn.h trunk/libiconv/lib/tds565.h trunk/libiconv/lib/tis620.h trunk/libiconv/lib/translit.def trunk/libiconv/lib/translit.h trunk/libiconv/lib/ucs2.h trunk/libiconv/lib/ucs2be.h trunk/libiconv/lib/ucs2internal.h trunk/libiconv/lib/ucs2le.h trunk/libiconv/lib/ucs2swapped.h trunk/libiconv/lib/ucs4.h trunk/libiconv/lib/ucs4be.h trunk/libiconv/lib/ucs4internal.h trunk/libiconv/lib/ucs4le.h trunk/libiconv/lib/ucs4swapped.h trunk/libiconv/lib/uhc_1.h trunk/libiconv/lib/uhc_2.h trunk/libiconv/lib/utf16.h trunk/libiconv/lib/utf16be.h trunk/libiconv/lib/utf16le.h trunk/libiconv/lib/utf32.h trunk/libiconv/lib/utf32be.h trunk/libiconv/lib/utf32le.h trunk/libiconv/lib/utf7.h trunk/libiconv/lib/utf8.h trunk/libiconv/lib/vietcomb.h trunk/libiconv/lib/viscii.h trunk/libiconv/libcharset/COPYING.LIB trunk/libiconv/libcharset/ChangeLog trunk/libiconv/libcharset/Makefile.devel trunk/libiconv/libcharset/Makefile.in trunk/libiconv/libcharset/NEWS trunk/libiconv/libcharset/README.woe32 trunk/libiconv/libcharset/autoconf/aclocal.m4 trunk/libiconv/libcharset/configure trunk/libiconv/libcharset/configure.in trunk/libiconv/libcharset/djgpp/README.in trunk/libiconv/libcharset/djgpp/config.bat trunk/libiconv/libcharset/djgpp/config.sed trunk/libiconv/libcharset/djgpp/config.site trunk/libiconv/libcharset/djgpp/fnchange.in trunk/libiconv/libcharset/include/libcharset.h.in trunk/libiconv/libcharset/include/libcharset.h.msvc-shared trunk/libiconv/libcharset/include/localcharset.h.in trunk/libiconv/libcharset/include/localcharset.h.msvc-shared trunk/libiconv/libcharset/lib/ChangeLog trunk/libiconv/libcharset/lib/Makefile.in trunk/libiconv/libcharset/lib/Makefile.msvc trunk/libiconv/libcharset/lib/Makefile.vms trunk/libiconv/libcharset/lib/config.charset trunk/libiconv/libcharset/lib/localcharset.c trunk/libiconv/libcharset/lib/ref-add.sin trunk/libiconv/libcharset/lib/ref-del.sin trunk/libiconv/libcharset/lib/relocatable.c trunk/libiconv/libcharset/lib/relocatable.h trunk/libiconv/libcharset/m4/libtool.m4 trunk/libiconv/libcharset/m4/relocatable.m4 trunk/libiconv/libcharset/tools/all-locales trunk/libiconv/libcharset/windows/charset.rc trunk/libiconv/m4/canonicalize.m4 trunk/libiconv/m4/gettext.m4 trunk/libiconv/m4/lib-ld.m4 trunk/libiconv/m4/lib-prefix.m4 trunk/libiconv/m4/libtool.m4 trunk/libiconv/m4/pathmax.m4 trunk/libiconv/m4/po.m4 trunk/libiconv/m4/relocatable.m4 trunk/libiconv/m4/setenv.m4 trunk/libiconv/m4/stdbool.m4 trunk/libiconv/m4/strerror_r.m4 trunk/libiconv/m4/unlocked-io.m4 trunk/libiconv/man/Makefile.in trunk/libiconv/man/iconv.3 trunk/libiconv/man/iconv.3.html trunk/libiconv/man/iconv_open.3 trunk/libiconv/man/iconv_open.3.html trunk/libiconv/po/ChangeLog trunk/libiconv/po/LINGUAS trunk/libiconv/po/Makefile.msvc trunk/libiconv/po/ca.po trunk/libiconv/po/da.po trunk/libiconv/po/de.po trunk/libiconv/po/eo.po trunk/libiconv/po/es.po trunk/libiconv/po/fi.po trunk/libiconv/po/fr.po trunk/libiconv/po/ga.po trunk/libiconv/po/gl.po trunk/libiconv/po/hr.po trunk/libiconv/po/hu.po trunk/libiconv/po/id.po trunk/libiconv/po/it.po trunk/libiconv/po/libiconv.pot trunk/libiconv/po/pt_BR.po trunk/libiconv/po/ro.po trunk/libiconv/po/ru.po trunk/libiconv/po/sk.po trunk/libiconv/po/sl.po trunk/libiconv/po/sv.po trunk/libiconv/po/tr.po trunk/libiconv/po/uk.po trunk/libiconv/src/Makefile.in trunk/libiconv/src/Makefile.vms trunk/libiconv/src/iconv.c trunk/libiconv/srclib/Makefile.am trunk/libiconv/srclib/Makefile.in trunk/libiconv/srclib/Makefile.msvc trunk/libiconv/srclib/Makefile.vms trunk/libiconv/srclib/alloca_.h trunk/libiconv/srclib/binary-io.h trunk/libiconv/srclib/canonicalize.c trunk/libiconv/srclib/canonicalize.h trunk/libiconv/srclib/error.c trunk/libiconv/srclib/error.h trunk/libiconv/srclib/exit.h trunk/libiconv/srclib/gettext.h trunk/libiconv/srclib/pathmax.h trunk/libiconv/srclib/progname.c trunk/libiconv/srclib/progname.h trunk/libiconv/srclib/progreloc.c trunk/libiconv/srclib/relocatable.c trunk/libiconv/srclib/relocatable.h trunk/libiconv/srclib/relocwrapper.c trunk/libiconv/srclib/setenv.c trunk/libiconv/srclib/setenv.h trunk/libiconv/srclib/strerror.c trunk/libiconv/srclib/unlocked-io.h trunk/libiconv/srclib/unsetenv.c trunk/libiconv/srclib/xmalloc.c trunk/libiconv/srclib/xreadlink.c trunk/libiconv/srclib/xreadlink.h trunk/libiconv/srclib/xstrdup.c trunk/libiconv/tests/EUC-JISX0213.TXT trunk/libiconv/tests/EUC-TW.IRREVERSIBLE.TXT trunk/libiconv/tests/EUC-TW.TXT trunk/libiconv/tests/ISO-2022-JP-3-snippet trunk/libiconv/tests/ISO-2022-JP-3-snippet.UTF-8 trunk/libiconv/tests/ISO-8859-7.TXT trunk/libiconv/tests/Makefile.in trunk/libiconv/tests/Makefile.msvc trunk/libiconv/tests/Makefile.os2 trunk/libiconv/tests/SHIFT_JISX0213.TXT trunk/libiconv/tests/check-stateful.bat trunk/libiconv/tests/check-stateful.cmd trunk/libiconv/tests/check-translit.bat trunk/libiconv/tests/check-translit.cmd trunk/libiconv/tests/genutf8.c trunk/libiconv/tests/table-from.c trunk/libiconv/tests/table-to.c trunk/libiconv/tests/uniq-u.c trunk/libiconv/tools/8bit_tab_to_h.c trunk/libiconv/tools/JISX0213.TXT trunk/libiconv/tools/Makefile trunk/libiconv/tools/cjk_tab_to_h.c trunk/libiconv/tools/cjk_variants.c trunk/libiconv/windows/iconv.rc trunk/libiconv/windows/stdbool.h Added Paths: ----------- trunk/libiconv/config.h trunk/libiconv/lib/al_arabi.h trunk/libiconv/lib/alarabi.h trunk/libiconv/libcharset/include/libcharset.h Modified: trunk/libiconv/ABOUT-NLS =================================================================== --- trunk/libiconv/ABOUT-NLS 2006-06-12 19:40:24 UTC (rev 302) +++ trunk/libiconv/ABOUT-NLS 2006-06-13 07:38:27 UTC (rev 303) @@ -1,11 +1,10 @@ -1 Notes on the Free Translation Project -*************************************** +Notes on the Free Translation Project +************************************* -Free software is going international! The Free Translation Project is -a way to get maintainers of free software, translators, and users all -together, so that free software will gradually become able to speak many -languages. A few packages already provide translations for their -messages. + Free software is going international! The Free Translation Project +is a way to get maintainers of free software, translators, and users all +together, so that will gradually become able to speak many languages. +A few packages already provide translations for their messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, @@ -16,17 +15,17 @@ Installers will find here some useful hints. These notes also explain how users should proceed for getting the programs to use the available translations. They tell how people wanting to contribute and -work on translations can contact the appropriate team. +work at translations should contact the appropriate team. When reporting bugs in the `intl/' directory or bugs which may be related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. -1.1 Quick configuration advice -============================== +Quick configuration advice +========================== -If you want to exploit the full power of internationalization, you + If you want to exploit the full power of internationalization, you should configure it using ./configure --with-included-gettext @@ -46,37 +45,37 @@ you have installed a recent copy of the GNU gettext package with the included `libintl'. -1.2 INSTALL Matters -=================== +INSTALL Matters +=============== -Some packages are "localizable" when properly installed; the programs -they contain can be made to speak your own native language. Most such -packages use GNU `gettext'. Other packages have their own ways to -internationalization, predating GNU `gettext'. + Some packages are "localizable" when properly installed; the +programs they contain can be made to speak your own native language. +Most such packages use GNU `gettext'. Other packages have their own +ways to internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of messages. It will automatically detect whether the system already -provides the GNU `gettext' functions. If not, the included GNU -`gettext' library will be used. This library is wholly contained -within this package, usually in the `intl/' subdirectory, so prior -installation of the GNU `gettext' package is _not_ required. -Installers may use special options at configuration time for changing -the default behaviour. The commands: +provides the GNU `gettext' functions. If not, the GNU `gettext' own +library will be used. This library is wholly contained within this +package, usually in the `intl/' subdirectory, so prior installation of +the GNU `gettext' package is _not_ required. Installers may use +special options at configuration time for changing the default +behaviour. The commands: ./configure --with-included-gettext ./configure --disable-nls -will, respectively, bypass any pre-existing `gettext' to use the +will respectively bypass any pre-existing `gettext' to use the internationalizing routines provided within this package, or else, _totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will probably detect the previously built and installed `libintl.a' file and -will decide to use this. This might not be desirable. You should use -the more recent version of the GNU `gettext' library. I.e. if the file -`intl/VERSION' shows that the library which comes with this package is -more recent, you should use +will decide to use this. This might be not what is desirable. You +should use the more recent version of the GNU `gettext' library. I.e. +if the file `intl/VERSION' shows that the library which comes with this +package is more recent, you should use ./configure --with-included-gettext @@ -87,7 +86,7 @@ emulation of `gettext' on top of `catgets' could not provide all the extensions of the GNU `gettext' library. - Internationalized packages usually have many `po/LL.po' files, where + Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless translations have been forbidden at `configure' time by using the `--disable-nls' switch, all available translations are installed @@ -96,10 +95,10 @@ `LINGUAS' should then contain a space separated list of two-letter codes, stating which languages are allowed. -1.3 Using This Package -====================== +Using This Package +================== -As a user, if your language has been installed for this package, you + As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate `LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, and `CC' is an ISO 3166 two-letter country code. For example, let's @@ -132,23 +131,16 @@ read translations in German than English for when Swedish is not available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. - Special advice for Norwegian users: The language code for Norwegian -bokma*l changed from `no' to `nb' recently (in 2003). During the -transition period, while some message catalogs for this language are -installed under `nb' and some older ones under `no', it's recommended -for Norwegian users to set `LANGUAGE' to `nb:no' so that both newer and -older translations are used. - In the `LANGUAGE' environment variable, but not in the `LANG' environment variable, `LL_CC' combinations can be abbreviated as `LL' to denote the language's main dialect. For example, `de' is equivalent to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' (Portuguese as spoken in Portugal) in this context. -1.4 Translating Teams -===================== +Translating Teams +================= -For the Free Translation Project to be a success, we need interested + For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of @@ -175,780 +167,279 @@ the terminology in use. Proven linguistic skill are praised more than programming skill, here. -1.5 Available Packages -====================== +Available Packages +================== -Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of April -2005. The matrix shows, in regard of each package, for which languages + Languages are not equally supported in all packages. The following +matrix shows the current state of internationalization, as of February +2003. The matrix shows, in regard of each package, for which languages PO files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB - +-------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] | - bash | [] [] | - batchelor | [] | - bfd | | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bluez-pin | [] [] [] [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] [] | - cpio | | - cpplib | [] [] [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] () [] [] [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | | - gliv | [] | - glunarclock | | - gmult | [] [] | - gnubiff | () | - gnucash | [] () () [] | - gnucash-glossary | [] () | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] [] | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] | - gtick | [] () | - gtkspell | [] [] [] | - hello | [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] | - iso_3166 | | - iso_3166_1 | [] [] [] [] [] | - iso_3166_2 | | - iso_3166_3 | [] | - iso_4217 | | - iso_639 | | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - latrine | () | - ld | [] | - libc | [] [] [] [] [] | - libextractor | | - libgpewidget | [] [] [] | - libgsasl | | - libiconv | [] [] [] [] [] | - libidn | | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] | - mysecretdiary | [] [] | - nano | [] () [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | [] [] [] [] | - psmisc | | - ptx | [] [] [] | - pwdutils | | - python | | - radius | [] | - recode | [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] | - sharutils | [] [] [] [] [] | - silky | | - skencil | [] () | - sketch | [] () | - solfege | [] | - soundtracker | [] [] | - sp | [] | - stardict | [] | - tar | | - texinfo | [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] [] [] [] [] | - xchat | [] [] [] [] | - xkeyboard-config | | - xpad | | - +-------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB - 10 0 0 2 7 4 0 41 43 3 52 90 20 1 15 + Ready PO files az be bg ca cs da de el en en_GB eo es et fa fi + +-------------------------------------------------+ + a2ps | [] [] [] [] [] | + aegis | () | + anubis | | + ap-utils | | + bash | [] [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] [] | + clisp | [] [] [] | + clisp | | + coreutils | [] [] [] [] | + cpio | [] [] [] | + darkstat | () [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] [] | + error | [] [] [] [] | + fetchmail | [] () [] [] [] | + fileutils | [] [] [] [] | + findutils | [] [] [] [] [] [] [] | + flex | [] [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gimp-print | | + gliv | | + gnucash | [] () | + gnucash-glossary| [] () [] | + gnupg | [] [] [] [] [] [] [] | + gpe-todo | | + gphoto2 | [] [] | + gprof | [] [] | + gpsdrive | () () () () | + grep | [] [] [] [] [] [] [] | + gretl | [] | + hello | [] [] [] [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] [] [] | + jpilot | () [] [] [] | + jwhois | [] | + kbd | [] [] [] | + ld | [] [] | + libc | [] [] [] [] [] [] [] | + libgpewidget | | + libiconv | [] [] [] [] [] [] | + lifelines | [] () | + lilypond | [] | + lingoteach | [] | + lingoteach_lessons| () () | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] | + mailutils | [] [] | + make | [] [] [] | + man-db | [] () [] () | + mysecretdiary | [] [] [] | + nano | [] () [] [] [] | + nano_1_0 | [] () [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] | + sed | [] [] [] [] [] [] | + sh-utils | [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + sketch | [] () [] | + soundtracker | [] [] [] | + sp | [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] | + tin | () () [] | + util-linux | [] [] [] [] [] [] [] | + vorbis-tools | [] [] | + wastesedge | () | + wdiff | [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] [] | + xchat | | + xpad | | + +-------------------------------------------------+ + az be bg ca cs da de el en en_GB eo es et fa fi + 0 1 2 26 9 49 46 9 1 1 11 52 19 1 15 + + fr gl he hr hu id it ja ko lg lv ms nb nl + +-------------------------------------------+ + a2ps | [] () () [] [] | + aegis | () | + anubis | [] [] | + ap-utils | [] | + bash | [] [] | + batchelor | | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] [] | + clisp | [] [] | + clisp | | + coreutils | [] [] [] | + cpio | [] [] [] [] [] | + darkstat | () [] [] [] | + diffutils | [] [] [] [] [] [] | + enscript | [] [] [] | + error | [] [] [] | + fetchmail | [] | + fileutils | [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] [] | + flex | [] [] | + gas | [] | + gawk | [] [] | + gcal | [] | + gcc | [] | + gettext | [] [] [] | + gimp-print | | + gliv | () | + gnucash | [] [] [] | + gnucash-glossary| [] [] | + gnupg | [] [] [] [] [] | + gpe-todo | | + gphoto2 | [] [] [] | + gprof | [] [] | + gpsdrive | () [] () () | + grep | [] [] [] [] [] [] [] [] | + gretl | [] | + hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] [] | + jpilot | [] () () | + jwhois | [] [] [] [] | + kbd | [] | + ld | [] | + libc | [] [] [] [] [] [] | + libgpewidget | | + libiconv | [] [] [] [] [] [] | + lifelines | () | + lilypond | [] [] | + lingoteach | [] | + lingoteach_lessons| | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + mailutils | | + make | [] [] [] [] [] [] [] | + man-db | [] () () | + mysecretdiary | [] [] | + nano | [] [] [] [] [] [] | + nano_1_0 | [] [] [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] | + ptx | [] [] [] [] [] [] | + python | | + radius | | + recode | [] [] [] [] [] | + sed | [] [] [] [] [] | + sh-utils | [] [] [] [] [] | + sharutils | [] [] [] [] [] | + sketch | [] | + soundtracker | [] [] [] | + sp | [] () | + tar | [] [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] [] | + tin | | + util-linux | [] [] () [] [] | + vorbis-tools | [] | + wastesedge | () | + wdiff | [] [] [] [] [] | + wget | [] [] [] [] [] [] [] | + xchat | | + xpad | | + +-------------------------------------------+ + fr gl he hr hu id it ja ko lg lv ms nb nl + 59 23 8 10 26 20 18 26 8 0 1 8 7 24 + + nn no pl pt pt_BR ro ru sk sl sv tr uk zh_CN zh_TW + +----------------------------------------------------+ + a2ps | () () () [] [] [] [] [] [] | 14 + aegis | () | 0 + anubis | [] [] | 4 + ap-utils | () () | 1 + bash | [] [] | 7 + batchelor | | 0 + bfd | [] [] | 6 + binutils | [] [] | 6 + bison | [] [] [] | 11 + clisp | | 5 + clisp | | 0 + coreutils | [] [] [] [] [] | 12 + cpio | [] [] [] [] [] | 13 + darkstat | [] [] () () | 6 + diffutils | [] [] [] [] [] [] | 19 + enscript | [] [] [] [] | 10 + error | [] [] [] [] | 11 + fetchmail | () () [] | 6 + fileutils | [] [] [] [] [] [] | 14 + findutils | [] [] [] [] [] [] [] [] | 24 + flex | [] [] [] [] | 10 + gas | [] | 3 + gawk | [] [] | 7 + gcal | [] [] | 4 + gcc | [] | 4 + gettext | [] [] [] [] [] [] | 14 + gimp-print | | 0 + gliv | [] | 1 + gnucash | [] [] [] [] [] | 9 + gnucash-glossary| [] [] [] [] | 8 + gnupg | [] [] [] [] | 16 + gpe-todo | | 0 + gphoto2 | [] [] | 7 + gprof | [] [] [] | 7 + gpsdrive | [] [] | 3 + grep | [] [] [] [] [] | 20 + gretl | | 2 + hello | [] [] [] [] [] [] [] [] [] | 31 + id-utils | [] [] [] [] | 9 + indent | [] [] [] [] [] | 17 + jpilot | () [] [] [] [] | 8 + jwhois | [] () () [] [] | 8 + kbd | [] [] | 6 + ld | [] [] | 5 + libc | [] [] [] [] [] [] [] | 20 + libgpewidget | | 0 + libiconv | [] [] [] [] [] [] | 18 + lifelines | [] | 2 + lilypond | [] | 4 + lingoteach | [] [] | 4 + lingoteach_lessons| () | 0 + lynx | [] [] [] [] | 13 + m4 | [] [] [] [] | 13 + mailutils | | 2 + make | [] [] [] [] [] | 15 + man-db | [] | 4 + mysecretdiary | [] [] [] | 8 + nano | [] [] [] | 13 + nano_1_0 | [] [] [] [] [] | 15 + opcodes | [] [] [] | 8 + parted | [] [] [] [] [] | 12 + ptx | [] [] [] [] [] [] [] | 20 + python | | 0 + radius | | 0 + recode | [] [] [] [] [] [] | 16 + sed | [] [] [] [] [] | 16 + sh-utils | [] [] [] | 12 + sharutils | [] [] [] [] | 16 + sketch | [] [] | 5 + soundtracker | [] | 7 + sp | [] | 3 + tar | [] [] [] [] [] [] [] [] [] | 24 + texinfo | [] [] [] [] | 12 + textutils | [] [] [] [] [] | 15 + tin | | 1 + util-linux | [] [] [] | 14 + vorbis-tools | [] | 4 + wastesedge | | 0 + wdiff | [] [] [] [] [] | 15 + wget | [] [] [] [] [] [] [] [] | 24 + xchat | | 0 + xpad | | 0 + +----------------------------------------------------+ + 43 teams nn no pl pt pt_BR ro ru sk sl sv tr uk zh_CN zh_TW + 82 domains 3 4 14 4 34 1 29 14 13 53 46 6 9 13 723 - eo es et eu fa fi fr ga gl he hr hu id is it - +-----------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] | - aspell | [] [] | - bash | [] [] [] [] | - batchelor | [] [] | - bfd | [] | - bibshelf | [] [] [] | - binutils | [] [] | - bison | [] [] [] [] [] [] | - bluez-pin | [] [] [] [] [] [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] | - cpio | [] [] | - cpplib | [] [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | [] () [] | - gnucash-glossary | [] [] | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | [] [] [] [] | - gpe-clock | [] [] [] | - gpe-conf | [] | - gpe-contacts | [] | - gpe-edit | [] [] | - gpe-go | [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | () () [] () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] [] | - gss | [] | - gst-plugins | [] [] [] | - gstreamer | [] | - gtick | [] [] [] [] [] | - gtkspell | [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_1 | [] [] [] [] [] [] [] | - iso_3166_2 | [] | - iso_3166_3 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - latrine | [] [] [] | - ld | [] [] | - libc | [] [] [] [] [] | - libextractor | | - libgpewidget | [] [] [] [] [] | - libgsasl | [] [] | - libiconv | [] [] [] [] [] [] [] [] [] [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] () [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] | - parted | [] [] [] [] | - psmisc | [] [] | - ptx | [] [] [] [] [] [] [] [] [] | - pwdutils | | - python | | - radius | ... [truncated message content] |
|
From: <sdt...@us...> - 2006-06-12 19:40:31
|
Revision: 302 Author: sdteffen Date: 2006-06-12 12:40:24 -0700 (Mon, 12 Jun 2006) ViewCVS: http://svn.sourceforge.net/dccss/?rev=302&view=rev Log Message: ----------- Version number adjustment. Modified Paths: -------------- trunk/giconv/ChangeLog Modified: trunk/giconv/ChangeLog =================================================================== --- trunk/giconv/ChangeLog 2006-06-12 19:39:31 UTC (rev 301) +++ trunk/giconv/ChangeLog 2006-06-12 19:40:24 UTC (rev 302) @@ -1,5 +1,7 @@ 2006-06-12 Steffen Macke <ste...@do...> + * devcpp/config.h: + * msvc/confi.h: Version number is 0.0.1 now * src/callbacks.c: Fixed crashbug when filenames where left empty * src/callbacks.c: * src/callbacks.h: This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
