[Rapc-commit] SF.net SVN: rapc: [58] trunk/rapc
Brought to you by:
maher_karim,
sdteffen
Menu
▾
▴
[Rapc-commit] SF.net SVN: rapc: [58] trunk/rapc
|
From: <mah...@us...> - 2007-03-18 11:56:05
|
Revision: 58
http://svn.sourceforge.net/rapc/?rev=58&view=rev
Author: maher_karim
Date: 2007-03-18 02:27:53 -0700 (Sun, 18 Mar 2007)
Log Message:
-----------
2007-03-18 Maher Abdel karim <mah...@do...>
* script/create_view.sql:add panel.id to the view.
* local/ar/LC_MESSAGES/rapc.po:update transaltions.
* panelinstallation_report.php:adjust report based on MPWH request.
* include/i18n.php:adjust translation.
* authorized_panel_report.php:adjust report based on MPWH request.
* contract_panel_report.php:
* detailed_panelinstallation_report.php:
* illegal_panelinstallation_report.php:
* public_panel.php:
* reports.php:adjust based on MPWH requests.
Modified Paths:
--------------
trunk/rapc/authorized_panel_report.php
trunk/rapc/changelog
trunk/rapc/illegal_panelinstallation_report.php
trunk/rapc/include/dataobject/Public_panel.php
trunk/rapc/include/i18n.php
trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
trunk/rapc/panelinstallation_report.php
trunk/rapc/reports.php
trunk/rapc/script/create_views.sql
Modified: trunk/rapc/authorized_panel_report.php
===================================================================
--- trunk/rapc/authorized_panel_report.php 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/authorized_panel_report.php 2007-03-18 09:27:53 UTC (rev 58)
@@ -26,7 +26,7 @@
// This require for quick form building.
require_once("HTML/QuickForm.php");
-$DccssPage = new RolPage(_("Authorized Panel installation report-Governorates"));
+$DccssPage = new RolPage(_("Authorized Panel installation report- ALL Governorates"));
//print_r($_POST);
$Queryform = new HTML_QuickForm('printForm');
Modified: trunk/rapc/changelog
===================================================================
--- trunk/rapc/changelog 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/changelog 2007-03-18 09:27:53 UTC (rev 58)
@@ -1,3 +1,16 @@
+2007-03-18 Maher Abdel karim <mah...@do...>
+
+ * script/create_view.sql:add panel.id to the view.
+ * local/ar/LC_MESSAGES/rapc.po:update transaltions.
+ * panelinstallation_report.php:adjust report based on MPWH request.
+ * include/i18n.php:adjust translation.
+ * authorized_panel_report.php:adjust report based on MPWH request.
+ * contract_panel_report.php:
+ * detailed_panelinstallation_report.php:
+ * illegal_panelinstallation_report.php:
+ * public_panel.php:
+ * reports.php:adjust based on MPWH requests.
+
2006-09-13 Maher Abdel karim <mah...@do...>
* Authorized_panel_report.php:
Modified: trunk/rapc/illegal_panelinstallation_report.php
===================================================================
--- trunk/rapc/illegal_panelinstallation_report.php 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/illegal_panelinstallation_report.php 2007-03-18 09:27:53 UTC (rev 58)
@@ -109,10 +109,10 @@
routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
insurancereceiptdate,boolrow";
*/
-$strQuery="select companyname,panelsubject,routetype,routename,boolrow,dimension,
+$strQuery="select id,companyname,panelsubject,routetype,routename,boolrow,dimension,
sum(totalfees),facecount,count(*),usefees,verificationreceiptno,
verificationreceiptdate from panelinformation ".$strWhere." group by companyname,routename,panelsubject,
-routetype,dimension,facecount,insurance,usefees,verificationreceiptno,verificationreceiptdate,boolrow";
+routetype,dimension,facecount,insurance,usefees,verificationreceiptno,verificationreceiptdate,boolrow,id";
//print_r($strQuery);
$objTable = new DbTable($DccssPage->postgis->db, $strQuery);
Modified: trunk/rapc/include/dataobject/Public_panel.php
===================================================================
--- trunk/rapc/include/dataobject/Public_panel.php 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/include/dataobject/Public_panel.php 2007-03-18 09:27:53 UTC (rev 58)
@@ -391,6 +391,7 @@
}
if (val==3){
+ document.forms[2].contractno.value="";
document.forms[2].companyname.disabled=false
document.forms[2].registerno.disabled=false
document.forms[2].ownership.disabled=true
@@ -405,6 +406,7 @@
document.forms[2].contractunitprice.disabled=true
}
if (val==2){
+ document.forms[2].contractno.value="";
document.forms[2].companyname.disabled=true
document.forms[2].registerno.disabled=true
document.forms[2].ownership.disabled=false
Modified: trunk/rapc/include/i18n.php
===================================================================
--- trunk/rapc/include/i18n.php 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/include/i18n.php 2007-03-18 09:27:53 UTC (rev 58)
@@ -98,6 +98,9 @@
_("Ministry of Public Works");
_("Ajlun");
_("Advertisement");
+_("Id");
+_("x");
+_("y");
?>
Modified: trunk/rapc/locale/ar/LC_MESSAGES/rapc.po
===================================================================
--- trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/locale/ar/LC_MESSAGES/rapc.po 2007-03-18 09:27:53 UTC (rev 58)
@@ -2,7 +2,7 @@
msgstr ""
"Project-Id-Version: mpwh\n"
"POT-Creation-Date: \n"
-"PO-Revision-Date: 2007-02-13 08:06+0200\n"
+"PO-Revision-Date: 2007-03-18 11:22+0200\n"
"Last-Translator: t <t>\n"
"Language-Team: dc <mah...@do...>\n"
"MIME-Version: 1.0\n"
@@ -119,8 +119,8 @@
msgstr "لم تتم المعالجة"
#: ../../../authorized_panel_report.php:29
-msgid "Authorized Panel installation report-Governorates"
-msgstr "اللوحات الاعلانية المرخصة-المحافظات"
+msgid "Authorized Panel installation report- ALL Governorates"
+msgstr "اللوحات الاعلانية المرخصة-لكافة المحافظات"
#: ../../../authorized_panel_report.php:37
#: ../../../contract_panel_report.php:37
@@ -191,43 +191,45 @@
msgid "Search The Database"
msgstr "البحث في قاعدة البيانات"
-#: ../../../authorized_panel_report.php:94
-#: ../../../contract_panel_report.php:98
+#: ../../../authorized_panel_report.php:98
+#: ../../../contract_panel_report.php:102
+#: ../../../detailed_panelinstallation_report.php:109
#: ../../../print.php:62
msgid "Ministry of Public Works and Housing"
msgstr "وزارة الاشغال العامة و الاسكان"
-#: ../../../authorized_panel_report.php:95
+#: ../../../authorized_panel_report.php:99
msgid "Traffic Safty Directorate-Violation Department"
msgstr "مديرية السلامة المرورية - قسم التعديات"
-#: ../../../authorized_panel_report.php:96
-#: ../../../detailed_panelinstallation_report.php:99
-#: ../../../panelinstallation_report.php:115
+#: ../../../authorized_panel_report.php:100
+#: ../../../detailed_panelinstallation_report.php:132
+#: ../../../panelinstallation_report.php:120
msgid "Authorized panel list from:"
msgstr "قائمة اللوحات المرخصة من:"
-#: ../../../authorized_panel_report.php:98
-#: ../../../contract_panel_report.php:101
-#: ../../../detailed_panelinstallation_report.php:101
-#: ../../../illegal_panelinstallation_report.php:119
-#: ../../../panelinstallation_report.php:117
+#: ../../../authorized_panel_report.php:102
+#: ../../../contract_panel_report.php:105
+#: ../../../detailed_panelinstallation_report.php:134
+#: ../../../illegal_panelinstallation_report.php:123
+#: ../../../panelinstallation_report.php:122
msgid " To:"
msgstr "الى:"
-#: ../../../authorized_panel_report.php:99
-#: ../../../contract_panel_report.php:102
-#: ../../../detailed_panelinstallation_report.php:102
-#: ../../../illegal_panelinstallation_report.php:120
-#: ../../../panelinstallation_report.php:118
+#: ../../../authorized_panel_report.php:103
+#: ../../../contract_panel_report.php:106
+#: ../../../detailed_panelinstallation_report.php:139
+#: ../../../detailed_panelinstallation_report.php:142
+#: ../../../illegal_panelinstallation_report.php:124
+#: ../../../panelinstallation_report.php:123
msgid "District:"
msgstr "المحافظة:"
-#: ../../../authorized_panel_report.php:270
+#: ../../../authorized_panel_report.php:274
msgid "Advertisement Section"
msgstr "شعبة الاعلانات"
-#: ../../../authorized_panel_report.php:271
+#: ../../../authorized_panel_report.php:275
msgid "Head of Section"
msgstr "رئيس القسم"
@@ -235,7 +237,7 @@
msgid "Contract Panel installation report"
msgstr "تقرير تركيب اللوحات - العطاءات"
-#: ../../../contract_panel_report.php:99
+#: ../../../contract_panel_report.php:103
msgid "Authorized panel list by contract for the period from:"
msgstr "قائمة اللوحات المرخصه للعطاءات للفترة من:"
@@ -252,11 +254,99 @@
msgid "Receipt number"
msgstr "رقم الوصل المالي"
+#: ../../../detailed_panelinstallation_report.php:110
+#: ../../../panelinstallation_report.php:129
+#: ../../../panelinstallation_report.php:130
+#: ../../../print.php:65
+msgid "Date:"
+msgstr "التاريخ:"
+
+#: ../../../detailed_panelinstallation_report.php:111
+#: ../../../detailed_panelinstallation_report.php:122
+msgid "Dated:"
+msgstr "الموافق:"
+
+#: ../../../detailed_panelinstallation_report.php:113
+msgid "Form No. (3) April 2006"
+msgstr "\xD9\x86موذج رقم (3) نيسان 2006"
+
+#: ../../../detailed_panelinstallation_report.php:114
+msgid "Gentelmen:"
+msgstr "السادة:"
+
+#: ../../../detailed_panelinstallation_report.php:115
+msgid "Subject: Panel Authorization"
+msgstr "الموضوع:ترخيص الاعلانات"
+
+#: ../../../detailed_panelinstallation_report.php:116
+msgid "Reference to your letter No.:"
+msgstr "اشارة لكتابكم ر قم:"
+
+#: ../../../detailed_panelinstallation_report.php:117
+msgid "Dated:............."
+msgstr "تاريخ:............."
+
+#: ../../../detailed_panelinstallation_report.php:118
+msgid "After the joined field check on"
+msgstr "وبعد ان تم الكشف الحسي المشترك معكم على"
+
+#: ../../../detailed_panelinstallation_report.php:119
+msgid "requesting advertisement panel installation,and inform you "
+msgstr "المطلوب تركيب شواخص الاعلانات و اطلاعكم "
+
+#: ../../../detailed_panelinstallation_report.php:120
+msgid "about the technical specifications issued by MPWH and your approval on it,and"
+msgstr "على المواصفات الفنية الصادرة من وزارة الاشغال العامة و الاسكان و موافقتكم عليها و"
+
+#: ../../../detailed_panelinstallation_report.php:121
+msgid " paying the fees by the financial receipt No.:"
+msgstr "دفعكم للرسوم و البدلات المطلوبة بالايصال المالي رقم:"
+
+#: ../../../detailed_panelinstallation_report.php:123
+msgid "Based on the given authorities by the law of the material No.17"
+msgstr "و استنادا للصلاحيات المخولة لي باحكام المادة 17"
+
+#: ../../../detailed_panelinstallation_report.php:124
+msgid " of the road law No. 24 for the year of 1986 and its adjustments,"
+msgstr "من قانون الطرق رقم 24 لسنة 1986 و تعديلاته "
+
+#: ../../../detailed_panelinstallation_report.php:125
+msgid "No objection regarding installing "
+msgstr "لا مانع من ان تقوموا بتركيب"
+
+#: ../../../detailed_panelinstallation_report.php:126
+msgid "panles (s) In the locations, and specifications which were agreed as follows:"
+msgstr "لوحة بالمواقع و المواصفات التي تم الاتفاق عليها المبينة كالاتي:-"
+
+#: ../../../detailed_panelinstallation_report.php:148
+msgid "Total of receipt:"
+msgstr "المجموع الكلي للوصل المالي:"
+
+#: ../../../detailed_panelinstallation_report.php:149
+msgid "This permission will be considered canceled in case if you have"
+msgstr "يعتبر هذا التصريح لاغيا في حال"
+
+#: ../../../detailed_panelinstallation_report.php:150
+msgid " violated the locations and/or the technical specifications of the advertisement."
+msgstr "مخالفتكم المواقع او المواصفات الفنية للاعلان"
+
+#: ../../../detailed_panelinstallation_report.php:151
+msgid "You will be totally responsible,illegal panels will be removed"
+msgstr "محملكم كافة المسؤوليات المترتبة على ذلك و سيتم ازالة المخالفة"
+
+#: ../../../detailed_panelinstallation_report.php:152
+msgid " based on the road law No. 24 for year 1986 and adjustments"
+msgstr "وفقا لاحكام قانون الطرق رقم 24 لسنة 1986 و تعديلاته."
+
+#: ../../../detailed_panelinstallation_report.php:154
+msgid "Governorate Public works office"
+msgstr "مكتب اشغال محافظة"
+
#: ../../../illegal_panelinstallation_report.php:29
msgid "Illegal Panel installation report"
msgstr "تقرير اللوحات الاعلانية المخالفة"
-#: ../../../illegal_panelinstallation_report.php:117
+#: ../../../illegal_panelinstallation_report.php:121
msgid "Illegal panel list from:"
msgstr "قائمة اللوحات المخالفة من:"
@@ -596,27 +686,22 @@
msgstr "تعريف"
#: ../../../panelinstallation_report.php:29
+#: ../../../reports.php:33
msgid "Panel installation report"
msgstr "تقرير الل\xD9\x88حات الاعلانية المرخصة"
-#: ../../../panelinstallation_report.php:110
+#: ../../../panelinstallation_report.php:115
msgid "Unkown"
msgstr "غير محدد"
-#: ../../../panelinstallation_report.php:122
+#: ../../../panelinstallation_report.php:127
msgid "Responsible Engineer"
msgstr "المهندس المسؤول:"
-#: ../../../panelinstallation_report.php:124
+#: ../../../panelinstallation_report.php:129
msgid "Public Works Office for:"
msgstr "مكتب اشغال محافظة:"
-#: ../../../panelinstallation_report.php:124
-#: ../../../panelinstallation_report.php:125
-#: ../../../print.php:65
-msgid "Date:"
-msgstr "التاريخ:"
-
#: ../../../panelpage.php:38
msgid "Road Advertisment Panel Control"
msgstr "برنامج التحكم باللوحات الاعلانية على الطرق"
@@ -637,15 +722,15 @@
msgid "Select To Date"
msgstr "اختر نهاية الفترة"
-#: ../../../paneltypes_report.php:52
+#: ../../../paneltypes_report.php:55
msgid "Panel installation on route for the period from"
msgstr "تركيب اللوحات الاعلانية على الطرق خلال الفترة من"
-#: ../../../paneltypes_report.php:53
+#: ../../../paneltypes_report.php:56
msgid "\t\t"
msgstr ""
-#: ../../../paneltypes_report.php:53
+#: ../../../paneltypes_report.php:56
msgid "To"
msgstr "الى"
@@ -695,14 +780,10 @@
msgid "denotes required field"
msgstr "ادخل معلومات الحقول المطلوبة"
-#: ../../../query.php:192
+#: ../../../query.php:196
msgid "Back to Panel"
msgstr "العودة الى اللوحة"
-#: ../../../reports.php:33
-msgid "Panel Installation list"
-msgstr "قائمة اللوحات المركبة"
-
#: ../../../reports.php:35
msgid "Panel Types on routes"
msgstr "انواع اللوحات على الطرق"
@@ -711,14 +792,22 @@
msgid "Authorized Panel installation"
msgstr "اللوحات الاعلانية المرخصة"
+#: ../../../reports.php:37
+msgid "Ministry - Traffic Safty Directorate"
+msgstr "الوزارة - مديرية السلامة المرورية"
+
#: ../../../reports.php:39
msgid "Illegal Panel installation"
msgstr "اللوحات الاعلانية المخالفة"
#: ../../../reports.php:41
msgid "Detailed Panel installation"
-msgstr "تفصيل اللوحات المركبة المفصل"
+msgstr "تقرير اللوحات المركبة المفصل"
+#: ../../../reports.php:41
+msgid " Form No. (3)"
+msgstr "نموذج رقم (3) نيسان 2006"
+
#: ../../../reports.php:43
msgid "Contract Panel installation"
msgstr "لوحات العطاءات المركبة"
@@ -1080,7 +1169,7 @@
#: ../../../admin/user_management.php:306
#: ../../../include/header.php:430
#: ../../../include/i18n.php:24
-#: ../../../include/dataobject/Public_panel.php:800
+#: ../../../include/dataobject/Public_panel.php:802
msgid "Action"
msgstr "الاجراء"
@@ -1281,8 +1370,8 @@
#: ../../../include/i18n.php:25
#: ../../../include/i18n.php:83
-#: ../../../include/dataobject/Public_panel.php:687
-#: ../../../include/dataobject/Public_panel.php:749
+#: ../../../include/dataobject/Public_panel.php:689
+#: ../../../include/dataobject/Public_panel.php:751
msgid "No"
msgstr "لا"
@@ -1291,8 +1380,8 @@
msgstr "غير معروف"
#: ../../../include/i18n.php:27
-#: ../../../include/dataobject/Public_panel.php:687
-#: ../../../include/dataobject/Public_panel.php:749
+#: ../../../include/dataobject/Public_panel.php:689
+#: ../../../include/dataobject/Public_panel.php:751
msgid "Yes"
msgstr "نعم"
@@ -1339,7 +1428,7 @@
#: ../../../include/i18n.php:38
msgid "Total"
-msgstr "المجموع"
+msgstr "مجموع عدد اللوحات"
#: ../../../include/i18n.php:39
msgid "Notes"
@@ -1565,6 +1654,18 @@
msgid "Advertisement"
msgstr "لوحة اعلانية"
+#: ../../../include/i18n.php:101
+msgid "Id"
+msgstr "رقم اللوحة"
+
+#: ../../../include/i18n.php:102
+msgid "x"
+msgstr "X"
+
+#: ../../../include/i18n.php:103
+msgid "y"
+msgstr "Y"
+
#: ../../../include/dataobject/Public_panel.php:144
msgid "Please Enter the X coordinate for the panel."
msgstr "الرجاء ادخال الاحداثية X للوحة"
@@ -1796,8 +1897,8 @@
msgstr "يوجد جزيرة:"
#: ../../../include/dataobject/Public_panel.php:347
-#: ../../../include/dataobject/Public_panel.php:714
-#: ../../../include/dataobject/Public_panel.php:732
+#: ../../../include/dataobject/Public_panel.php:716
+#: ../../../include/dataobject/Public_panel.php:734
msgid "Date"
msgstr "التاريخ:"
@@ -1838,7 +1939,7 @@
msgstr "نوع اللوحة و ابعادها:"
#: ../../../include/dataobject/Public_panel.php:354
-#: ../../../include/dataobject/Public_panel.php:719
+#: ../../../include/dataobject/Public_panel.php:721
msgid "Panel Area"
msgstr "مساحة اللوحة:"
@@ -1887,7 +1988,7 @@
msgstr "رقم الترخيص:"
#: ../../../include/dataobject/Public_panel.php:361
-#: ../../../include/dataobject/Public_panel.php:737
+#: ../../../include/dataobject/Public_panel.php:739
msgid "Registeration No.:"
msgstr "رقم التسجيل:"
@@ -1925,98 +2026,98 @@
msgid "%s: This field is required."
msgstr "%s: يجب ادخال هذا الحقل."
-#: ../../../include/dataobject/Public_panel.php:602
+#: ../../../include/dataobject/Public_panel.php:604
msgid "Select One"
msgstr "اختر واحد"
-#: ../../../include/dataobject/Public_panel.php:680
+#: ../../../include/dataobject/Public_panel.php:682
msgid "Contract"
msgstr "عطاء"
-#: ../../../include/dataobject/Public_panel.php:680
+#: ../../../include/dataobject/Public_panel.php:682
msgid "Private"
msgstr "قطاع خاص"
-#: ../../../include/dataobject/Public_panel.php:680
+#: ../../../include/dataobject/Public_panel.php:682
msgid "Goverment"
msgstr "حكومي"
-#: ../../../include/dataobject/Public_panel.php:686
+#: ../../../include/dataobject/Public_panel.php:688
msgid "Panel catagory"
msgstr "فئة اللوحة"
-#: ../../../include/dataobject/Public_panel.php:694
+#: ../../../include/dataobject/Public_panel.php:696
msgid "Median available"
msgstr "يوجد جزيرة"
-#: ../../../include/dataobject/Public_panel.php:696
+#: ../../../include/dataobject/Public_panel.php:698
msgid "Panel image"
msgstr "صورة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:701
+#: ../../../include/dataobject/Public_panel.php:703
msgid "Panel Area:"
msgstr "مساحة اللوحة:"
-#: ../../../include/dataobject/Public_panel.php:703
-#: ../../../include/dataobject/Public_panel.php:721
+#: ../../../include/dataobject/Public_panel.php:705
+#: ../../../include/dataobject/Public_panel.php:723
msgid "Use fees"
msgstr "بدل استغلال حرم الطريق"
-#: ../../../include/dataobject/Public_panel.php:705
-#: ../../../include/dataobject/Public_panel.php:723
+#: ../../../include/dataobject/Public_panel.php:707
+#: ../../../include/dataobject/Public_panel.php:725
msgid "Annualfees"
msgstr "الرسوم السنوية:"
-#: ../../../include/dataobject/Public_panel.php:707
-#: ../../../include/dataobject/Public_panel.php:725
+#: ../../../include/dataobject/Public_panel.php:709
+#: ../../../include/dataobject/Public_panel.php:727
msgid "Total fees"
msgstr "المجموع"
-#: ../../../include/dataobject/Public_panel.php:743
+#: ../../../include/dataobject/Public_panel.php:745
msgid "Total fees:"
msgstr "مجموع الرسوم:"
-#: ../../../include/dataobject/Public_panel.php:749
+#: ../../../include/dataobject/Public_panel.php:751
msgid "Right of Way:"
msgstr "داخل الحرم:"
-#: ../../../include/dataobject/Public_panel.php:792
+#: ../../../include/dataobject/Public_panel.php:794
msgid "ID"
-msgstr "رقم التعريف"
+msgstr "رقم اللوحة"
-#: ../../../include/dataobject/Public_panel.php:793
+#: ../../../include/dataobject/Public_panel.php:795
msgid "Company name"
msgstr "اسم الجهة الطالبة"
-#: ../../../include/dataobject/Public_panel.php:794
+#: ../../../include/dataobject/Public_panel.php:796
msgid "National number"
msgstr "الرقم الوطني:"
-#: ../../../include/dataobject/Public_panel.php:795
+#: ../../../include/dataobject/Public_panel.php:797
msgid "Mother name"
msgstr "اسم الام:"
-#: ../../../include/dataobject/Public_panel.php:796
+#: ../../../include/dataobject/Public_panel.php:798
msgid "Address"
msgstr "العنوان:"
-#: ../../../include/dataobject/Public_panel.php:797
+#: ../../../include/dataobject/Public_panel.php:799
msgid "Telephone no."
msgstr "رقم الهاتف:"
-#: ../../../include/dataobject/Public_panel.php:798
+#: ../../../include/dataobject/Public_panel.php:800
msgid "Fax no."
msgstr "رقم الفاكس:"
-#: ../../../include/dataobject/Public_panel.php:799
+#: ../../../include/dataobject/Public_panel.php:801
msgid "Mobile no."
msgstr "رقم المحمول:"
-#: ../../../include/dataobject/Public_panel.php:816
+#: ../../../include/dataobject/Public_panel.php:818
msgid "[View on Map]"
msgstr "[اظهار على الخريطة]"
-#: ../../../include/dataobject/Public_panel.php:822
+#: ../../../include/dataobject/Public_panel.php:824
msgid "[Edit]"
msgstr "[تحرير]"
Modified: trunk/rapc/panelinstallation_report.php
===================================================================
--- trunk/rapc/panelinstallation_report.php 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/panelinstallation_report.php 2007-03-18 09:27:53 UTC (rev 58)
@@ -101,12 +101,13 @@
left outer join routetype on (routetype.codedvalue=panel.routetype) left outer
join facecount on (facecount.codedvalue=panel.facecount) ".$strWhere;
*/
-$strQuery="select companyname,registerno,panelsubject,routetype,routename,dimension,boolrow,
-sum(totalfees),usefees,facecount,count(*) as panelcount,insurance,receiptno,recEiptdate,
+$strQuery="select id,x,y,companyname,registerno,panelsubject,routetype,routename,
+dimension,facecount,count(*) as panelcount,boolrow,usefees,
+sum(totalfees),insurance,receiptno,recEiptdate,
insurancereceiptno,insurancereceiptdate,13-(date_part('month',date)) as Advertisement_period
from panelinformation ".$strWhere."group by companyname,routename,panelsubject,
routetype,dimension,facecount,insurance,usefees,receiptno,receiptdate,
-insurancereceiptdate,boolrow,registerno,insurancereceiptno,date";
+insurancereceiptdate,boolrow,registerno,insurancereceiptno,date,id,x,y";
//print_r($strQuery);
if ($Queryform->exportvalue('district')!=0){
$strDistrict = $Queryform->exportvalue('district');
Modified: trunk/rapc/reports.php
===================================================================
--- trunk/rapc/reports.php 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/reports.php 2007-03-18 09:27:53 UTC (rev 58)
@@ -30,15 +30,15 @@
<ul>
<li><a href="panelinstallation_report.php?PHPSESSID=session_id()">'.
- _("Panel Installation list").'</a></li>
+ _("Panel installation report").'</a></li>
<li><a href="paneltypes_report.php?PHPSESSID=session_id()">'.
_("Panel Types on routes").'</a></li>
<li><a href="authorized_panel_report.php?PHPSESSID=session_id()">'.
- _("Authorized Panel installation").'</a></li>
+ _("Authorized Panel installation")." " ._("Ministry - Traffic Safty Directorate").'</a></li>
<li><a href="illegal_panelinstallation_report.php?PHPSESSID=session_id()">'.
_("Illegal Panel installation").'</a></li>
<li><a href="detailed_panelinstallation_report.php?PHPSESSID=session_id()">'.
- _("Detailed Panel installation").'</a></li>
+ _("Detailed Panel installation").' '._(' Form No. (3)').'</a></li>
<li><a href="contract_panel_report.php?PHPSESSID=session_id()">'.
_("Contract Panel installation").'</a></li>
Modified: trunk/rapc/script/create_views.sql
===================================================================
--- trunk/rapc/script/create_views.sql 2007-02-15 06:56:14 UTC (rev 57)
+++ trunk/rapc/script/create_views.sql 2007-03-18 09:27:53 UTC (rev 58)
@@ -23,7 +23,7 @@
-- psql -d dccss -f create_views.sql
create or replace view panelinformation as
-select panel.companyname,panel.panelsubject,panel.district,panel.date,
+select panel.id,panel.companyname,panel.panelsubject,panel.district,panel.date,
routetype.description as routetype,
panel.routename,yesno.description as boolrow,
paneldimension.description as dimension,facecount.description as facecount,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
