Menu
▾
▴
[Dccss-commit] SF.net SVN: dccss:[368] branches/ms4w/apps/dccss
|
From: <mah...@us...> - 2009-01-19 09:37:16
|
Revision: 368
http://dccss.svn.sourceforge.net/dccss/?rev=368&view=rev
Author: maher_karim
Date: 2009-01-19 09:37:09 +0000 (Mon, 19 Jan 2009)
Log Message:
-----------
2009-01-19 Maher Abdel karim <mah...@do...>
* query.php:adjust the query to be only for the subscriber
table.Add more search options.
* print_ac.php: adjust the label size when printing.
* LC_MESSAGES/ar/dccss.po: update translations
Modified Paths:
--------------
branches/ms4w/apps/dccss/changelog
branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po
branches/ms4w/apps/dccss/print_ac.php
branches/ms4w/apps/dccss/query.php
Modified: branches/ms4w/apps/dccss/changelog
===================================================================
--- branches/ms4w/apps/dccss/changelog 2009-01-13 13:01:25 UTC (rev 367)
+++ branches/ms4w/apps/dccss/changelog 2009-01-19 09:37:09 UTC (rev 368)
@@ -1,3 +1,10 @@
+2009-01-19 Maher Abdel karim <mah...@do...>
+
+ * query.php:adjust the query to be only for the subscriber
+ table.Add more search options.
+ * print_ac.php: adjust the label size when printing.
+ * LC_MESSAGES/ar/dccss.po: update translations
+
2009-01-13 Maher Abdel karim <mah...@do...>
* query.php:Adjust the query form to have the ablility to search landmark.
Modified: branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po
===================================================================
--- branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po 2009-01-13 13:01:25 UTC (rev 367)
+++ branches/ms4w/apps/dccss/locale/ar/LC_MESSAGES/dccss.po 2009-01-19 09:37:09 UTC (rev 368)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: DCCSS\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2009-01-13 14:51+0200\n"
+"PO-Revision-Date: 2009-01-18 13:26+0200\n"
"Last-Translator: Maher Karim <Mah...@do...>\n"
"Language-Team: Dorsch <mah...@do...>\n"
"MIME-Version: 1.0\n"
@@ -181,7 +181,7 @@
# e:\program
#: ../../.././deliverypointpage.php:221
-#: ../../.././query.php:172
+#: ../../.././query.php:177
#: ../../.././subscriberpage.php:185
msgid "Back to delivery point"
msgstr "البحث عن نقطة المدخل باستخدام رقم التعريف"
@@ -369,7 +369,7 @@
#: ../../.././logbook_report.php:69
#: ../../.././logbook_report_subscriber.php:63
#: ../../.././meter_query_report.php:64
-#: ../../.././query.php:111
+#: ../../.././query.php:112
#: ../../.././taskforce_report.php:79
#: ../../.././admin/move_subscriber.php:76
#: ../../.././admin/processing.php:48
@@ -1376,7 +1376,7 @@
# e:\program
#: ../../.././map.php:559
-#: ../../.././query.php:202
+#: ../../.././query.php:207
#: ../../.././include/dataobject/Public_subscriber.php:227
msgid "[Print]"
msgstr "[طباعة]"
@@ -1650,47 +1650,51 @@
msgid "Query DeliverPoint Number"
msgstr "االاستفسار باستخدام نقطة الوصل"
+#: ../../.././query.php:53
+msgid "Baracode(PNR)"
+msgstr "رقم الباركود"
+
# c:\program
-#: ../../.././query.php:53
+#: ../../.././query.php:54
msgid "Query Meter Number"
msgstr "الاستفسار باستخدام الرقم الحديدي للعداد"
# c:\program
-#: ../../.././query.php:54
+#: ../../.././query.php:55
msgid "Query Subscriber Number"
msgstr "الاستفسار باستخدام رقم الاشتراك"
# c:\program
-#: ../../.././query.php:55
+#: ../../.././query.php:56
msgid "Query Subscriber name"
msgstr "الاستفسار باستخدام اسم المشترك"
# c:\program
-#: ../../.././query.php:56
+#: ../../.././query.php:57
msgid "Query Meter cabinet"
msgstr "الاستفسار باستخدام رقم الكابينة"
# e:\program
-#: ../../.././query.php:57
+#: ../../.././query.php:58
msgid "Query Landmark"
msgstr "البحث باستخدام معلم"
-#: ../../.././query.php:61
+#: ../../.././query.php:62
#: ../../.././include/dcmms/include/i18n.php:351
#: ../../.././include/dcmms/include/i18n.php:352
msgid "Area:"
msgstr "المنطقة:"
-#: ../../.././query.php:62
+#: ../../.././query.php:63
msgid "Narrow down the area in which to search for points of interest."
msgstr ""
# e:\program
-#: ../../.././query.php:66
-#: ../../.././query.php:76
-#: ../../.././query.php:82
-#: ../../.././query.php:89
-#: ../../.././query.php:95
+#: ../../.././query.php:67
+#: ../../.././query.php:77
+#: ../../.././query.php:83
+#: ../../.././query.php:90
+#: ../../.././query.php:96
#: ../../.././Copy of
#: include/header.php:306
#: ../../.././include/header.php:306
@@ -1699,28 +1703,28 @@
msgstr "[اختر واحدة]"
# e:\program
-#: ../../.././query.php:104
+#: ../../.././query.php:105
msgid "Search The Database"
msgstr "البحث في قاعدة البيانات"
# e:\program
-#: ../../.././query.php:187
+#: ../../.././query.php:192
msgid "Landmark Name"
msgstr "اسم المعلم"
# c:\program
-#: ../../.././query.php:188
+#: ../../.././query.php:193
msgid "Administrative Area"
msgstr "المنطقة"
# c:\program
-#: ../../.././query.php:189
+#: ../../.././query.php:194
#: ../../.././include/dcmms/include/i18n.php:326
msgid "Village"
msgstr "القرية"
# e:\program
-#: ../../.././query.php:190
+#: ../../.././query.php:195
#: ../../.././Copy of include/header.php:445
#: include/i18n.php:24
#: include/dataobject/Public_bill.php:38
@@ -1736,7 +1740,7 @@
# D:\dccss\dccss/deliverypointpage.php:107
# D:\dccss\dccss/deliverypointpage.php:138
-#: ../../.././query.php:199
+#: ../../.././query.php:204
#: ../../.././Copy of
#: include/dataobject/Public_subscriber.php:224
#: ../../.././include/dataobject/Public_subscriber.php:224
Modified: branches/ms4w/apps/dccss/print_ac.php
===================================================================
--- branches/ms4w/apps/dccss/print_ac.php 2009-01-13 13:01:25 UTC (rev 367)
+++ branches/ms4w/apps/dccss/print_ac.php 2009-01-19 09:37:09 UTC (rev 368)
@@ -176,6 +176,18 @@
$objLayer->set("status",MS_OFF);
$objLayer = $map->getlayerbyname('pressurizedmain');
$objLayer->set("status",MS_ON);
+ $objLayer = $map->getlayerbyname('DeliveryPoint');
+$oClass =$objLayer->getClass(0);;
+$oClass->label->set("font", "arial");
+ $oClass->label->set("type", MS_TRUETYPE);
+ $oClass->label->set("size", 20);
+
+ $objLayer = $map->getlayerbyname('landmark');
+$oClass =$objLayer->getClass(0);;
+$oClass->label->set("font", "arial");
+ $oClass->label->set("type", MS_TRUETYPE);
+ $oClass->label->set("size", 20);
+
$objLayer = $map->getlayerbyname('collection');
$objLayer->set("status", MS_ON);
$objLayer = $map->getlayerbyname('grid');
Modified: branches/ms4w/apps/dccss/query.php
===================================================================
--- branches/ms4w/apps/dccss/query.php 2009-01-13 13:01:25 UTC (rev 367)
+++ branches/ms4w/apps/dccss/query.php 2009-01-19 09:37:09 UTC (rev 368)
@@ -41,8 +41,7 @@
-$tablename='public.subscriber';
-$arrTable=array('bill'=>_('Bill'),'subscriber'=>_('Subscriber'));
+$arrTable=array('subscriber'=>_('Subscriber'));
$Queryform = new HTML_QuickForm('printForm');
// Add some elements to the form
$Queryform->addElement('header', null, _('Query Using Subscriber Information'));
@@ -50,6 +49,7 @@
$Queryform->addElement('text', 'searchvalue', _('Enter Search Value:'),
array('size' => 50, 'maxlength' => 128));
$Queryform->addElement('radio', 'query',_('Query DeliverPoint Number'),'',5);
+$Queryform->addElement('radio', 'query',_('Baracode(PNR)'),'',6);
$Queryform->addElement('radio', 'query',_('Query Meter Number'),'',1);
$Queryform->addElement('radio', 'query',_('Query Subscriber Number'),'',2);
$Queryform->addElement('radio', 'query',_('Query Subscriber name'),'',3);
@@ -115,7 +115,8 @@
if($Queryform->validate()) {
if(($Queryform->exportValue('Table')=='bill')&&
($Queryform->exportValue('query')!=4)){
- $tablename='public.'.$Queryform->exportValue('Table');
+ //$tablename='public.'.$Queryform->exportValue('Table');
+ $tablename='public.subscriber';
$strQuery="select logbook,sequence,subsequence,name,subscribernumber,
meternumber from ".$Queryform->exportValue('Table')." where ";
if (($Queryform->exportValue('query')==1)){
@@ -129,10 +130,14 @@
$strWhere="name='".$Queryform->exportValue('searchvalue')."'";
} elseif ($Queryform->exportValue('query')==5){
$strWhere="sequence='".$Queryform->exportValue('searchvalue')."'";
+ } elseif ($Queryform->exportValue('query')==6){
+ $strWhere="paracodee='".$Queryform->exportValue('searchvalue')."'";
}
}else{
- $tablename='public.'.$Queryform->exportValue('Table');
+
+ // $tablename='public.'.$Queryform->exportValue('Table');
+ $tablename='public.subscriber';
$strQuery="select deliverypoint.sequence,subscriber.sequence as s,subscriber.logbooknumber,subscriber.name,subscriber.id,
subscriber.geocode,subscriber.serialnumber,subscriber.subscription,subscriber.subsequence
from deliverypoint,subscriber where
@@ -149,6 +154,8 @@
$Queryform->exportValue('searchvalue')."')";
} elseif ($Queryform->exportValue('query')==5){
$strWhere=" and deliverypoint.sequence=".$Queryform->exportValue('searchvalue');
+ } elseif ($Queryform->exportValue('query')==6){
+ $strWhere=" and paracode='".$Queryform->exportValue('searchvalue')."'";
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
